diff --git a/.udisks2.metadata b/.udisks2.metadata new file mode 100644 index 0000000..0a1f26f --- /dev/null +++ b/.udisks2.metadata @@ -0,0 +1 @@ +09b6dcab5ccda04c85f4ed7ea7426897898d15af SOURCES/udisks-2.1.0.tar.bz2 diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/udisks-2.1.1-chromeos-partition-types.patch b/SOURCES/udisks-2.1.1-chromeos-partition-types.patch new file mode 100644 index 0000000..935fac3 --- /dev/null +++ b/SOURCES/udisks-2.1.1-chromeos-partition-types.patch @@ -0,0 +1,27 @@ +From 7c550c39641deccdd491faf3b93eb71f9bc92d1f Mon Sep 17 00:00:00 2001 +From: David Zeuthen +Date: Tue, 21 May 2013 16:31:11 +0000 +Subject: Add ChromeOS partition types + +This is helpful when working with ChromeOS disk images. + +Signed-off-by: David Zeuthen +--- +diff --git a/udisks/udisksclient.c b/udisks/udisksclient.c +index f7eaa04..b571360 100644 +--- a/udisks/udisksclient.c ++++ b/udisks/udisksclient.c +@@ -2267,6 +2267,11 @@ static const struct + /* VMWare, see http://blogs.vmware.com/vsphere/2011/08/vsphere-50-storage-features-part-7-gpt.html */ + {"gpt", "other", "aa31e02a-400f-11db-9590-000c2911d1b8", NC_("part-type", "VMWare VMFS"), 0}, + {"gpt", "other", "9d275380-40ad-11db-bf97-000c2911d1b8", NC_("part-type", "VMWare vmkcore"), 0}, ++ /* ChromeOS, see http://www.chromium.org/chromium-os/chromiumos-design-docs/disk-format */ ++ {"gpt", "other", "cab6e88e-abf3-4102-a07a-d4bb9be3c1d3", NC_("part-type", "ChromeOS Firmware"), 0}, ++ {"gpt", "other", "fe3a2a5d-4f32-41a7-b725-accc3285a309", NC_("part-type", "ChromeOS Kernel"), 0}, ++ {"gpt", "other", "3cb8e202-3b7e-47dd-8a3c-7ff2a13cfcec", NC_("part-type", "ChromeOS Root Filesystem"), 0}, ++ {"gpt", "other", "2e0a753d-9e48-43b0-8337-b15192cb1b5e", NC_("part-type", "ChromeOS Reserved"), 0}, + + /* see http://developer.apple.com/documentation/mac/devices/devices-126.html + * http://lists.apple.com/archives/Darwin-drivers/2003/May/msg00021.html */ +-- +cgit v0.9.0.2-2-gbebe diff --git a/SOURCES/udisks-2.1.1-desc-part-table-subtype.patch b/SOURCES/udisks-2.1.1-desc-part-table-subtype.patch new file mode 100644 index 0000000..dd7a141 --- /dev/null +++ b/SOURCES/udisks-2.1.1-desc-part-table-subtype.patch @@ -0,0 +1,96 @@ +From 68e0d368fb5d3088c5e7d7513607d24dbcb50e02 Mon Sep 17 00:00:00 2001 +From: David Zeuthen +Date: Tue, 21 May 2013 16:06:19 +0000 +Subject: UDisksClient: Make it possible to get part desc based on the part table subtype + +Otherwise, Disks can't populate the partition table combobox correctly +for GPT because "Generic", "Apple" and "Other" subtypes all have the +same partition type (ZFS) but with different descriptions ("ZFS", +"Apple ZFS", "Solaris /usr"). + +Signed-off-by: David Zeuthen +--- +diff --git a/doc/udisks2-sections.txt b/doc/udisks2-sections.txt +index 9dbeef6..897f48a 100644 +--- a/doc/udisks2-sections.txt ++++ b/doc/udisks2-sections.txt +@@ -70,6 +70,7 @@ udisks_partition_type_info_free + udisks_client_get_partition_type_infos + udisks_client_get_partition_table_subtypes + udisks_client_get_partition_type_for_display ++udisks_client_get_partition_type_and_subtype_for_display + udisks_client_get_partition_table_type_for_display + udisks_client_get_partition_table_subtype_for_display + +diff --git a/udisks/udisksclient.c b/udisks/udisksclient.c +index aca946c..f7eaa04 100644 +--- a/udisks/udisksclient.c ++++ b/udisks/udisksclient.c +@@ -2395,6 +2395,48 @@ udisks_client_get_partition_type_for_display (UDisksClient *client, + return ret; + } + ++/** ++ * udisks_client_get_partition_type_and_subtype_for_display: ++ * @client: A #UDisksClient. ++ * @partition_table_type: A partitioning type e.g. 'dos' or 'gpt'. ++ * @partition_table_subtype: A partitioning subtype or %NULL. ++ * @partition_type: A partition type. ++ * ++ * Like udisks_client_get_partition_type_for_display() but also takes ++ * the partition table subtype into account, if available. This is ++ * useful in scenarios where different subtypes is using the same ++ * partition type. ++ * ++ * Returns: A description of @partition_type or %NULL if unknown. ++ * ++ * Since: 2.1.1 ++ */ ++const gchar * ++udisks_client_get_partition_type_and_subtype_for_display (UDisksClient *client, ++ const gchar *partition_table_type, ++ const gchar *partition_table_subtype, ++ const gchar *partition_type) ++{ ++ const gchar *ret = NULL; ++ guint n; ++ ++ for (n = 0; known_partition_types[n].name != NULL; n++) ++ { ++ if (g_strcmp0 (known_partition_types[n].table_type, partition_table_type) == 0 && ++ g_strcmp0 (known_partition_types[n].type, partition_type) == 0) ++ { ++ if (partition_table_subtype != NULL && ++ g_strcmp0 (known_partition_types[n].table_subtype, partition_table_subtype) != 0) ++ continue; ++ ret = g_dpgettext2 (GETTEXT_PACKAGE, "part-type", known_partition_types[n].name); ++ goto out; ++ } ++ } ++ ++ out: ++ return ret; ++} ++ + /* ---------------------------------------------------------------------------------------------------- */ + + /** +diff --git a/udisks/udisksclient.h b/udisks/udisksclient.h +index 93dfddf..121efc3 100644 +--- a/udisks/udisksclient.h ++++ b/udisks/udisksclient.h +@@ -136,6 +136,12 @@ const gchar *udisks_client_get_partition_type_for_display (UDisksCl + const gchar *partition_table_type, + const gchar *partition_type); + ++const gchar *udisks_client_get_partition_type_and_subtype_for_display (UDisksClient *client, ++ const gchar *partition_table_type, ++ const gchar *partition_table_subtype, ++ const gchar *partition_type); ++ ++ + const gchar *udisks_client_get_partition_table_type_for_display (UDisksClient *client, + const gchar *partition_table_type); + +-- +cgit v0.9.0.2-2-gbebe diff --git a/SOURCES/udisks-2.1.1-firewire-ident.patch b/SOURCES/udisks-2.1.1-firewire-ident.patch new file mode 100644 index 0000000..9df3ad4 --- /dev/null +++ b/SOURCES/udisks-2.1.1-firewire-ident.patch @@ -0,0 +1,26 @@ +From b841e30a98459816dfc49a735d3db4355a88edcd Mon Sep 17 00:00:00 2001 +From: David Zeuthen +Date: Tue, 19 Mar 2013 04:31:40 +0000 +Subject: Properly identify firewire devices as non-system devices + +This was reported in bug 62077. + +https://bugs.freedesktop.org/show_bug.cgi?id=62077 + +Signed-off-by: David Zeuthen +--- +diff --git a/src/udiskslinuxblock.c b/src/udiskslinuxblock.c +index a1781cf..d619850 100644 +--- a/src/udiskslinuxblock.c ++++ b/src/udiskslinuxblock.c +@@ -354,7 +354,7 @@ update_hints (UDisksLinuxBlock *block, + connection_bus = udisks_drive_get_connection_bus (drive); + removable = udisks_drive_get_media_removable (drive); + if (removable || +- (g_strcmp0 (connection_bus, "usb") == 0 || g_strcmp0 (connection_bus, "firewire") == 0) || ++ (g_strcmp0 (connection_bus, "usb") == 0 || g_strcmp0 (connection_bus, "ieee1394") == 0) || + (g_str_has_prefix (device_file, "/dev/mmcblk") || g_str_has_prefix (device_file, "/dev/mspblk"))) + { + hint_system = FALSE; +-- +cgit v0.9.0.2-2-gbebe diff --git a/SOURCES/udisks-2.1.1-lexar-usb3-reader.patch b/SOURCES/udisks-2.1.1-lexar-usb3-reader.patch new file mode 100644 index 0000000..9140baf --- /dev/null +++ b/SOURCES/udisks-2.1.1-lexar-usb3-reader.patch @@ -0,0 +1,26 @@ +From aac687085c2ea84d3148815854fc5d7bd3f170be Mon Sep 17 00:00:00 2001 +From: David Zeuthen +Date: Thu, 16 May 2013 06:47:11 +0000 +Subject: Identify Lexar Dual Slot USB 3.0 Reader Professional as a card reader + +Just got one of these. + +Signed-off-by: David Zeuthen +--- +diff --git a/data/80-udisks2.rules b/data/80-udisks2.rules +index 5541b4e..997525d 100644 +--- a/data/80-udisks2.rules ++++ b/data/80-udisks2.rules +@@ -71,6 +71,10 @@ SUBSYSTEMS=="usb", ATTRS{idVendor}=="05ac", ATTRS{idProduct}=="8403", ENV{ID_DRI + DRIVERS=="rts_pstor", ENV{ID_DRIVE_FLASH_SD}="1" + DRIVERS=="rts5229", ENV{ID_DRIVE_FLASH_SD}="1" + ++# Lexar Dual Slot USB 3.0 Reader Professional ++SUBSYSTEMS=="usb", ENV{ID_VENDOR_ID}=="05dc",ENV{ID_MODEL_ID}=="b049", ENV{ID_INSTANCE}=="0:0", ENV{ID_DRIVE_FLASH_CF}="1" ++SUBSYSTEMS=="usb", ENV{ID_VENDOR_ID}=="05dc",ENV{ID_MODEL_ID}=="b049", ENV{ID_INSTANCE}=="0:1", ENV{ID_DRIVE_FLASH_SD}="1" ++ + # Common theme + # + SUBSYSTEMS=="usb", ENV{ID_MODEL}=="*Reader*SD*", ENV{ID_DRIVE_FLASH_SD}="1" +-- +cgit v0.9.0.2-2-gbebe diff --git a/SOURCES/udisks-2.1.1-logind-test.patch b/SOURCES/udisks-2.1.1-logind-test.patch new file mode 100644 index 0000000..0eb0feb --- /dev/null +++ b/SOURCES/udisks-2.1.1-logind-test.patch @@ -0,0 +1,37 @@ +From 266bae418f6f55e0061b089c5bbfdeac2598f155 Mon Sep 17 00:00:00 2001 +From: Martin Pitt +Date: Thu, 21 Mar 2013 06:23:59 +0000 +Subject: Fix test for logind availability + +sd_booted() is not an appropriate check for whether we should talk to logind, +test for /run/systemd/seats/ instead. + +For details, see: + +--- +diff --git a/src/udisksdaemonutil.c b/src/udisksdaemonutil.c +index 4c23906..fb50a0f 100644 +--- a/src/udisksdaemonutil.c ++++ b/src/udisksdaemonutil.c +@@ -44,6 +44,8 @@ + #if defined(HAVE_LIBSYSTEMD_LOGIN) + #include + #include ++ ++#define LOGIND_AVAILABLE() (access("/run/systemd/seats/", F_OK) >= 0) + #endif + + /** +@@ -1039,8 +1041,8 @@ udisks_daemon_util_on_same_seat (UDisksDaemon *daemon, + UDisksObject *drive_object = NULL; + UDisksDrive *drive = NULL; + +- /* if we haven't booted with systemd, assume it's always the same seat */ +- if (sd_booted () <= 0) ++ /* if we don't have logind, assume it's always the same seat */ ++ if (!LOGIND_AVAILABLE()) + return TRUE; + + if (UDISKS_IS_LINUX_BLOCK_OBJECT (object)) +-- +cgit v0.9.0.2-2-gbebe diff --git a/SOURCES/udisks-2.1.1-transcend-usb3-reader.patch b/SOURCES/udisks-2.1.1-transcend-usb3-reader.patch new file mode 100644 index 0000000..0e9f1f2 --- /dev/null +++ b/SOURCES/udisks-2.1.1-transcend-usb3-reader.patch @@ -0,0 +1,24 @@ +From 7bb9d6714ff496c7ee5f2b477e22b90b2d8c8010 Mon Sep 17 00:00:00 2001 +From: David Zeuthen +Date: Sat, 18 May 2013 16:43:49 +0000 +Subject: Identify Transcend USB 3.0 Multi-Card reader as such + +--- +diff --git a/data/80-udisks2.rules b/data/80-udisks2.rules +index 997525d..02376e7 100644 +--- a/data/80-udisks2.rules ++++ b/data/80-udisks2.rules +@@ -75,6 +75,11 @@ DRIVERS=="rts5229", ENV{ID_DRIVE_FLASH_SD}="1" + SUBSYSTEMS=="usb", ENV{ID_VENDOR_ID}=="05dc",ENV{ID_MODEL_ID}=="b049", ENV{ID_INSTANCE}=="0:0", ENV{ID_DRIVE_FLASH_CF}="1" + SUBSYSTEMS=="usb", ENV{ID_VENDOR_ID}=="05dc",ENV{ID_MODEL_ID}=="b049", ENV{ID_INSTANCE}=="0:1", ENV{ID_DRIVE_FLASH_SD}="1" + ++# Transcend USB 3.0 Multi-Card Reader (TS-RDF8K) ++SUBSYSTEMS=="usb", ENV{ID_VENDOR_ID}=="8564",ENV{ID_MODEL_ID}=="4000", ENV{ID_INSTANCE}=="0:0", ENV{ID_DRIVE_FLASH_CF}="1" ++SUBSYSTEMS=="usb", ENV{ID_VENDOR_ID}=="8564",ENV{ID_MODEL_ID}=="4000", ENV{ID_INSTANCE}=="0:1", ENV{ID_DRIVE_FLASH_SD}="1" ++SUBSYSTEMS=="usb", ENV{ID_VENDOR_ID}=="8564",ENV{ID_MODEL_ID}=="4000", ENV{ID_INSTANCE}=="0:2", ENV{ID_DRIVE_FLASH_MS}="1" ++ + # Common theme + # + SUBSYSTEMS=="usb", ENV{ID_MODEL}=="*Reader*SD*", ENV{ID_DRIVE_FLASH_SD}="1" +-- +cgit v0.9.0.2-2-gbebe diff --git a/SOURCES/udisks-2.1.1-wd-smartware-hiding.patch b/SOURCES/udisks-2.1.1-wd-smartware-hiding.patch new file mode 100644 index 0000000..49c6b0f --- /dev/null +++ b/SOURCES/udisks-2.1.1-wd-smartware-hiding.patch @@ -0,0 +1,24 @@ +From 51857ca68c1f45137c27591c1b535b18a6b4ab09 Mon Sep 17 00:00:00 2001 +From: Martin Pitt +Date: Mon, 25 Mar 2013 13:58:18 +0000 +Subject: Fix hiding of "WD SmartWare" partitions + +These might have a _ or a space as word separator. + +https://launchpad.net/bugs/732365 +--- +diff --git a/data/80-udisks2.rules b/data/80-udisks2.rules +index 90e4fc2..5541b4e 100644 +--- a/data/80-udisks2.rules ++++ b/data/80-udisks2.rules +@@ -114,7 +114,7 @@ ENV{ID_PART_ENTRY_SCHEME}=="gpt", \ + + # MAC recovery/tool partitions which are useless on Linux + ENV{ID_PART_ENTRY_SCHEME}=="mac", \ +- ENV{ID_CDROM}=="?*", ENV{ID_FS_TYPE}=="udf", ENV{ID_FS_LABEL}=="WD_SmartWare", \ ++ ENV{ID_CDROM}=="?*", ENV{ID_FS_TYPE}=="udf", ENV{ID_FS_LABEL}=="WD*SmartWare", \ + ENV{UDISKS_IGNORE}="1" + + # recovery partitions +-- +cgit v0.9.0.2-2-gbebe diff --git a/SOURCES/udisks-2.1.1-zfs-generic.patch b/SOURCES/udisks-2.1.1-zfs-generic.patch new file mode 100644 index 0000000..ca41259 --- /dev/null +++ b/SOURCES/udisks-2.1.1-zfs-generic.patch @@ -0,0 +1,41 @@ +From 21b24071250f232f85b1853ddef428c76a83ad4d Mon Sep 17 00:00:00 2001 +From: David Zeuthen +Date: Tue, 21 May 2013 16:05:21 +0000 +Subject: Promote ZFS partition type to generic + +In addition to Mac OS X and Solaris, It's also used in Linux. + +Signed-off-by: David Zeuthen +--- +diff --git a/udisks/udisksclient.c b/udisks/udisksclient.c +index 18f3590..aca946c 100644 +--- a/udisks/udisksclient.c ++++ b/udisks/udisksclient.c +@@ -2210,6 +2210,7 @@ static const struct + {"gpt", "generic", "024dee41-33e7-11d3-9d69-0008c781f39f", NC_("part-type", "MBR Partition Scheme"), F_SYSTEM}, + {"gpt", "generic", "c12a7328-f81f-11d2-ba4b-00a0c93ec93b", NC_("part-type", "EFI System"), F_SYSTEM}, + {"gpt", "generic", "21686148-6449-6e6f-744e-656564454649", NC_("part-type", "BIOS Boot"), F_SYSTEM}, ++ {"gpt", "generic", "6a898cc3-1dd2-11b2-99a6-080020736631", NC_("part-type", "ZFS"), 0}, /* see also Apple, Sol. */ + /* Linux */ + {"gpt", "linux", "0fc63daf-8483-4772-8e79-3d69d8477de4", NC_("part-type", "Linux Filesystem"), 0}, + {"gpt", "linux", "a19d880f-05fc-4d3b-a006-743f0f84911e", NC_("part-type", "Linux RAID"), F_RAID}, +@@ -2225,7 +2226,7 @@ static const struct + /* Apple OS X */ + {"gpt", "apple", "48465300-0000-11aa-aa11-00306543ecac", NC_("part-type", "Apple HFS/HFS+"), 0}, + {"gpt", "apple", "55465300-0000-11aa-aa11-00306543ecac", NC_("part-type", "Apple UFS"), 0}, +- {"gpt", "apple", "6a898cc3-1dd2-11b2-99a6-080020736631", NC_("part-type", "Apple ZFS"), 0}, /* same as Solaris /usr */ ++ {"gpt", "apple", "6a898cc3-1dd2-11b2-99a6-080020736631", NC_("part-type", "Apple ZFS"), 0}, /* same as ZFS */ + {"gpt", "apple", "52414944-0000-11aa-aa11-00306543ecac", NC_("part-type", "Apple RAID"), F_RAID}, + {"gpt", "apple", "52414944-5f4f-11aa-aa11-00306543ecac", NC_("part-type", "Apple RAID (offline)"), F_RAID}, + {"gpt", "apple", "426f6f74-0000-11aa-aa11-00306543ecac", NC_("part-type", "Apple Boot"), F_SYSTEM}, +@@ -2247,7 +2248,7 @@ static const struct + {"gpt", "other", "6a85cf4d-1dd2-11b2-99a6-080020736631", NC_("part-type", "Solaris Root"), 0}, + {"gpt", "other", "6a87c46f-1dd2-11b2-99a6-080020736631", NC_("part-type", "Solaris Swap"), F_SWAP}, + {"gpt", "other", "6a8b642b-1dd2-11b2-99a6-080020736631", NC_("part-type", "Solaris Backup"), 0}, +- {"gpt", "other", "6a898cc3-1dd2-11b2-99a6-080020736631", NC_("part-type", "Solaris /usr"), 0}, /* same as Apple ZFS */ ++ {"gpt", "other", "6a898cc3-1dd2-11b2-99a6-080020736631", NC_("part-type", "Solaris /usr"), 0}, /* same as ZFS */ + {"gpt", "other", "6a8ef2e9-1dd2-11b2-99a6-080020736631", NC_("part-type", "Solaris /var"), 0}, + {"gpt", "other", "6a90ba39-1dd2-11b2-99a6-080020736631", NC_("part-type", "Solaris /home"), 0}, + {"gpt", "other", "6a9283a5-1dd2-11b2-99a6-080020736631", NC_("part-type", "Solaris Alternate Sector"), 0}, +-- +cgit v0.9.0.2-2-gbebe diff --git a/SOURCES/umount.udisks2-manpage.patch b/SOURCES/umount.udisks2-manpage.patch new file mode 100644 index 0000000..bf46562 --- /dev/null +++ b/SOURCES/umount.udisks2-manpage.patch @@ -0,0 +1,151 @@ +From 0229af0d724faa862cde63ec8c0c6448210c532c Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Wed, 26 Jun 2013 01:10:48 -0400 +Subject: [PATCH] Add a man page for umount.udisks2 + +Some customers get upset if there are commands in /bin or /sbin +without a manual page. Since the umount interface expects its +plugins to be in /sbin, add a pro forma man page for umount.udisks2. + +https://bugs.freedesktop.org/show_bug.cgi?id=66188 +--- + doc/man/Makefile.am | 5 ++++ + doc/man/udisks.xml | 1 + + doc/man/udisksctl.xml | 1 + + doc/man/udisksd.xml | 1 + + doc/man/umount.udisks2.xml | 60 ++++++++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 68 insertions(+) + create mode 100644 doc/man/umount.udisks2.xml + +diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am +index e4e8ca8..97f76dc 100644 +--- a/doc/man/Makefile.am ++++ b/doc/man/Makefile.am +@@ -8,6 +8,7 @@ man_MANS += \ + udisksctl.1 \ + udisksd.8 \ + udisks.8 \ ++ umount.udisks2.8 \ + $(NULL) + endif + +@@ -20,10 +21,14 @@ udisksd.8 : udisksd.xml + udisks.8 : udisks.xml + $(XSLTPROC) -path "$(builddir)/.." -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< + ++umount.udisks2.8 : umount.udisks2.xml ++ $(XSLTPROC) -path "$(builddir)/.." -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< ++ + EXTRA_DIST= \ + udisksctl.xml \ + udisksd.xml \ + udisks.xml \ ++ umount.udisks2.xml \ + $(NULL) + + clean-local: +diff --git a/doc/man/udisks.xml b/doc/man/udisks.xml +index dc32995..e13129c 100644 +--- a/doc/man/udisks.xml ++++ b/doc/man/udisks.xml +@@ -393,6 +393,7 @@ + , + udisksd8, + udisksctl1, ++ umount.udisks28, + gnome-disks1 + + +diff --git a/doc/man/udisksctl.xml b/doc/man/udisksctl.xml +index 8f38479..a87f5f2 100644 +--- a/doc/man/udisksctl.xml ++++ b/doc/man/udisksctl.xml +@@ -332,6 +332,7 @@ + + udisks8, + udisksd8, ++ umount.udisks28, + + polkit8 + +diff --git a/doc/man/udisksd.xml b/doc/man/udisksd.xml +index 4ad7c31..559edf1 100644 +--- a/doc/man/udisksd.xml ++++ b/doc/man/udisksd.xml +@@ -113,6 +113,7 @@ + + udisks8, + udisksctl1, ++ umount.udisks28, + + polkit8 + , +diff --git a/doc/man/umount.udisks2.xml b/doc/man/umount.udisks2.xml +new file mode 100644 +index 0000000..5c0ca0f +--- /dev/null ++++ b/doc/man/umount.udisks2.xml +@@ -0,0 +1,60 @@ ++ ++]> ++ ++ ++ umount.udisks2 ++ March 2013 ++ udisks ++ ++ ++ ++ umount.udisks2 ++ 8 ++ System Administration ++ udisks ++ &version; ++ ++ ++ ++ umount.udisks2 ++ unmount file systems that have been mounted by udisks ++ ++ ++ DESCRIPTION ++ ++ The umount.udisks2 program is a helper for the ++ umount8 ++ program. Its purpose is to clean up automatically created directories ++ created at file system mount-time. It should never be called directly. ++ ++ ++ ++ AUTHOR ++ ++ Written by David Zeuthen ++ with a lot of help ++ from many others. ++ ++ ++ ++ ++ BUGS ++ ++ Please send bug reports to either the distribution bug tracker ++ or the upstream bug tracker at ++ . ++ ++ ++ ++ ++ SEE ALSO ++ ++ udisks8, ++ udisksd8, ++ udisksctl1, ++ umount8, ++ ++ ++ +-- +1.8.3.1 + diff --git a/SPECS/udisks2.spec b/SPECS/udisks2.spec new file mode 100644 index 0000000..ca94727 --- /dev/null +++ b/SPECS/udisks2.spec @@ -0,0 +1,303 @@ +%define glib2_version 2.31.13 +%define gobject_introspection_version 1.30.0 +%define polkit_version 0.101 +%define systemd_version 184 +%define libatasmart_version 0.12 +%define dbus_version 1.4.0 + +Summary: Disk Manager +Name: udisks2 +Version: 2.1.0 +Release: 4%{?dist} +License: GPLv2+ +Group: System Environment/Libraries +URL: http://www.freedesktop.org/wiki/Software/udisks +Source0: http://udisks.freedesktop.org/releases/udisks-%{version}.tar.bz2 + +BuildRequires: glib2-devel >= %{glib2_version} +BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version} +BuildRequires: polkit-devel >= %{polkit_version} +BuildRequires: intltool +BuildRequires: libatasmart-devel >= %{libatasmart_version} +BuildRequires: libgudev1-devel >= %{systemd_version} +BuildRequires: gtk-doc +BuildRequires: systemd-devel +BuildRequires: libacl-devel + +# needed to pull in the system bus daemon +Requires: dbus >= %{dbus_version} +# needed to pull in the udev daemon +Requires: systemd >= %{systemd_version} +# we need at least this version for bugfixes / features etc. +Requires: libatasmart >= %{libatasmart_version} +# for mount, umount, mkswap +Requires: util-linux +# for mkfs.ext3, mkfs.ext3, e2label +Requires: e2fsprogs +# for mkfs.xfs, xfs_admin +Requires: xfsprogs +# for mkfs.vfat +Requires: dosfstools +# for mlabel +Requires: mtools +# for partitioning +Requires: parted +Requires: gdisk +# for LUKS devices +Requires: cryptsetup-luks +# for ejecting removable disks +Requires: eject + +# for MD-RAID +Requires: mdadm + +Requires: libudisks2 = %{version}-%{release} + +# for mkntfs (not available on rhel or on ppc/ppc64) +%if ! 0%{?rhel} +%ifnarch ppc ppc64 +Requires: ntfsprogs +%endif +%endif + +# for /proc/self/mountinfo, only available in 2.6.26 or higher +Conflicts: kernel < 2.6.26 + +# https://bugzilla.redhat.com/show_bug.cgi?id=976796 +# ensure smooth upgrade path from udisks(1) +Provides: udisks = %{version}-%{release} +Obsoletes: udisks < %{version}-%{release} + +# Some patch touches Makefile.am +BuildRequires: automake autoconf +BuildRequires: gnome-common + + +# Cannot mount external firewire hard drive or usb thumb drive as normal user, root required +# https://bugzilla.redhat.com/show_bug.cgi?id=909010 +Patch0: udisks-2.1.1-firewire-ident.patch + +# from upstream +Patch1: udisks-2.1.1-chromeos-partition-types.patch +Patch2: udisks-2.1.1-desc-part-table-subtype.patch +Patch3: udisks-2.1.1-lexar-usb3-reader.patch +Patch4: udisks-2.1.1-logind-test.patch +Patch5: udisks-2.1.1-transcend-usb3-reader.patch +Patch6: udisks-2.1.1-wd-smartware-hiding.patch +Patch7: udisks-2.1.1-zfs-generic.patch + +# add a man page for umount.udisks2 +# https://bugzilla.redhat.com/show_bug.cgi?id=948926 +Patch8: umount.udisks2-manpage.patch + + +%description +udisks provides a daemon, D-Bus API and command line tools for +managing disks and storage devices. This package is for the udisks 2.x +series. + +%package -n libudisks2 +Summary: Dynamic library to access the udisks daemon +Group: System Environment/Libraries +License: LGPLv2+ + +%description -n libudisks2 +This package contains the dynamic library libudisks2, which provides +access to the udisks daemon. This package is for the udisks 2.x +series. + +%package -n libudisks2-devel +Summary: Development files for libudisks2 +Group: Development/Libraries +Requires: libudisks2 = %{version}-%{release} +Requires: pkgconfig +License: LGPLv2+ + +%description -n libudisks2-devel +This package contains the development files for the library +libudisks2, a dynamic library, which provides access to the udisks +daemon. This package is for the udisks 2.x series. + +%prep +%setup -q -n udisks-%{version} +%patch0 -p1 -b .firewire-ident +%patch1 -p1 -b .chromeos-partition-types +%patch2 -p1 -b .desc-part-table-subtype +%patch3 -p1 -b .lexar-usb3-reader +%patch4 -p1 -b .logind-test +%patch5 -p1 -b .transcend-usb3-reader +%patch6 -p1 -b .wd-smartware-hiding +%patch7 -p1 -b .zfs-generic +%patch8 -p1 -b .umount.udisks2-manpage + + +%build +# umount.udisks2-manpage.patch touches Makefile.am +libtoolize --force || : +aclocal || : +autoheader || : +automake || : +autoconf || : +# we can't use _hardened_build here, see +# https://bugzilla.redhat.com/show_bug.cgi?id=892837 +export CFLAGS='-fPIC %optflags' +export LDFLAGS='-pie -Wl,-z,now -Wl,-z,relro' +%configure --enable-gtk-doc +make + +%install +make install DESTDIR=$RPM_BUILD_ROOT + +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/*.a + +%find_lang %{name} + +%post -n libudisks2 -p /sbin/ldconfig + +%postun -n libudisks2 -p /sbin/ldconfig + +%files -f %{name}.lang +%doc README AUTHORS NEWS COPYING HACKING + +%dir %{_sysconfdir}/udisks2 + +%{_sysconfdir}/dbus-1/system.d/org.freedesktop.UDisks2.conf +%{_datadir}/bash-completion/completions/udisksctl +%{_prefix}/lib/systemd/system/udisks2.service +%{_prefix}/lib/udev/rules.d/80-udisks2.rules +%{_sbindir}/umount.udisks2 + +%dir %{_prefix}/lib/udisks2 +%{_prefix}/lib/udisks2/udisksd + +%{_bindir}/udisksctl + +%{_mandir}/man1/* +%{_mandir}/man8/* + +%{_datadir}/polkit-1/actions/org.freedesktop.udisks2.policy +%{_datadir}/dbus-1/system-services/org.freedesktop.UDisks2.service + +# Permissions for local state data are 0700 to avoid leaking information +# about e.g. mounts to unprivileged users +%attr(0700,root,root) %dir %{_localstatedir}/lib/udisks2 + +%files -n libudisks2 +%{_libdir}/libudisks2.so.* +%{_libdir}/girepository-1.0/UDisks-2.0.typelib + +%files -n libudisks2-devel +%{_libdir}/libudisks2.so +%dir %{_includedir}/udisks2 +%dir %{_includedir}/udisks2/udisks +%{_includedir}/udisks2/udisks/*.h +%{_datadir}/gir-1.0/UDisks-2.0.gir +%dir %{_datadir}/gtk-doc/html/udisks2 +%{_datadir}/gtk-doc/html/udisks2/* +%{_libdir}/pkgconfig/udisks2.pc + +# Note: please don't forget the %{?dist} in the changelog. Thanks +%changelog +* Thu Jul 25 2013 Tomas Bzatek - 2.1.0-4%{?dist} +- Add a man page for umount.udisks2 (#948926) + +* Tue Jul 02 2013 Tomas Bzatek - 2.1.0-3%{?dist} +- Sync with recent upstream changes +- Add Provides/Obsoletes udisks (#976796) + +* Thu Mar 28 2013 Tomas Bzatek - 2.1.0-2%{?dist} +- Fix firewire drives identification (#909010) + +* Wed Mar 20 2013 Kalev Lember - 2.1.0-1 +- Update to 2.1.0 + +* Fri Feb 15 2013 Fedora Release Engineering - 2.0.91-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Jan 22 2013 Matthias Clasen - 2.0.91-2%{?dist} +- Hardened build + +* Mon Jan 07 2013 David Zeuthen - 2.0.91-1%{?dist} +- Update to release 2.0.91 + +* Tue Dec 18 2012 David Zeuthen - 2.0.90-1%{?dist} +- Update to release 2.0.90 + +* Fri Oct 02 2012 David Zeuthen - 2.0.0-1%{?dist} +- Update to release 2.0.0 + +* Fri Jul 27 2012 David Zeuthen - 1.99.0-1%{?dist} +- Update to release 1.99.0 + +* Sun Jul 22 2012 Fedora Release Engineering - 1.98.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jun 07 2012 David Zeuthen - 1.98.0-1%{?dist} +- Update to release 1.98.0 + +* Mon Jun 04 2012 Kay Sievers - 1.97.0-4 +- rebuild for libudev1 + +* Tue May 22 2012 Peter Robinson - 1.97.0-3 +- Add upstream patch to fix issue with rootfs being on a bound mount + +* Fri May 18 2012 Matthias Clasen - 1.97.0-2%{?dist} +- Add a Requires for eject (#810882) + +* Wed May 09 2012 David Zeuthen - 1.97.0-1%{?dist} +- Update to release 1.97.0 + +* Thu May 03 2012 David Zeuthen - 1.96.0-2%{?dist} +- Include patch so Fedora Live media is shown + +* Mon Apr 30 2012 David Zeuthen - 1.96.0-1%{?dist} +- Update to release 1.96.0 + +* Mon Apr 30 2012 David Zeuthen - 1.95.0-3%{?dist} +- BR: gnome-common + +* Mon Apr 30 2012 David Zeuthen - 1.95.0-2%{?dist} +- Make daemon actually link with libsystemd-login + +* Mon Apr 30 2012 David Zeuthen - 1.95.0-1%{?dist} +- Update to release 1.95.0 + +* Tue Apr 10 2012 David Zeuthen - 1.94.0-1%{?dist} +- Update to release 1.94.0 + +* Tue Apr 03 2012 David Zeuthen - 1.93.0-2%{?dist} +- Don't inadvertently unmount large block devices (fdo #48155) + +* Mon Mar 05 2012 David Zeuthen - 1.93.0-1%{?dist} +- Update to release 1.93.0 + +* Thu Feb 23 2012 David Zeuthen - 1.92.0-2%{?dist} +- Fix build + +* Thu Feb 23 2012 David Zeuthen - 1.92.0-1%{?dist} +- Update to release 1.92.0 + +* Wed Feb 22 2012 David Zeuthen - 1.91.0-2%{?dist} +- Avoid using $XDG_RUNTIME_DIR/media for now + +* Mon Feb 06 2012 David Zeuthen - 1.91.0-1%{?dist} +- Update to release 1.91.0 + +* Fri Jan 21 2012 David Zeuthen - 1.90.0-3%{?dist} +- Manually set PATH, if not set + +* Fri Jan 20 2012 David Zeuthen - 1.90.0-2%{?dist} +- Rebuild + +* Fri Jan 20 2012 David Zeuthen - 1.90.0-1%{?dist} +- Update to release 1.90.0 + +* Sat Jan 14 2012 Fedora Release Engineering - 1.90.0-0.git20111128.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Nov 28 2011 David Zeuthen - 1.90.0-0.git20111128%{?dist} +- Updated for review comments (#756046) + +* Mon Nov 22 2011 David Zeuthen - 1.90.0-0.git20111122%{?dist} +- Initial packaging of udisks2