IPFire-SCM April 2012

ipfire-scm@lists.ipfire.org

1 participants
60 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 7d6aa181005b31a60019df569b02ed43b5ec67c7
by git＠ipfire.org 15 Apr '12

15 Apr '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 7d6aa181005b31a60019df569b02ed43b5ec67c7 (commit) via 4cdab979a319217dfdce2491a28736ff1470b1dc (commit) via 580e5e841a4fb5fd0d0c00022cbc565f10665dce (commit) from e36f27e13e803a0baa0480b14cde8e70a0501653 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7d6aa181005b31a60019df569b02ed43b5ec67c7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Apr 15 22:57:52 2012 +0200 pam_ldap: Move to /usr. commit 4cdab979a319217dfdce2491a28736ff1470b1dc Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Apr 15 22:55:07 2012 +0200 filesystem: Add /var/{lock,run} symlinks and fix scriplet. systemd apparently does not bind-mount /var/lock and /var/run anymore but symlinks them instead to their corresponding directories in /run. The scriptlet contained an error which caused a crash on all architectures except x86_64 because of a bad checking of the directory existance. Hopefully this is now properly fixed. commit 580e5e841a4fb5fd0d0c00022cbc565f10665dce Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Apr 15 22:53:22 2012 +0200 dbus: Update to 1.4.20. ----------------------------------------------------------------------- Summary of changes: dbus/dbus.nm | 22 ++++++++++++---------- filesystem/filesystem.nm | 10 ++++++---- pam_ldap/pam_ldap.nm | 11 ++++++----- 3 files changed, 24 insertions(+), 19 deletions(-) Difference in files: diff --git a/dbus/dbus.nm b/dbus/dbus.nm index 168e61f..1531535 100644 --- a/dbus/dbus.nm +++ b/dbus/dbus.nm @@ -4,9 +4,10 @@ ############################################################################### name = dbus -version = 1.4.16 -release = 3 +version = 1.4.20 +release = 1 +maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org> groups = System/Daemons url = http://www.freedesktop.org/software/dbus/ license = GPLv2+ AFL @@ -26,12 +27,13 @@ build expat-devel libcap-ng-devel libselinux-devel + systemd-units end configure_options += \ --enable-libaudit \ --enable-selinux=yes \ - --with-systemdsystemunitdir=/lib/systemd/system/ \ + --with-systemdsystemunitdir=%{unitdir} \ --with-dbus-user=dbus end @@ -49,27 +51,27 @@ packages # Just search for new unit files that were just installed. script postin - /bin/systemctl daemon-reload >/dev/null 2>&1 || : + systemctl daemon-reload >/dev/null 2>&1 || : # The dbus service should be started on default. - /bin/systemctl enable dbus.service > /dev/null 2>&1 || : + systemctl enable dbus.service > /dev/null 2>&1 || : end # Disable the service that is to be removed and stop it if it is still running. script preun - /bin/systemctl --no-reload disable dbus.service >/dev/null 2>&1 || : - /bin/systemctl stop dbus.service >/dev/null 2>&1 || : + systemctl --no-reload disable dbus.service >/dev/null 2>&1 || : + systemctl stop dbus.service >/dev/null 2>&1 || : end # Just tell systemd that unitfiles have been removed. script postun - /bin/systemctl daemon-reload >/dev/null 2>&1 || : + systemctl daemon-reload >/dev/null 2>&1 || : end # Try to restart the service if it is running. script postup - /bin/systemctl daemon-reload >/dev/null 2>&1 || : - /bin/systemctl try-restart dbus.service >/dev/null 2>&1 || : + systemctl daemon-reload >/dev/null 2>&1 || : + systemctl try-restart dbus.service >/dev/null 2>&1 || : end end diff --git a/filesystem/filesystem.nm b/filesystem/filesystem.nm index 65d62e9..b7966a8 100644 --- a/filesystem/filesystem.nm +++ b/filesystem/filesystem.nm @@ -5,7 +5,7 @@ name = filesystem version = 002 -release = 1 +release = 2 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = Base Build System/Base @@ -75,11 +75,9 @@ build var/empty \ var/lib \ var/local \ - var/lock/subsys \ var/log \ var/nis \ var/preserve \ - var/run \ var/spool/{mail,lpd} \ var/tmp \ var/db \ @@ -92,6 +90,8 @@ build ln -snf ../var/tmp usr/tmp ln -snf spool/mail var/mail + ln -snf ../run var/run + ln -snf ../run/lock var/lock # Setting correct permissions. chmod 1777 %{BUILDROOT}/{,var/}tmp @@ -121,7 +121,9 @@ packages if not os.path.exists(usr_dir): os.makedirs(usr_dir) - if not os.path.exists(dir): + try: + os.lstat(dir) + except OSError: os.symlink(usr_dir[1:], dir) end end diff --git a/pam_ldap/pam_ldap.nm b/pam_ldap/pam_ldap.nm index 05a88ab..9d9154b 100644 --- a/pam_ldap/pam_ldap.nm +++ b/pam_ldap/pam_ldap.nm @@ -5,7 +5,7 @@ name = pam_ldap version = 186 -release = 2 +release = 3 groups = System/Base url = http://www.padl.com/OSS/pam_ldap.html @@ -33,9 +33,6 @@ build end configure_options += \ - --sysconfdir=/etc \ - --libdir=/%{lib} \ - --mandir=/usr/share/man \ --with-ldap-conf-file=/etc/pam_ldap.conf \ --with-ldap-secret-file=/etc/pam_ldap.secret @@ -64,7 +61,7 @@ build install # Create directory layout - mkdir -pv %{BUILDROOT}/{etc,%{lib}/security,%{libdir}} + mkdir -pv %{BUILDROOT}/{etc,%{libdir}/security} # Prevent to install an ldap.conf touch %{BUILDROOT}/etc/ldap.conf @@ -82,6 +79,10 @@ end packages package %{name} + conflicts + filesystem < 002 + end + end package %{name}-debuginfo template DEBUGINFO hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. e36f27e13e803a0baa0480b14cde8e70a0501653
by git＠ipfire.org 15 Apr '12

15 Apr '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via e36f27e13e803a0baa0480b14cde8e70a0501653 (commit) from 28c448bd8f43cc74765fc5f9445b98c4e60056e1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e36f27e13e803a0baa0480b14cde8e70a0501653 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Apr 15 17:55:32 2012 +0200 systemd: Fix install path of udev rules. ----------------------------------------------------------------------- Summary of changes: systemd/systemd.nm | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) Difference in files: diff --git a/systemd/systemd.nm b/systemd/systemd.nm index bcb2525..5e5a2f5 100644 --- a/systemd/systemd.nm +++ b/systemd/systemd.nm @@ -5,7 +5,7 @@ name = systemd version = 44 -release = 2 +release = 3 maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org> groups = System/Base @@ -47,6 +47,7 @@ build configure_options += \ --libexecdir=%{libdir} \ + --with-udevrulesdir=%{prefix}/lib/udev/rules.d \ --with-distro=ipfire prepare_cmds hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 28c448bd8f43cc74765fc5f9445b98c4e60056e1
by git＠ipfire.org 15 Apr '12

15 Apr '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 28c448bd8f43cc74765fc5f9445b98c4e60056e1 (commit) via 40b689e362efab4c8cdb5d34decdda0c1a4fb7ee (commit) from 216fde50ef881a2e6c63240b5d59e78bdf3f5c23 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 28c448bd8f43cc74765fc5f9445b98c4e60056e1 Merge: 216fde5 40b689e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Apr 15 16:46:44 2012 +0200 Merge remote-tracking branch 'stevee/kmod' commit 40b689e362efab4c8cdb5d34decdda0c1a4fb7ee Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Apr 15 16:43:48 2012 +0200 kmod: Provide more binaries. Provide more binaries like /sbin/depmod after UsrMove. ----------------------------------------------------------------------- Summary of changes: kmod/kmod.nm | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) Difference in files: diff --git a/kmod/kmod.nm b/kmod/kmod.nm index 8bea457..4996d40 100644 --- a/kmod/kmod.nm +++ b/kmod/kmod.nm @@ -5,7 +5,7 @@ name = kmod version = 7 -release = 2 +release = 3 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = System/Kernel @@ -54,7 +54,13 @@ packages package %{name} provides module-init-tools = 4.0-1 + /bin/kmod + /sbin/depmod + /sbin/insmod + /sbin/lsmod + /sbin/modinfo /sbin/modprobe + /sbin/rmmod end obsoletes = module-init-tools < 4.0-1 hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 216fde50ef881a2e6c63240b5d59e78bdf3f5c23
by git＠ipfire.org 15 Apr '12

15 Apr '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 216fde50ef881a2e6c63240b5d59e78bdf3f5c23 (commit) from 09a9fc3baf6533d4e64fdc88f301dd25541dde6d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 216fde50ef881a2e6c63240b5d59e78bdf3f5c23 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Apr 15 15:30:40 2012 +0200 systemd: Provide /sbin/init some other binaries. ----------------------------------------------------------------------- Summary of changes: systemd/systemd.nm | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) Difference in files: diff --git a/systemd/systemd.nm b/systemd/systemd.nm index 2cf294a..bcb2525 100644 --- a/systemd/systemd.nm +++ b/systemd/systemd.nm @@ -5,7 +5,7 @@ name = systemd version = 44 -release = 1 +release = 2 maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org> groups = System/Base @@ -122,6 +122,15 @@ packages util-linux>=2.19 end + provides + /bin/systemd + /sbin/halt + /sbin/init + /sbin/poweroff + /sbin/reboot + /sbin/shutdown + end + conflicts filesystem < 002 upstart hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 09a9fc3baf6533d4e64fdc88f301dd25541dde6d
by git＠ipfire.org 15 Apr '12

15 Apr '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 09a9fc3baf6533d4e64fdc88f301dd25541dde6d (commit) via ef1fad1f87db1d1e7bead522f70aaace9dbb285b (commit) from 620459d13810510944f28c909f6f614d190ac420 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 09a9fc3baf6533d4e64fdc88f301dd25541dde6d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Apr 15 11:24:50 2012 +0200 xfsprogs: Update to 3.1.8. Move everything to /usr. commit ef1fad1f87db1d1e7bead522f70aaace9dbb285b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Apr 15 11:23:55 2012 +0200 libsepol: Update to 2.1.5. Fix installation of libs to /usr. ----------------------------------------------------------------------- Summary of changes: libsepol/libsepol.nm | 7 +- libsepol/patches/libsepol-rhat.patch2 | 241 --------------------------------- xfsprogs/xfsprogs.nm | 27 +--- 3 files changed, 13 insertions(+), 262 deletions(-) delete mode 100644 libsepol/patches/libsepol-rhat.patch2 Difference in files: diff --git a/libsepol/libsepol.nm b/libsepol/libsepol.nm index 52d1426..43b6466 100644 --- a/libsepol/libsepol.nm +++ b/libsepol/libsepol.nm @@ -4,8 +4,8 @@ ############################################################################### name = libsepol -version = 2.1.4 -release = 5 +version = 2.1.5 +release = 1 groups = System/Libraries url = http://www.selinuxproject.org @@ -40,6 +40,9 @@ build # Remove manpages for binaries rm -rf %{BUILDROOT}/usr/share/man/man8 + + # Fix bad symlink. + ln -svf libsepol.so.1 %{BUILDROOT}%{libdir}/libsepol.so end end diff --git a/libsepol/patches/libsepol-rhat.patch2 b/libsepol/patches/libsepol-rhat.patch2 deleted file mode 100644 index c749dd9..0000000 --- a/libsepol/patches/libsepol-rhat.patch2 +++ /dev/null @@ -1,241 +0,0 @@ -diff --git a/libsepol/include/sepol/policydb/policydb.h b/libsepol/include/sepol/policydb/policydb.h -index 1848a7b..f53a499 100644 ---- a/libsepol/include/sepol/policydb/policydb.h -+++ b/libsepol/include/sepol/policydb/policydb.h -@@ -111,6 +111,19 @@ typedef struct class_datum { - symtab_t permissions; /* class-specific permission symbol table */ - constraint_node_t *constraints; /* constraints on class permissions */ - constraint_node_t *validatetrans; /* special transition rules */ -+/* Options how a new object user and role should be decided */ -+#define DEFAULT_SOURCE 1 -+#define DEFAULT_TARGET 2 -+ char default_user; -+ char default_role; -+/* Options how a new object range should be decided */ -+#define DEFAULT_SOURCE_LOW 1 -+#define DEFAULT_SOURCE_HIGH 2 -+#define DEFAULT_SOURCE_LOW_HIGH 3 -+#define DEFAULT_TARGET_LOW 4 -+#define DEFAULT_TARGET_HIGH 5 -+#define DEFAULT_TARGET_LOW_HIGH 6 -+ char default_range; - } class_datum_t; - - /* Role attributes */ -@@ -667,10 +680,11 @@ extern int policydb_set_target_platform(policydb_t *p, int platform); - #define POLICYDB_VERSION_BOUNDARY 24 - #define POLICYDB_VERSION_FILENAME_TRANS 25 - #define POLICYDB_VERSION_ROLETRANS 26 -+#define POLICYDB_VERSION_NEW_OBJECT_DEFAULTS 27 - - /* Range of policy versions we understand*/ - #define POLICYDB_VERSION_MIN POLICYDB_VERSION_BASE --#define POLICYDB_VERSION_MAX POLICYDB_VERSION_ROLETRANS -+#define POLICYDB_VERSION_MAX POLICYDB_VERSION_NEW_OBJECT_DEFAULTS - - /* Module versions and specific changes*/ - #define MOD_POLICYDB_VERSION_BASE 4 -@@ -686,9 +700,10 @@ extern int policydb_set_target_platform(policydb_t *p, int platform); - #define MOD_POLICYDB_VERSION_ROLETRANS 12 - #define MOD_POLICYDB_VERSION_ROLEATTRIB 13 - #define MOD_POLICYDB_VERSION_TUNABLE_SEP 14 -+#define MOD_POLICYDB_VERSION_NEW_OBJECT_DEFAULTS 15 - - #define MOD_POLICYDB_VERSION_MIN MOD_POLICYDB_VERSION_BASE --#define MOD_POLICYDB_VERSION_MAX MOD_POLICYDB_VERSION_TUNABLE_SEP -+#define MOD_POLICYDB_VERSION_MAX MOD_POLICYDB_VERSION_NEW_OBJECT_DEFAULTS - - #define POLICYDB_CONFIG_MLS 1 - -diff --git a/libsepol/src/expand.c b/libsepol/src/expand.c -index 493e478..73b9107 100644 ---- a/libsepol/src/expand.c -+++ b/libsepol/src/expand.c -@@ -358,6 +358,35 @@ static int constraint_node_clone(constraint_node_t ** dst, - return -1; - } - -+static int class_copy_default_new_object(expand_state_t *state, -+ class_datum_t *olddatum, -+ class_datum_t *newdatum) -+{ -+ if (olddatum->default_user) { -+ if (newdatum->default_user && olddatum->default_user != newdatum->default_user) { -+ ERR(state->handle, "Found conflicting default user definitions"); -+ return SEPOL_ENOTSUP; -+ } -+ newdatum->default_user = olddatum->default_user; -+ -+ } -+ if (olddatum->default_role) { -+ if (newdatum->default_role && olddatum->default_role != newdatum->default_role) { -+ ERR(state->handle, "Found conflicting default role definitions"); -+ return SEPOL_ENOTSUP; -+ } -+ newdatum->default_role = olddatum->default_role; -+ } -+ if (olddatum->default_range) { -+ if (newdatum->default_range && olddatum->default_range != newdatum->default_range) { -+ ERR(state->handle, "Found conflicting default range definitions"); -+ return SEPOL_ENOTSUP; -+ } -+ newdatum->default_range = olddatum->default_range; -+ } -+ return 0; -+} -+ - static int class_copy_callback(hashtab_key_t key, hashtab_datum_t datum, - void *data) - { -@@ -393,6 +422,12 @@ static int class_copy_callback(hashtab_key_t key, hashtab_datum_t datum, - new_class->s.value = class->s.value; - state->out->p_classes.nprim++; - -+ ret = class_copy_default_new_object(state, class, new_class); -+ if (ret) { -+ free(new_class); -+ return ret; -+ } -+ - new_id = strdup(id); - if (!new_id) { - ERR(state->handle, "Out of memory!"); -diff --git a/libsepol/src/link.c b/libsepol/src/link.c -index ee9675b..01d3231 100644 ---- a/libsepol/src/link.c -+++ b/libsepol/src/link.c -@@ -205,6 +205,34 @@ static int permission_copy_callback(hashtab_key_t key, hashtab_datum_t datum, - return ret; - } - -+static int class_copy_default_new_object(link_state_t *state, -+ class_datum_t *olddatum, -+ class_datum_t *newdatum) -+{ -+ if (olddatum->default_user) { -+ if (newdatum->default_user && olddatum->default_user != newdatum->default_user) { -+ ERR(state->handle, "Found conflicting default user definitions"); -+ return SEPOL_ENOTSUP; -+ } -+ newdatum->default_user = olddatum->default_user; -+ } -+ if (olddatum->default_role) { -+ if (newdatum->default_role && olddatum->default_role != newdatum->default_role) { -+ ERR(state->handle, "Found conflicting default role definitions"); -+ return SEPOL_ENOTSUP; -+ } -+ newdatum->default_role = olddatum->default_role; -+ } -+ if (olddatum->default_range) { -+ if (newdatum->default_range && olddatum->default_range != newdatum->default_range) { -+ ERR(state->handle, "Found conflicting default range definitions"); -+ return SEPOL_ENOTSUP; -+ } -+ newdatum->default_range = olddatum->default_range; -+ } -+ return 0; -+} -+ - static int class_copy_callback(hashtab_key_t key, hashtab_datum_t datum, - void *data) - { -@@ -287,6 +315,11 @@ static int class_copy_callback(hashtab_key_t key, hashtab_datum_t datum, - state->dest_class = new_class; - state->dest_class_name = (char *)key; - -+ /* copy default new object rules */ -+ ret = class_copy_default_new_object(state, cladatum, new_class); -+ if (ret) -+ return ret; -+ - ret = - hashtab_map(cladatum->permissions.table, permission_copy_callback, - state); -diff --git a/libsepol/src/policydb.c b/libsepol/src/policydb.c -index 136b450..a84de2f 100644 ---- a/libsepol/src/policydb.c -+++ b/libsepol/src/policydb.c -@@ -151,6 +151,13 @@ static struct policydb_compat_info policydb_compat[] = { - .target_platform = SEPOL_TARGET_SELINUX, - }, - { -+ .type = POLICY_KERN, -+ .version = POLICYDB_VERSION_NEW_OBJECT_DEFAULTS, -+ .sym_num = SYM_NUM, -+ .ocon_num = OCON_NODE6 + 1, -+ .target_platform = SEPOL_TARGET_SELINUX, -+ }, -+ { - .type = POLICY_BASE, - .version = MOD_POLICYDB_VERSION_BASE, - .sym_num = SYM_NUM, -@@ -228,6 +235,13 @@ static struct policydb_compat_info policydb_compat[] = { - .target_platform = SEPOL_TARGET_SELINUX, - }, - { -+ .type = POLICY_BASE, -+ .version = MOD_POLICYDB_VERSION_NEW_OBJECT_DEFAULTS, -+ .sym_num = SYM_NUM, -+ .ocon_num = OCON_NODE6 + 1, -+ .target_platform = SEPOL_TARGET_SELINUX, -+ }, -+ { - .type = POLICY_MOD, - .version = MOD_POLICYDB_VERSION_BASE, - .sym_num = SYM_NUM, -@@ -304,6 +318,13 @@ static struct policydb_compat_info policydb_compat[] = { - .ocon_num = 0, - .target_platform = SEPOL_TARGET_SELINUX, - }, -+ { -+ .type = POLICY_MOD, -+ .version = MOD_POLICYDB_VERSION_NEW_OBJECT_DEFAULTS, -+ .sym_num = SYM_NUM, -+ .ocon_num = 0, -+ .target_platform = SEPOL_TARGET_SELINUX, -+ }, - }; - - #if 0 -@@ -2064,6 +2085,18 @@ static int class_read(policydb_t * p, hashtab_t h, struct policy_file *fp) - goto bad; - } - -+ if ((p->policy_type == POLICY_KERN && -+ p->policyvers >= POLICYDB_VERSION_NEW_OBJECT_DEFAULTS) || -+ (p->policy_type == POLICY_BASE && -+ p->policyvers >= MOD_POLICYDB_VERSION_NEW_OBJECT_DEFAULTS)) { -+ rc = next_entry(buf, fp, sizeof(uint32_t) * 3); -+ if (rc < 0) -+ goto bad; -+ cladatum->default_user = le32_to_cpu(buf[0]); -+ cladatum->default_role = le32_to_cpu(buf[1]); -+ cladatum->default_range = le32_to_cpu(buf[2]); -+ } -+ - if (hashtab_insert(h, key, cladatum)) - goto bad; - -diff --git a/libsepol/src/write.c b/libsepol/src/write.c -index e34ab52..22e6143 100644 ---- a/libsepol/src/write.c -+++ b/libsepol/src/write.c -@@ -976,6 +976,18 @@ static int class_write(hashtab_key_t key, hashtab_datum_t datum, void *ptr) - return POLICYDB_ERROR; - } - -+ if ((p->policy_type == POLICY_KERN && -+ p->policyvers >= POLICYDB_VERSION_NEW_OBJECT_DEFAULTS) || -+ (p->policy_type == POLICY_BASE && -+ p->policyvers >= MOD_POLICYDB_VERSION_NEW_OBJECT_DEFAULTS)) { -+ buf[0] = cpu_to_le32(cladatum->default_user); -+ buf[1] = cpu_to_le32(cladatum->default_role); -+ buf[2] = cpu_to_le32(cladatum->default_range); -+ items = put_entry(buf, sizeof(uint32_t), 3, fp); -+ if (items != 3) -+ return POLICYDB_ERROR; -+ } -+ - return POLICYDB_SUCCESS; - } - diff --git a/xfsprogs/xfsprogs.nm b/xfsprogs/xfsprogs.nm index b8ee34e..ec0e486 100644 --- a/xfsprogs/xfsprogs.nm +++ b/xfsprogs/xfsprogs.nm @@ -4,7 +4,7 @@ ############################################################################### name = xfsprogs -version = 3.1.7 +version = 3.1.8 release = 1 groups = System/Filesystems @@ -30,35 +30,24 @@ build end configure_options += \ - --bindir=/sbin \ - --sbindir=/sbin \ - --libdir=/%{lib} \ --libexecdir=%{libdir} \ --enable-readline=yes \ - --enable-blkid=yes \ - --disable-static - - configure_cmds - # Kill rpaths - sed -i libtool \ - -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ - -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' - end + --enable-blkid=yes make_build_targets += V=1 DEBUG=-DNDEBUG install - make install install-dev install-qa V=1 DIST_ROOT=%{BUILDROOT} - - chmod -v 755 %{BUILDROOT}/%{lib}/libhandle.so* - rm -vf %{BUILDROOT}/%{lib}/libhandle.so - mkdir -pv %{BUILDROOT}%{libdir} - ln -svf ../../%{lib}/libhandle.so.1 %{BUILDROOT}%{libdir}/libhandle.so + make install install-dev install-qa V=1 DIST_ROOT=%{BUILDROOT} \ + PKG_ROOT_SBIN_DIR=%{sbindir} PKG_ROOT_LIB_DIR=%{libdir} end end packages package %{name} + conflicts + filesystem < 002 + end + end package %{name}-devel template DEVEL hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 620459d13810510944f28c909f6f614d190ac420
by git＠ipfire.org 14 Apr '12

14 Apr '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 620459d13810510944f28c909f6f614d190ac420 (commit) via 0e7f182f115cf5c6be3da98586cb99ba8ab93aa1 (commit) via b25c05d01739ddbfd625eea46d0b78208952b724 (commit) via 98b1ec855a5585ebddb48a9c33e552f94041d686 (commit) via 1daed6d3807e11bb3c446845add02211e6311099 (commit) via 71b985af7c5c40d4e17d2d6201d4bc90620a8d8d (commit) via 6793fec1c66a8741cb2576183b07f3fb24f0a3f0 (commit) via 0efbb74b89b62afa34b6075a3e6e79dea0cd6116 (commit) via 3d038b51f066545d7bd29875820b0b0fad5c577b (commit) via f23fe4ed9c8b7a5e28235364b089703a799940c6 (commit) via f1dcb6949bffb76f364ecaa9b4231058d8da9059 (commit) via 0da54dea63b5b5c747d8a4a371c4ff311f9ba823 (commit) via 2afe3d248e9e9307476aed66003dac9b4802b590 (commit) from 7b2d31434f04590df1dd2f2dd40e9d1ec15b5840 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 620459d13810510944f28c909f6f614d190ac420 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Apr 15 01:24:50 2012 +0200 initscripts: Move everything to /usr. commit 0e7f182f115cf5c6be3da98586cb99ba8ab93aa1 Merge: b25c05d 2afe3d2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Apr 15 01:15:58 2012 +0200 Merge remote-tracking branch 'stevee/rc.local-fix' commit b25c05d01739ddbfd625eea46d0b78208952b724 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Apr 15 01:15:12 2012 +0200 grubby: Update to 8.11. commit 98b1ec855a5585ebddb48a9c33e552f94041d686 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Apr 15 01:14:50 2012 +0200 isdn4k-utils: Move everything to /usr. commit 1daed6d3807e11bb3c446845add02211e6311099 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Apr 15 01:14:06 2012 +0200 pam: Move everything to /usr. commit 71b985af7c5c40d4e17d2d6201d4bc90620a8d8d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Apr 15 01:13:43 2012 +0200 udev: Move everything to /usr. commit 6793fec1c66a8741cb2576183b07f3fb24f0a3f0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Apr 15 01:12:10 2012 +0200 systemd: Update to 44. Moves everything to /usr. commit 0efbb74b89b62afa34b6075a3e6e79dea0cd6116 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Apr 15 00:44:37 2012 +0200 coreutils: Add forgotten patch that adds the runuser command. commit 3d038b51f066545d7bd29875820b0b0fad5c577b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Apr 15 00:30:31 2012 +0200 util-linux: Move everything to /usr. commit f23fe4ed9c8b7a5e28235364b089703a799940c6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Apr 15 00:29:53 2012 +0200 sed: Move everything to /usr. commit f1dcb6949bffb76f364ecaa9b4231058d8da9059 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Apr 15 00:28:14 2012 +0200 linux-firmware: Move everything to /usr. commit 0da54dea63b5b5c747d8a4a371c4ff311f9ba823 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Apr 15 00:28:02 2012 +0200 libsepol: Move libs to /usr. commit 2afe3d248e9e9307476aed66003dac9b4802b590 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Apr 14 19:46:14 2012 +0200 initscripts: Remove unsupported check from systemd file. The ConditionFileIsExecuteable check from systemd has been removed. So parsing of our service file allways fails on newer versions of systemd. Fixes #10072 ----------------------------------------------------------------------- Summary of changes: coreutils/coreutils.nm | 2 +- coreutils/patches/coreutils-8.7-runuser.patch | 338 ++++++++++++++++++++ grubby/grubby.nm | 7 +- initscripts/initscripts.nm | 12 +- initscripts/src/Makefile | 7 +- initscripts/systemd/rc-local.service | 1 - isdn4k-utils/40-isdn.rules | 4 - isdn4k-utils/isdn4k-utils.nm | 18 +- libsepol/libsepol.nm | 4 +- linux-firmware/linux-firmware.nm | 6 +- pam/pam.nm | 10 +- sed/sed.nm | 14 +- .../systemd-44-fix-journald-PAGE_SIZE-on-arm.patch | 44 +++ ...ystemd-ipfire.patch => systemd-44-ipfire.patch} | 30 +-- systemd/systemd.nm | 120 ++++---- udev/udev.nm | 24 +- util-linux/util-linux.nm | 42 ++- 17 files changed, 547 insertions(+), 136 deletions(-) create mode 100644 coreutils/patches/coreutils-8.7-runuser.patch delete mode 100644 isdn4k-utils/40-isdn.rules create mode 100644 systemd/patches/systemd-44-fix-journald-PAGE_SIZE-on-arm.patch rename systemd/patches/{systemd-ipfire.patch => systemd-44-ipfire.patch} (56%) Difference in files: diff --git a/coreutils/coreutils.nm b/coreutils/coreutils.nm index e0b5feb..3b04de3 100644 --- a/coreutils/coreutils.nm +++ b/coreutils/coreutils.nm @@ -5,7 +5,7 @@ name = coreutils version = 8.16 -release = 2 +release = 3 groups = System/Base url = http://www.gnu.org/software/coreutils/ diff --git a/coreutils/patches/coreutils-8.7-runuser.patch b/coreutils/patches/coreutils-8.7-runuser.patch new file mode 100644 index 0000000..533e15a --- /dev/null +++ b/coreutils/patches/coreutils-8.7-runuser.patch @@ -0,0 +1,338 @@ +diff -urNp coreutils-8.7-orig/AUTHORS coreutils-8.7/AUTHORS +--- coreutils-8.7-orig/AUTHORS 2010-10-11 19:35:11.000000000 +0200 ++++ coreutils-8.7/AUTHORS 2010-11-15 10:08:04.222078001 +0100 +@@ -65,6 +65,7 @@ readlink: Dmitry V. Levin + rm: Paul Rubin, David MacKenzie, Richard M. Stallman, Jim Meyering + rmdir: David MacKenzie + runcon: Russell Coker ++runuser: David MacKenzie, Dan Walsh + seq: Ulrich Drepper + sha1sum: Ulrich Drepper, Scott Miller, David Madore + sha224sum: Ulrich Drepper, Scott Miller, David Madore +diff -urNp coreutils-8.7-orig/man/help2man coreutils-8.7/man/help2man +--- coreutils-8.7-orig/man/help2man 2010-10-11 19:35:11.000000000 +0200 ++++ coreutils-8.7/man/help2man 2010-11-15 10:08:51.331054884 +0100 +@@ -555,6 +555,9 @@ while (length) + $include{$sect} .= $content; + } + ++# There is no info documentation for runuser (shared with su). ++$opt_no_info = 1 if $program eq 'runuser'; ++ + # Refer to the real documentation. + unless ($opt_no_info) + { +diff -urNp coreutils-8.7-orig/man/Makefile.am coreutils-8.7/man/Makefile.am +--- coreutils-8.7-orig/man/Makefile.am 2010-10-11 19:35:11.000000000 +0200 ++++ coreutils-8.7/man/Makefile.am 2010-11-15 10:09:21.768922182 +0100 +@@ -94,6 +94,7 @@ readlink.1: $(common_dep) $(srcdir)/read + rm.1: $(common_dep) $(srcdir)/rm.x ../src/rm.c + rmdir.1: $(common_dep) $(srcdir)/rmdir.x ../src/rmdir.c + runcon.1: $(common_dep) $(srcdir)/runcon.x ../src/runcon.c ++runuser.1: $(common_dep) $(srcdir)/runuser.x ../src/su.c + seq.1: $(common_dep) $(srcdir)/seq.x ../src/seq.c + sha1sum.1: $(common_dep) $(srcdir)/sha1sum.x ../src/md5sum.c + sha224sum.1: $(common_dep) $(srcdir)/sha224sum.x ../src/md5sum.c +diff -urNp coreutils-8.7-orig/man/runuser.x coreutils-8.7/man/runuser.x +--- coreutils-8.7-orig/man/runuser.x 1970-01-01 01:00:00.000000000 +0100 ++++ coreutils-8.7/man/runuser.x 2010-11-15 10:09:57.437939015 +0100 +@@ -0,0 +1,12 @@ ++[NAME] ++runuser \- run a shell with substitute user and group IDs ++[DESCRIPTION] ++.\" Add any additional description here ++[SEE ALSO] ++.TP ++More detailed Texinfo documentation could be found by command ++.TP ++\t\fBinfo coreutils \(aqsu invocation\(aq\fR\t ++.TP ++since the command \fBrunuser\fR is trimmed down version of command \fBsu\fR. ++.br +diff -urNp coreutils-8.7-orig/README coreutils-8.7/README +--- coreutils-8.7-orig/README 2010-10-11 19:35:11.000000000 +0200 ++++ coreutils-8.7/README 2010-11-15 10:10:43.002922253 +0100 +@@ -11,8 +11,8 @@ The programs that can be built with this + factor false fmt fold groups head hostid hostname id install join kill + link ln logname ls md5sum mkdir mkfifo mknod mktemp mv nice nl nohup + nproc od paste pathchk pinky pr printenv printf ptx pwd readlink realpath +- rm rmdir runcon seq sha1sum sha224sum sha256sum sha384sum sha512sum shred +- shuf sleep sort split stat stdbuf stty su sum sync tac tail tee test ++ rm rmdir runcon runuser seq sha1sum sha224sum sha256sum sha384sum sha512sum ++ shred shuf sleep sort split stat stdbuf stty su sum sync tac tail tee test + timeout touch tr true truncate tsort tty uname unexpand uniq unlink + uptime users vdir wc who whoami yes + +diff -urNp coreutils-8.7-orig/src/Makefile.am coreutils-8.7/src/Makefile.am +--- coreutils-8.7-orig/src/Makefile.am 2010-11-15 10:07:07.339171659 +0100 ++++ coreutils-8.7/src/Makefile.am 2010-11-15 10:12:14.847094550 +0100 +@@ -100,6 +100,7 @@ EXTRA_PROGRAMS = \ + rm \ + rmdir \ + runcon \ ++ runuser \ + seq \ + sha1sum \ + sha224sum \ +@@ -300,6 +301,10 @@ cp_LDADD += $(copy_LDADD) + ginstall_LDADD += $(copy_LDADD) + mv_LDADD += $(copy_LDADD) + ++runuser_SOURCES = su.c ++runuser_CFLAGS = -DRUNUSER -DAUTHORS="\"David MacKenzie, Dan Walsh\"" ++runuser_LDADD = $(LDADD) $(LIB_CRYPT) $(PAM_LIBS) ++ + remove_LDADD = + mv_LDADD += $(remove_LDADD) + rm_LDADD += $(remove_LDADD) +@@ -395,7 +400,7 @@ RELEASE_YEAR = \ + `sed -n '/.*COPYRIGHT_YEAR = $[0-9][0-9][0-9][0-9]$ };/s//\1/p' \ + $(top_srcdir)/lib/version-etc.c` + +-all-local: su$(EXEEXT) ++all-local: su$(EXEEXT) runuser + + installed_su = $(DESTDIR)$(bindir)/`echo su|sed '$(transform)'` + +diff -urNp coreutils-8.7-orig/src/su.c coreutils-8.7/src/su.c +--- coreutils-8.7-orig/src/su.c 2010-11-15 10:07:07.372933288 +0100 ++++ coreutils-8.7/src/su.c 2010-11-15 10:42:12.569159230 +0100 +@@ -100,9 +100,15 @@ + #include "error.h" + + /* The official name of this program (e.g., no 'g' prefix). */ ++#ifndef RUNUSER + #define PROGRAM_NAME "su" ++#else ++#define PROGRAM_NAME "runuser" ++#endif + ++#ifndef AUTHORS + #define AUTHORS proper_name ("David MacKenzie") ++#endif + + #if HAVE_PATHS_H + # include <paths.h> +@@ -140,6 +146,9 @@ + #ifndef USE_PAM + char *crypt (char const *key, char const *salt); + #endif ++#ifndef CHECKPASSWD ++#define CHECKPASSWD 1 ++#endif + + static void run_shell (char const *, char const *, char **, size_t) + ATTRIBUTE_NORETURN; +@@ -169,6 +178,10 @@ static struct option const longopts[] = + {"login", no_argument, NULL, 'l'}, + {"preserve-environment", no_argument, NULL, 'p'}, + {"shell", required_argument, NULL, 's'}, ++#ifdef RUNUSER ++ {"group", required_argument, NULL, 'g'}, ++ {"supp-group", required_argument, NULL, 'G'}, ++#endif + {GETOPT_HELP_OPTION_DECL}, + {GETOPT_VERSION_OPTION_DECL}, + {NULL, 0, NULL, 0} +@@ -444,6 +457,11 @@ correct_password (const struct passwd *p + retval = pam_set_item (pamh, PAM_RUSER, (const void *) lpw->pw_name); + PAM_BAIL_P (return false); + } ++#ifdef RUNUSER ++ if (getuid() != geteuid()) ++ /* safety net: deny operation if we are suid by accident */ ++ error(EXIT_FAILURE, 1, "runuser may not be setuid"); ++#else + retval = pam_authenticate (pamh, 0); + PAM_BAIL_P (return false); + retval = pam_acct_mgmt (pamh, 0); +@@ -454,6 +472,7 @@ correct_password (const struct passwd *p + PAM_BAIL_P (return false); + } + PAM_BAIL_P (return false); ++#endif + /* Must be authenticated if this point was reached. */ + return true; + #else /* !USE_PAM */ +@@ -533,11 +552,22 @@ modify_environment (const struct passwd + /* Become the user and group(s) specified by PW. */ + + static void +-init_groups (const struct passwd *pw) ++init_groups (const struct passwd *pw ++#ifdef RUNUSER ++ , gid_t *groups, int num_groups ++#endif ++ ) + { + #ifdef HAVE_INITGROUPS ++ int rc = 0; + errno = 0; +- if (initgroups (pw->pw_name, pw->pw_gid) == -1) ++#ifdef RUNUSER ++ if (num_groups) ++ rc = setgroups(num_groups, groups); ++ else ++#endif ++ rc = initgroups(pw->pw_name, pw->pw_gid); ++ if (rc == -1) + { + #ifdef USE_PAM + cleanup_pam (PAM_ABORT); +@@ -639,6 +669,28 @@ usage (int status) + else + { + printf (_("Usage: %s [OPTION]... [-] [USER [ARG]...]\n"), program_name); ++#ifdef RUNUSER ++ printf (_("\ ++Change the effective user id and group id to that of USER. Only session PAM\n\ ++hooks are run, and there is no password prompt. This command is useful only\n\ ++when run as the root user. If run as a non-root user without privilege\n\ ++to set user ID, the command will fail as the binary is not setuid.\n\ ++As %s doesn't run auth and account PAM hooks, it runs with lower overhead\n\ ++than su.\n\ ++\n\ ++ -, -l, --login make the shell a login shell, uses runuser-l\n\ ++ PAM file instead of default one\n\ ++ -g --group=group specify the primary group\n\ ++ -G --supp-group=group specify a supplemental group\n\ ++ -c, --command=COMMAND pass a single COMMAND to the shell with -c\n\ ++ --session-command=COMMAND pass a single COMMAND to the shell with -c\n\ ++ and do not create a new session\n\ ++ -f, --fast pass -f to the shell (for csh or tcsh)\n\ ++ -m, --preserve-environment do not reset environment variables\n\ ++ -p same as -m\n\ ++ -s, --shell=SHELL run SHELL if /etc/shells allows it\n\ ++"), program_name); ++#else + fputs (_("\ + Change the effective user id and group id to that of USER.\n\ + \n\ +@@ -651,6 +703,7 @@ Change the effective user id and group i + -p same as -m\n\ + -s, --shell=SHELL run SHELL if /etc/shells allows it\n\ + "), stdout); ++#endif + fputs (HELP_OPTION_DESCRIPTION, stdout); + fputs (VERSION_OPTION_DESCRIPTION, stdout); + fputs (_("\ +@@ -672,6 +725,12 @@ main (int argc, char **argv) + char *shell = NULL; + struct passwd *pw; + struct passwd pw_copy; ++#ifdef RUNUSER ++ struct group *gr; ++ gid_t groups[NGROUPS_MAX]; ++ int num_supp_groups = 0; ++ int use_gid = 0; ++#endif + + initialize_main (&argc, &argv); + set_program_name (argv[0]); +@@ -686,7 +745,11 @@ main (int argc, char **argv) + simulate_login = false; + change_environment = true; + +- while ((optc = getopt_long (argc, argv, "c:flmps:", longopts, NULL)) != -1) ++ while ((optc = getopt_long (argc, argv, "c:flmps:" ++#ifdef RUNUSER ++ "g:G:" ++#endif ++ , longopts, NULL)) != -1) + { + switch (optc) + { +@@ -716,6 +779,28 @@ main (int argc, char **argv) + shell = optarg; + break; + ++#ifdef RUNUSER ++ case 'g': ++ gr = getgrnam(optarg); ++ if (!gr) ++ error (EXIT_FAILURE, 0, _("group %s does not exist"), optarg); ++ use_gid = 1; ++ groups[0] = gr->gr_gid; ++ break; ++ ++ case 'G': ++ num_supp_groups++; ++ if (num_supp_groups >= NGROUPS_MAX) ++ error (EXIT_FAILURE, 0, ++ _("Can't specify more than %d supplemental groups"), ++ NGROUPS_MAX - 1); ++ gr = getgrnam(optarg); ++ if (!gr) ++ error (EXIT_FAILURE, 0, _("group %s does not exist"), optarg); ++ groups[num_supp_groups] = gr->gr_gid; ++ break; ++#endif ++ + case_GETOPT_HELP_CHAR; + + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); +@@ -754,7 +839,20 @@ main (int argc, char **argv) + : DEFAULT_SHELL); + endpwent (); + +- if (!correct_password (pw)) ++#ifdef RUNUSER ++ if (num_supp_groups && !use_gid) ++ { ++ pw->pw_gid = groups[1]; ++ memmove (groups, groups + 1, sizeof(gid_t) * num_supp_groups); ++ } ++ else if (use_gid) ++ { ++ pw->pw_gid = groups[0]; ++ num_supp_groups++; ++ } ++#endif ++ ++ if (CHECKPASSWD && !correct_password (pw)) + { + #ifdef SYSLOG_FAILURE + log_su (pw, false); +@@ -784,7 +882,11 @@ main (int argc, char **argv) + } + shell = xstrdup (shell ? shell : pw->pw_shell); + +- init_groups (pw); ++ init_groups (pw ++#ifdef RUNUSER ++ , groups, num_supp_groups ++#endif ++ ); + + #ifdef USE_PAM + create_watching_parent (); +diff -urNp coreutils-8.7-orig/tests/misc/help-version coreutils-8.7/tests/misc/help-version +--- coreutils-8.7-orig/tests/misc/help-version 2010-10-11 19:35:11.000000000 +0200 ++++ coreutils-8.7/tests/misc/help-version 2010-11-15 10:45:18.473682325 +0100 +@@ -32,6 +32,7 @@ expected_failure_status_nohup=125 + expected_failure_status_stdbuf=125 + expected_failure_status_su=125 + expected_failure_status_timeout=125 ++expected_failure_status_runuser=125 + expected_failure_status_printenv=2 + expected_failure_status_tty=3 + expected_failure_status_sort=2 +@@ -209,6 +210,7 @@ seq_setup () { args=10; } + sleep_setup () { args=0; } + su_setup () { args=--version; } + stdbuf_setup () { args="-oL true"; } ++runuser_setup () { args=--version; } + timeout_setup () { args=--version; } + + # I'd rather not run sync, since it spins up disks that I've +diff -urNp coreutils-8.7-orig/tests/misc/invalid-opt coreutils-8.7/tests/misc/invalid-opt +--- coreutils-8.7-orig/tests/misc/invalid-opt 2010-10-11 19:35:11.000000000 +0200 ++++ coreutils-8.7/tests/misc/invalid-opt 2010-11-15 10:45:46.451938873 +0100 +@@ -37,6 +37,7 @@ my %exit_status = + sort => 2, + stdbuf => 125, + su => 125, ++ runuser => 125, + test => 0, + timeout => 125, + true => 0, diff --git a/grubby/grubby.nm b/grubby/grubby.nm index 830f27d..b471a7a 100644 --- a/grubby/grubby.nm +++ b/grubby/grubby.nm @@ -4,7 +4,7 @@ ############################################################################### name = grubby -version = 8.9 +version = 8.11 release = 1 groups = System/Base @@ -36,6 +36,11 @@ build end make_install_targets += mandir=%{mandir} + + install_cmds + mkdir -pv %{BUILDROOT}%{prefix} + mv -v %{BUILDROOT}{,%{prefix}}/sbin + end end packages diff --git a/initscripts/initscripts.nm b/initscripts/initscripts.nm index 3b9e079..ede6bd9 100644 --- a/initscripts/initscripts.nm +++ b/initscripts/initscripts.nm @@ -6,7 +6,7 @@ name = initscripts epoch = 1 version = 2.99 -release = 13 +release = 15 groups = System/Boot url = @@ -25,6 +25,8 @@ build requires glib2-devel popt-devel + shadow-utils + systemd-units end DIR_APP = %{DIR_SOURCE} @@ -48,8 +50,8 @@ build install -v -m 755 %{DIR_SOURCE}/rc.local %{BUILDROT}/etc/rc.local # Install udev rules - mkdir -pv %{BUILDROOT}/lib/udev/rules.d/ - cp -vf %{DIR_SOURCE}/udev/* %{BUILDROOT}/lib/udev/rules.d/ + mkdir -pv %{BUILDROOT}%{prefix}/lib/udev/rules.d/ + cp -vf %{DIR_SOURCE}/udev/* %{BUILDROOT}%{prefix}/lib/udev/rules.d/ end end @@ -71,6 +73,10 @@ packages util-linux end + conflicts + filesystem < 002 + end + configfiles /etc/rc.local end diff --git a/initscripts/src/Makefile b/initscripts/src/Makefile index a6b0f31..c357d6e 100644 --- a/initscripts/src/Makefile +++ b/initscripts/src/Makefile @@ -3,6 +3,7 @@ PROGS = ipcalc securetty CC = gcc CFLAGS += -D_GNU_SOURCE $(shell pkg-config --cflags glib-2.0) +prefix ?= /usr all: $(PROGS) @@ -14,9 +15,9 @@ test: ipcalc install: $(PROGS) # Install binaries - -mkdir -pv $(DESTDIR)/lib/udev $(DESTDIR)/{,s}bin - install -v -m 755 ipcalc $(DESTDIR)/bin - install -v -m 755 securetty $(DESTDIR)/sbin + -mkdir -pv $(DESTDIR)$(prefix)/lib/udev $(DESTDIR)$(prefix)/{,s}bin + install -v -m 755 ipcalc $(DESTDIR)$(prefix)/bin + install -v -m 755 securetty $(DESTDIR)$(prefix)/sbin # Install man pages -mkdir -pv $(DESTDIR)/usr/share/man/man1 diff --git a/initscripts/systemd/rc-local.service b/initscripts/systemd/rc-local.service index 04daed0..f7b7c0d 100644 --- a/initscripts/systemd/rc-local.service +++ b/initscripts/systemd/rc-local.service @@ -1,6 +1,5 @@ [Unit] Description=/etc/rc.local Compatiblity -ConditionFileIsExecuteable=/etc/rc.local Requires=multi-user.target After=multi-user.target network.target diff --git a/isdn4k-utils/40-isdn.rules b/isdn4k-utils/40-isdn.rules deleted file mode 100644 index 1a31cb6..0000000 --- a/isdn4k-utils/40-isdn.rules +++ /dev/null @@ -1,4 +0,0 @@ -# do not edit this file, it will be overwritten on update - -SUBSYSTEM=="capi", KERNEL=="capi", NAME="capi20", GROUP="dialout" -SUBSYSTEM=="tty", KERNEL=="capi[0-9]*", NAME="capi/%n" diff --git a/isdn4k-utils/isdn4k-utils.nm b/isdn4k-utils/isdn4k-utils.nm index 38149ed..425cd20 100644 --- a/isdn4k-utils/isdn4k-utils.nm +++ b/isdn4k-utils/isdn4k-utils.nm @@ -6,7 +6,7 @@ name = isdn4k-utils version = 3.2 devel_ver = CVS-2010-05-01 -release = 6 +release = 7 thisapp = %{name}-%{devel_ver}-patched groups = Networking/Tools @@ -59,11 +59,11 @@ build sed -e "s/^CONFIG_XISDNLOAD=.*/#&/" -i .config echo "CONFIG_GENMAN=y" >> .config echo "CONFIG_FAQ=y" >> .config - echo "CONFIG_FAQDIR='/usr/share/doc/isdn4k-utils'" >> .config - echo "CONFIG_DATADIR='/usr/share/isdn'" >> .config + echo "CONFIG_FAQDIR='%{datadir}/doc/isdn4k-utils'" >> .config + echo "CONFIG_DATADIR='%{datadir}/isdn'" >> .config echo "LIBDIR='%{libdir}'" >> .config - echo "CONFIG_FIRMWAREDIR='/usr/share/isdn'" >> .config - echo "CONFIG_CARD_SBINDIR='/sbin'" >> .config + echo "CONFIG_FIRMWAREDIR='%{datadir}/isdn'" >> .config + echo "CONFIG_CARD_SBINDIR='%{sbindir}'" >> .config sed -e "s,',,g" .config > .config.h end @@ -77,10 +77,6 @@ build mkdir -pv %{BUILDROOT}/usr/sbin make install CFLAGS="%{CFLAGS}" LIBDIR="%{libdir}" DESTDIR="%{BUILDROOT}" - # Install udev rules for isdn. - mkdir -pv %{BUILDROOT}/%{lib}/udev/rules.d/ - install -m 644 %{DIR_SOURCE}/40-isdn.rules %{BUILDROOT}/%{lib}/udev/rules.d/ - # Install config files for capi. mkdir -pv %{BUILDROOT}/etc install -m 644 capiinit/capi.conf %{BUILDROOT}/etc @@ -96,6 +92,10 @@ packages package %{name} prerequires += systemd-units + conflicts + filesystem < 002 + end + configfiles /etc/capi.conf /etc/capi20.conf diff --git a/libsepol/libsepol.nm b/libsepol/libsepol.nm index 19042fd..52d1426 100644 --- a/libsepol/libsepol.nm +++ b/libsepol/libsepol.nm @@ -5,7 +5,7 @@ name = libsepol version = 2.1.4 -release = 4 +release = 5 groups = System/Libraries url = http://www.selinuxproject.org @@ -32,7 +32,7 @@ build # Install libraries to correct place. make_install_targets += \ LIBDIR="%{BUILDROOT}%{libdir}" \ - SHLIBDIR="%{BUILDROOT}/%{lib}" + SHLIBDIR="%{BUILDROOT}%{libdir}" install_cmds # Remove binaries diff --git a/linux-firmware/linux-firmware.nm b/linux-firmware/linux-firmware.nm index ec5766d..2650d51 100644 --- a/linux-firmware/linux-firmware.nm +++ b/linux-firmware/linux-firmware.nm @@ -5,7 +5,7 @@ name = linux-firmware version = 20110311 -release = 2 +release = 3 arch = noarch maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> @@ -29,8 +29,8 @@ build end install - mkdir -pv %{BUILDROOT}/lib/firmware - cp -prv * %{BUILDROOT}/lib/firmware + mkdir -pv %{BUILDROOT}%{prefix}/lib/firmware + cp -prv * %{BUILDROOT}%{prefix}/lib/firmware end end diff --git a/pam/pam.nm b/pam/pam.nm index 4bb01c9..71f4a09 100644 --- a/pam/pam.nm +++ b/pam/pam.nm @@ -5,7 +5,7 @@ name = pam version = 1.1.5 -release = 1 +release = 2 thisapp = Linux-PAM-%{version} groups = System/Base @@ -34,20 +34,12 @@ build end configure_options += \ - --libdir=/%{lib} \ --includedir=%{includedir}/security \ --docdir=/usr/share/doc/Linux-PAM-%{version} \ --enable-read-both-confs \ --disable-rpath install_cmds - mkdir -pv %{BUILDROOT}%{libdir} - for LINK in libpam{,c,_misc}.so; do - ln -v -sf ../../%{lib}/$(readlink %{BUILDROOT}/%{lib}/${LINK}) \ - %{BUILDROOT}%{libdir}/${LINK} - rm -v %{BUILDROOT}/%{lib}/${LINK} - done - #useradd -D -b /home #sed -i 's/yes/no/' %{BUILDROOT}/etc/default/useradd mkdir -pv %{BUILDROOT}/etc/security diff --git a/sed/sed.nm b/sed/sed.nm index 0c43fbb..556ef7c 100644 --- a/sed/sed.nm +++ b/sed/sed.nm @@ -5,7 +5,7 @@ name = sed version = 4.2.1 -release = 2 +release = 3 groups = Applications/Text url = http://sed.sourceforge.net/ @@ -28,9 +28,7 @@ build end configure_options += \ - --bindir=/bin \ - --without-included-regex \ - --mandir=/usr/share/man + --without-included-regex test make check @@ -40,6 +38,14 @@ end packages package %{name} groups += Base Build + + provides + /bin/sed + end + + conflicts + filesystem < 002 + end end package %{name}-debuginfo diff --git a/systemd/patches/systemd-44-fix-journald-PAGE_SIZE-on-arm.patch b/systemd/patches/systemd-44-fix-journald-PAGE_SIZE-on-arm.patch new file mode 100644 index 0000000..623bea1 --- /dev/null +++ b/systemd/patches/systemd-44-fix-journald-PAGE_SIZE-on-arm.patch @@ -0,0 +1,44 @@ +From 7264278fbbdc1dc6c30fedc902d1337594aa6ff6 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart(a)poettering.net> +Date: Wed, 21 Mar 2012 22:47:44 +0000 +Subject: journal: PAGE_SIZE is not known on ppc and other archs + +Let's use NAME_MAX, as suggested by Dan Walsh +--- +diff --git a/src/journal/journald.c b/src/journal/journald.c +index d27cb60..87390bd 100644 +--- a/src/journal/journald.c ++++ b/src/journal/journald.c +@@ -29,7 +29,6 @@ + #include <sys/ioctl.h> + #include <linux/sockios.h> + #include <sys/statvfs.h> +-#include <sys/user.h> + + #include <systemd/sd-journal.h> + #include <systemd/sd-login.h> +@@ -2149,10 +2148,20 @@ static int process_event(Server *s, struct epoll_event *ev) { + size_t label_len = 0; + union { + struct cmsghdr cmsghdr; ++ ++ /* We use NAME_MAX space for the ++ * SELinux label here. The kernel ++ * currently enforces no limit, but ++ * according to suggestions from the ++ * SELinux people this will change and ++ * it will probably be identical to ++ * NAME_MAX. For now we use that, but ++ * this should be updated one day when ++ * the final limit is known.*/ + uint8_t buf[CMSG_SPACE(sizeof(struct ucred)) + + CMSG_SPACE(sizeof(struct timeval)) + +- CMSG_SPACE(sizeof(int)) + +- CMSG_SPACE(PAGE_SIZE)]; /* selinux label */ ++ CMSG_SPACE(sizeof(int)) + /* fd */ ++ CMSG_SPACE(NAME_MAX)]; /* selinux label */ + } control; + ssize_t n; + int v; +-- +cgit v0.9.0.2-2-gbebe diff --git a/systemd/patches/systemd-44-ipfire.patch b/systemd/patches/systemd-44-ipfire.patch new file mode 100644 index 0000000..6dca550 --- /dev/null +++ b/systemd/patches/systemd-44-ipfire.patch @@ -0,0 +1,34 @@ +diff -Nur a/configure.ac b/configure.ac +--- a/configure.ac 2012-03-16 01:46:57.000000000 +0100 ++++ b/configure.ac 2012-03-24 20:43:33.723789319 +0100 +@@ -396,7 +396,7 @@ + + AC_PATH_PROG([M4], [m4]) + +-AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinux, mandriva, meego, mageia, angstrom or other])) ++AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinux, mandriva, meego, mageia, angstrom, ipfire or other])) + if test "z$with_distro" = "z"; then + if test "$cross_compiling" = yes; then + AC_MSG_WARN([Target distribution cannot be reliably detected when cross-compiling. You should specify it with --with-distro (see $0 --help for recognized distros)]) +@@ -492,6 +492,13 @@ + M4_DISTRO_FLAG=-DTARGET_MAGEIA=1 + have_plymouth=yes + ;; ++ ipfire) ++ SYSTEM_SYSVINIT_PATH= ++ SYSTEM_SYSVRCND_PATH= ++ AC_DEFINE(TARGET_IPFIRE, [], [Target is IPFire]) ++ M4_DEFINES=-DTARGET_IPFIRE=1 ++ have_plymouth=yes ++ ;; + other) + ;; + *) +@@ -550,6 +557,7 @@ + AM_CONDITIONAL(TARGET_MEEGO, test x"$with_distro" = xmeego) + AM_CONDITIONAL(TARGET_ANGSTROM, test x"$with_distro" = xangstrom) + AM_CONDITIONAL(TARGET_MAGEIA, test x"$with_distro" = xmageia) ++AM_CONDITIONAL(TARGET_IPFIRE, test x"$with_distro" = xipfire) + + AM_CONDITIONAL(HAVE_PLYMOUTH, test "$have_plymouth" = "yes") + AM_CONDITIONAL(HAVE_SYSV_COMPAT, test "$SYSTEM_SYSV_COMPAT" = "yes") diff --git a/systemd/patches/systemd-ipfire.patch b/systemd/patches/systemd-ipfire.patch deleted file mode 100644 index 4cf071a..0000000 --- a/systemd/patches/systemd-ipfire.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Nur systemd-37_orig/configure.ac systemd-37/configure.ac ---- systemd-37_orig/configure.ac 2011-10-11 20:46:56.000000000 +0200 -+++ systemd-37/configure.ac 2011-12-17 21:57:31.748682566 +0100 -@@ -355,7 +355,7 @@ - - AC_PATH_PROG([M4], [m4]) - --AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinux or other])) -+AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinux, ipfire or other])) - if test "z$with_distro" = "z"; then - if test "$cross_compiling" = yes; then - AC_MSG_WARN([Target distribution cannot be reliably detected when cross-compiling. You should specify it with --with-distro (see $0 --help for recognized distros)]) -@@ -374,6 +374,7 @@ - if test "x`lsb_release -is 2>/dev/null`" = "xUbuntu"; then - with_distro="ubuntu" - fi -+ test -f "/etc/ipfire-release" && with_distro="ipfire" - fi - if test "z$with_distro" = "z"; then - with_distro=`uname -s` -@@ -458,6 +459,13 @@ - AC_DEFINE(TARGET_ANGSTROM, [], [Target is Ångström]) - M4_DEFINES=-DTARGET_ANGSTROM=1 - ;; -+ ipfire) -+ SYSTEM_SYSVINIT_PATH= -+ SYSTEM_SYSVRCND_PATH= -+ AC_DEFINE(TARGET_IPFIRE, [], [Target is IPFire]) -+ M4_DEFINES=-DTARGET_IPFIRE=1 -+ have_plymouth=yes -+ ;; - other) - ;; - *) -@@ -515,6 +523,7 @@ - AM_CONDITIONAL(TARGET_MANDRIVA, test x"$with_distro" = xmandriva) - AM_CONDITIONAL(TARGET_MEEGO, test x"$with_distro" = xmeego) - AM_CONDITIONAL(TARGET_ANGSTROM, test x"$with_distro" = xangstrom) -+AM_CONDITIONAL(TARGET_IPFIRE, test x"$with_distro" = xipfire) - - AM_CONDITIONAL(HAVE_PLYMOUTH, test "$have_plymouth" = "yes") - AM_CONDITIONAL(HAVE_SYSV_COMPAT, test "$SYSTEM_SYSV_COMPAT" = "yes") diff --git a/systemd/systemd.nm b/systemd/systemd.nm index 3a6addd..2cf294a 100644 --- a/systemd/systemd.nm +++ b/systemd/systemd.nm @@ -4,8 +4,8 @@ ############################################################################### name = systemd -version = 37 -release = 4 +version = 44 +release = 1 maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org> groups = System/Base @@ -21,6 +21,8 @@ end source_dl = http://cgit.freedesktop.org/systemd/systemd/snapshot/ build + unitdir = %{prefix}/lib/systemd/system + requires audit-devel automake @@ -32,22 +34,20 @@ build gperf gettext-devel intltool + kmod-devel >= 5 libacl-devel libcap-devel libselinux-devel libtool - libudev-devel>=172 + libudev-devel >= 172 pam-devel vala + xz-devel end configure_options += \ - --sysconfdir=/etc \ --libexecdir=%{libdir} \ - --with-rootdir= \ - --with-distro=ipfire \ - --with-udevrulesdir=/lib/udev/rules.d/ \ - --with-pamlibdir=/%{lib}/security + --with-distro=ipfire prepare_cmds ./autogen.sh ac @@ -59,43 +59,47 @@ build install_cmds # Create sysv compatible symlinks. - mkdir -pv %{BUILDROOT}/sbin - ln -svf ../bin/systemd %{BUILDROOT}/sbin/init - ln -svf ../bin/systemctl %{BUILDROOT}/sbin/reboot - ln -svf ../bin/systemctl %{BUILDROOT}/sbin/halt - ln -svf ../bin/systemctl %{BUILDROOT}/sbin/poweroff - ln -svf ../bin/systemctl %{BUILDROOT}/sbin/shutdown + mkdir -pv %{BUILDROOT}%{sbindir} + ln -svf ../lib/systemd/systemd %{BUILDROOT}/%{sbindir}/init + ln -svf ../lib/systemd/systemd %{BUILDROOT}/%{bindir}/systemd + ln -svf ../bin/systemctl %{BUILDROOT}/%{sbindir}/reboot + ln -svf ../bin/systemctl %{BUILDROOT}/%{sbindir}/halt + ln -svf ../bin/systemctl %{BUILDROOT}/%{sbindir}/poweroff + ln -svf ../bin/systemctl %{BUILDROOT}/%{sbindir}/shutdown # Create empty machine-id file. touch %{BUILDROOT}/etc/machine-id # Copy locale and console settings - mkdir -pv %{BUILDROOT}/etc - cp -vf %{DIR_SOURCE}/locale.conf %{BUILDROOT}/etc/ - cp -vf %{DIR_SOURCE}/vconsole.conf %{BUILDROOT}/etc/ + mkdir -pv %{BUILDROOT}%{sysconfdir} + cp -vf %{DIR_SOURCE}/{locale,vconsole}.conf %{BUILDROOT}%{sysconfdir} # Recreate all targets - rm -rfv %{BUILDROOT}/etc/systemd/system/*.target.wants - mkdir -pv %{BUILDROOT}/lib/systemd/system/basic.target.wants - mkdir -pv %{BUILDROOT}/lib/systemd/system/default.target.wants - mkdir -pv %{BUILDROOT}/lib/systemd/system/dbus.target.wants - mkdir -pv %{BUILDROOT}/lib/systemd/system/syslog.target.wants + rm -rfv %{BUILDROOT}%{unitdir}/*.target.wants + for i in basic.target.wants default.target.wants dbus.target.wants syslog.target.wants; do + mkdir -pv %{BUILDROOT}%{unitdir}/${i} || exit 1 + done # Remove runlevel targets and graphical.target - rm -rfv %{BUILDROOT}/lib/systemd/system/runlevel* - rm -rfv %{BUILDROOT}/lib/systemd/system/graphical.target + rm -rfv %{BUILDROOT}%{unitdir}/runlevel* + rm -rfv %{BUILDROOT}%{unitdir}/graphical.target # Set default target to multi-user - cd %{BUILDROOT}/lib/systemd/system && ln -svf multi-user.target default.target + ln -svf multi-user.target %{BUILDROOT}%{unitdir}/default.target # Replace absolute symlinks by relative ones. - cd %{BUILDROOT}/usr/lib/systemd/user/ && ln -svf ../../../../lib/systemd/system/bluetooth.target bluetooth.target - cd %{BUILDROOT}/usr/lib/systemd/user/ && ln -svf ../../../../lib/systemd/system/local-fs.target local-fs.target - cd %{BUILDROOT}/usr/lib/systemd/user/ && ln -svf ../../../../lib/systemd/system/printer.target printer.target - cd %{BUILDROOT}/usr/lib/systemd/user/ && ln -svf ../../../../lib/systemd/system/shutdown.target shutdown.target - cd %{BUILDROOT}/usr/lib/systemd/user/ && ln -svf ../../../../lib/systemd/system/sockets.target sockets.target - cd %{BUILDROOT}/usr/lib/systemd/user/ && ln -svf ../../../../lib/systemd/system/sound.target sound.target - cd %{BUILDROOT}/usr/lib/systemd/user/ && ln -svf ../../../../lib/systemd/system/swap.target swap.target + cd %{BUILDROOT}%{unitdir}/../user + for i in bluetooth local-fs printer remote-fs shutdown sockets sound swap; do + ln -svf ../system/${i}.target ${i}.target || exit 1 + done + + # Replace absolute symlink for getty(a)tty1.service. + ln -svf ../../../../%{unitdir}/getty@.service \ + %{BUILDROOT}%{sysconfdir}/systemd/system/getty.target.wants/getty(a)tty1.service + + # Replace absolute symlink for remote-fs.target. + ln -svf ../../../../%{unitdir}/remote-fs.target \ + %{BUILDROOT}%{sysconfdir}/systemd/system/multi-user.target.wants/remote-fs.target # Remove tmpfile for X11 rm -rfv %{BUILDROOT}/usr/lib/tmpfiles.d/x11.conf @@ -107,6 +111,8 @@ end packages package %{name} + prerequires += authconfig + requires dbus python-cairo @@ -116,28 +122,30 @@ packages util-linux>=2.19 end - prerequires += authconfig - conflicts += upstart + conflicts + filesystem < 002 + upstart + end script postin # Generate Machine ID. - /bin/systemd-machine-id-setup > /dev/null 2>&1 || : + /usr/bin/systemd-machine-id-setup > /dev/null 2>&1 || : # Reexec systemd daemon. - /bin/systemctl daemon-reexec > /dev/null 2>&1 || : + /usr/bin/systemctl daemon-reexec > /dev/null 2>&1 || : # Make sure pam_systemd is enabled - if ! /bin/grep -q pam_systemd /etc/pam.d/system-auth-ac ; then - /usr/sbin/authconfig --update --nostart >/dev/null 2>&1 || : + if ! grep -q pam_systemd /etc/pam.d/system-auth-ac ; then + authconfig --update --nostart >/dev/null 2>&1 || : # Try harder - /bin/grep -q pam_systemd /etc/pam.d/system-auth-ac || /usr/sbin/authconfig --updateall --nostart >/dev/null 2>&1 || : + grep -q pam_systemd /etc/pam.d/system-auth-ac || authconfig --updateall --nostart >/dev/null 2>&1 || : fi end script postup # Restart login service after update - /bin/systemctl try-restart systemd-logind.service >/dev/null 2>&1 || : + /usr/bin/systemctl try-restart systemd-logind.service >/dev/null 2>&1 || : end end @@ -154,38 +162,34 @@ packages coreutils end - files - /etc/systemd/system - /etc/tmpfiles.d - /etc/bash_completion.d/systemctl-bash-completion.sh - /lib/systemd/system + provides /bin/systemctl - /bin/systemd-tmpfiles - /usr/share/man/man1/systemctl.* end - script postin - # Enable default services. - /bin/systemctl enable \ - getty@.service \ - remote-fs.target > /dev/null 2>&1 || : + conflicts + filesystem < 002 end - script preun - # Disable default services. - /bin/systemctl disable \ - getty@.service \ - remote-fs.target > /dev/null 2>&1 || : + files + %{sysconfdir}/etc/systemd/system + %{sysconfdir}/tmpfiles.d + %{sysconfdir}/bash_completion.d/systemctl-bash-completion.sh + %{unitdir} + %{bindir}/systemctl + %{bindir}/systemd-tmpfiles + %{mandir}/man1/systemctl.* end script postup # Reload service files - /bin/systemctl daemon-reload > /dev/null 2>&1 || : + /usr/bin/systemctl daemon-reload > /dev/null 2>&1 || : end end package %{name}-devel template DEVEL + + files += %{prefix}/lib/pakfire/macros/ end package %{name}-debuginfo diff --git a/udev/udev.nm b/udev/udev.nm index b0ec1b4..cede6b3 100644 --- a/udev/udev.nm +++ b/udev/udev.nm @@ -5,7 +5,7 @@ name = udev version = 182 -release = 2 +release = 3 groups = System/Base url = ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ @@ -21,6 +21,7 @@ source_dl = ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ build requires + filesystem >= 002 glib2-devel gobject-introspection-devel gperf @@ -34,24 +35,29 @@ build libusb-compat-devel libxslt pciutils - pkg-config + shadow-utils + systemd-units usbutils end configure_options += \ - --with-rootprefix="" \ - --libexecdir=/lib \ + --libexecdir=%{prefix}/lib \ --with-selinux \ - --with-systemdsystemunitdir=/lib/systemd/system + --with-systemdsystemunitdir=%{unitdir} end packages package %{name} groups += Base - prerequires - shadow-utils + requires + hwdata systemd-units + util-linux + end + + conflicts + filesystem < 002 end script prein @@ -74,6 +80,10 @@ packages package lib%{name} template LIBS + + conflicts + filesystem < 002 + end end package lib%{name}-devel diff --git a/util-linux/util-linux.nm b/util-linux/util-linux.nm index dd825c9..e1c6355 100644 --- a/util-linux/util-linux.nm +++ b/util-linux/util-linux.nm @@ -6,7 +6,7 @@ name = util-linux major_ver = 2.21 version = %{major_ver} -release = 1 +release = 2 groups = System/Base url = http://kernel.org/~kzak/util-linux/ @@ -40,8 +40,6 @@ build -D_FILE_OFFSET_BITS=64 configure_options += \ - --bindir=/bin \ - --sbindir=/sbin \ --disable-wall \ --enable-kill \ --enable-login-utils \ @@ -64,29 +62,29 @@ build end install_cmds - mkdir -pv %{BUILDROOT}/sbin \ + mkdir -pv \ %{BUILDROOT}/var/lib/hwclock \ %{BUILDROOT}/usr/share/man/man8 \ %{BUILDROOT}/var/log - install -m 755 %{DIR_APP}/nologin %{BUILDROOT}/sbin + install -m 755 %{DIR_APP}/nologin %{BUILDROOT}%{sbindir} install -m 644 %{DIR_SOURCE}/nologin.8 %{BUILDROOT}/usr/share/man/man8/ touch %{BUILDROOT}/var/log/lastlog # Remove deprecated commands - rm -fv %{BUILDROOT}/{sbin,usr/share/man/man*}/{fsck,mkfs}.{bfs,minix}* \ - %{BUILDROOT}/usr/{,s}bin/{chkdupexe,newgrp,vi{gr,pw}} \ - %{BUILDROOT}/sbin/{sln,shutdown} %{BUILDROOT}/bin/{line,pg} + rm -fv %{BUILDROOT}/{%{sbindir},usr/share/man/man*}/{fsck,mkfs}.{bfs,minix}* \ + %{BUILDROOT}{%{bindir},%{sbindir}}/{chkdupexe,newgrp,vi{gr,pw}} \ + %{BUILDROOT}%{sbindir}/{sln,shutdown} %{BUILDROOT}%{bindir}/{line,pg} rm -fv %{BUILDROOT}/usr/share/man/man1/{chkdupexe,line,pg,newgrp}.* \ %{BUILDROOT}/usr/share/man/man8/{vipw,vigr}.* rm -fv %{BUILDROOT}/usr/share/getopt/*.tcsh # Set capabilities - chmod -v -s %{BUILDROOT}/bin/mount - setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep %{BUILDROOT}/bin/mount - chmod -v -s %{BUILDROOT}/bin/umount - setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep %{BUILDROOT}/bin/umount + chmod -v -s %{BUILDROOT}%{bindir}/mount + setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep %{BUILDROOT}%{bindir}/mount + chmod -v -s %{BUILDROOT}%{bindir}/umount + setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep %{BUILDROOT}%{bindir}/umount end end @@ -98,9 +96,23 @@ packages /etc/pam.d/system-auth end + provides + /bin/dmesg + /bin/kill + /bin/more + /bin/mount + /bin/umount + /sbin/blkid + /sbin/blockdev + /sbin/findfs + /sbin/fsck + /sbin/nologin + end + obsoletes = util-linux-ng conflicts + filesystem < 002 setup < 3.0-2 util-linux-ng sysvinit <= 2.86-2 @@ -125,6 +137,8 @@ packages part of util-linux. end + conflicts = filesystem < 002 + files %{libdir}/libblkid.* end @@ -151,6 +165,8 @@ packages part of util-linux. end + conflicts = filesystem < 002 + files %{libdir}/libuuid.* end @@ -177,6 +193,8 @@ packages part of util-linux. end + conflicts = filesystem < 002 + files %{libdir}/libmount.* end hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 7b2d31434f04590df1dd2f2dd40e9d1ec15b5840
by git＠ipfire.org 14 Apr '12

14 Apr '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 7b2d31434f04590df1dd2f2dd40e9d1ec15b5840 (commit) via 7e981e590f2c8b0e58c768697a8644abc25363c1 (commit) via 2c9c6fd6744f0b6b9f18abf4ee2fe063a34182b4 (commit) via 576c025cb402cef292b1625de2d9a90ed1ebfb42 (commit) via 53938620fde2fcc68a6392684825f283087771a8 (commit) via b38be7f7be149348b85c8087eebc06b935ce97c2 (commit) via ff3223afc8ee5454b0bc56add0074bbb72158534 (commit) via cf0ceada79d3e913179d095e62474d75453e2f75 (commit) from c4f0a82e1dceed11d9b7b4b2c56d69fcf6a6073d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7b2d31434f04590df1dd2f2dd40e9d1ec15b5840 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Apr 15 00:23:21 2012 +0200 kbd: Move everything to /usr. commit 7e981e590f2c8b0e58c768697a8644abc25363c1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Apr 15 00:22:20 2012 +0200 gcc: Move everything to /usr. commit 2c9c6fd6744f0b6b9f18abf4ee2fe063a34182b4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Apr 15 00:21:48 2012 +0200 iputils: Move everything to /usr. commit 576c025cb402cef292b1625de2d9a90ed1ebfb42 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Apr 14 23:10:02 2012 +0200 coreutils: Move everything to /usr. commit 53938620fde2fcc68a6392684825f283087771a8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Apr 14 23:00:19 2012 +0200 setup: Update bash environment files due to UsrMove. /sbin is removed from PATH. commit b38be7f7be149348b85c8087eebc06b935ce97c2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Apr 14 22:59:33 2012 +0200 libselinux: Move everything to /usr. commit ff3223afc8ee5454b0bc56add0074bbb72158534 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Apr 14 22:58:54 2012 +0200 gzip: Move everything to /usr. commit cf0ceada79d3e913179d095e62474d75453e2f75 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Apr 14 22:56:28 2012 +0200 grep: Move tool to /usr. ----------------------------------------------------------------------- Summary of changes: coreutils/coreutils.nm | 80 +++- gcc/gcc.nm | 16 +- grep/grep.nm | 13 +- gzip/gzip.nm | 32 +- iputils/iputils.nm | 62 ++-- kbd/kbd.nm | 12 +- libselinux/libselinux.nm | 9 +- libselinux/patches/libselinux-rhat.patch2 | 738 ++++++++++++++++++++++++++++- setup/profile | 4 +- setup/setup.nm | 6 +- 10 files changed, 867 insertions(+), 105 deletions(-) Difference in files: diff --git a/coreutils/coreutils.nm b/coreutils/coreutils.nm index 4fb5490..e0b5feb 100644 --- a/coreutils/coreutils.nm +++ b/coreutils/coreutils.nm @@ -5,7 +5,7 @@ name = coreutils version = 8.16 -release = 1 +release = 2 groups = System/Base url = http://www.gnu.org/software/coreutils/ @@ -38,8 +38,6 @@ build -D_GNU_SOURCE=1 \ -fno-strict-aliasing - export FORCE_UNSAFE_CONFIGURE=1 - configure_options += \ --libexecdir=%{libdir} \ --enable-pam \ @@ -48,42 +46,84 @@ build --disable-rpath \ --enable-install-program=arch,su \ --enable-no-install-program=hostname,kill,uptime \ - --with-tty-group + --with-tty-group \ + \ + gl_cv_func_mknod_works=yes prepare_cmds aclocal -I m4 autoconf --force end - test - make check - end + # FIXME broken + #test + # make check + #end + + make_install_targets += install-man install_cmds - mkdir -pv %{BUILDROOT}/{bin,etc/profile.d,usr/sbin} - mv -v %{BUILDROOT}/usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo} %{BUILDROOT}/bin - mv -v %{BUILDROOT}/usr/bin/{false,ln,ls,mkdir,mknod,mv,pwd,readlink,rm} %{BUILDROOT}/bin - mv -v %{BUILDROOT}/usr/bin/{rmdir,stty,sync,touch,true,uname} %{BUILDROOT}/bin - mv -v %{BUILDROOT}/usr/bin/chroot %{BUILDROOT}/usr/sbin - mv -v %{BUILDROOT}/usr/bin/{head,sleep,nice} %{BUILDROOT}/bin + mkdir -pv %{BUILDROOT}%{sbindir} + mv -v %{BUILDROOT}/usr/bin/chroot %{BUILDROOT}%{sbindir} + mv -v %{BUILDROOT}/usr/bin/runuser %{BUILDROOT}%{sbindir} - # Reinstall su in /bin - rm -rfv %{BUILDROOT}/usr/bin/su - install -m 4755 src/su %{BUILDROOT}/bin + # su (set right capabilities) + chmod -v u-s %{BUILDROOT}%{bindir}/su + setcap cap_setgid,cap_setuid+ep %{BUILDROOT}%{bindir}/su # Dump /etc/DIR_COLORS + mkdir -pv %{BUILDROOT}%{sysconfdir} dircolors -p > %{BUILDROOT}/etc/DIR_COLORS - cp -vf %{DIR_SOURCE}/profile.d/* %{BUILDROOT}/etc/profile.d/ - # Capabilities - chmod u-s %{BUILDROOT}/bin/su - setcap cap_setgid,cap_setuid+ep %{BUILDROOT}/bin/su + # Install profile.d. + mkdir -pv %{BUILDROOT}%{sysconfdir}/profile.d/ + cp -vf %{DIR_SOURCE}/profile.d/* %{BUILDROOT}/etc/profile.d/ end end packages package %{name} groups += Base Build + + provides + /bin/basename + /bin/cat + /bin/chgrp + /bin/chmod + /bin/chown + /bin/cp + /bin/cut + /bin/date + /bin/dd + /bin/df + /bin/echo + /bin/env + /bin/false + /bin/ln + /bin/ls + /bin/mkdir + /bin/mknod + /bin/mktemp + /bin/mv + /bin/nice + /bin/pwd + /bin/readlink + /bin/rm + /bin/rmdir + /bin/sleep + /bin/sort + /bin/stty + /bin/su + /bin/sync + /bin/touch + /bin/true + /bin/uname + /sbin/runuser + end + + conflicts + filesystem < 002 + end end package %{name}-debuginfo diff --git a/gcc/gcc.nm b/gcc/gcc.nm index a87a9bf..0528584 100644 --- a/gcc/gcc.nm +++ b/gcc/gcc.nm @@ -8,7 +8,7 @@ build_cloog_ppl = 1 name = gcc version = 4.6.3 -release = 4 +release = 5 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = Development/Compilers @@ -49,6 +49,7 @@ build dejagnu elfutils-devel expect + filesystem >= 002 flex glibc-devel gmp-devel @@ -223,8 +224,8 @@ build FULLPATH="%{BUILDROOT}%{libdir}/gcc/%{DISTRO_BUILDTARGET}/%{version}" [ -d "${FULLPATH}" ] || exit 1 - mkdir -pv %{BUILDROOT}/lib - ln -sfv ../usr/bin/cpp %{BUILDROOT}/lib/cpp + mkdir -pv %{BUILDROOT}%{prefix}/lib + ln -sfv ../bin/cpp %{BUILDROOT}%{prefix}/lib/cpp ln -sfv gcc %{BUILDROOT}/usr/bin/cc # Fix libgcc_s symlinks. @@ -289,6 +290,7 @@ packages requires binutils >= %{required_binutils_version} + filesystem >= 002 glibc-devel gmp-devel cpp = %{thisver} @@ -353,11 +355,13 @@ packages group = Development/Languages files - /lib/cpp - /usr/bin/cpp - /usr/share/man/man1/cpp.1* + %{prefix}/lib/cpp + %{bindir}/cpp + %{mandir}/man1/cpp.1* %{libdir}/gcc/%{DISTRO_BUILDTARGET}/%{version}/cc1 end + + provides = /lib/cpp end package libgcc diff --git a/grep/grep.nm b/grep/grep.nm index 2057f8b..e965177 100644 --- a/grep/grep.nm +++ b/grep/grep.nm @@ -5,7 +5,7 @@ name = grep version = 2.11 -release = 1 +release = 2 groups = Applications/Text url = http://www.gnu.org/software/grep/ @@ -26,9 +26,6 @@ build pcre-devel end - configure_options += \ - --bindir=/bin - test make check end @@ -37,6 +34,14 @@ end packages package %{name} groups += Base Build + + provides + /bin/grep + end + + conflicts + filesystem < 002 + end end package %{name}-debuginfo diff --git a/gzip/gzip.nm b/gzip/gzip.nm index 624226a..6c7a169 100644 --- a/gzip/gzip.nm +++ b/gzip/gzip.nm @@ -5,7 +5,7 @@ name = gzip version = 1.4 -release = 2 +release = 3 groups = Applications/Compression url = http://www.gzip.org/ @@ -20,33 +20,29 @@ end source_dl = build - build - # NO_ASM is for textrels. + # NO_ASM is for textrels. + configure_options += \ DEFS=NO_ASM \ - CPPFLAGS="-DHAVE_LSTAT" \ - ./configure \ - --prefix=/usr \ - --bindir=/bin - - make %{PARALLELISMFLAGS} - end + CPPFLAGS="-DHAVE_LSTAT" test make check end - - install - make install DESTDIR=%{BUILDROOT} - - mkdir -pv %{BUILDROOT}/usr/bin - mv -v %{BUILDROOT}/bin/{gzexe,uncompress,zcmp,zdiff,zegrep} %{BUILDROOT}/usr/bin - mv -v %{BUILDROOT}/bin/{zfgrep,zforce,zgrep,zless,zmore,znew} %{BUILDROOT}/usr/bin - end end packages package %{name} groups += Base Build + + provides + /bin/gunzip + /bin/gzip + /bin/zcat + end + + conflicts + filesystem < 002 + end end package %{name}-debuginfo diff --git a/iputils/iputils.nm b/iputils/iputils.nm index d45eb92..8eda327 100644 --- a/iputils/iputils.nm +++ b/iputils/iputils.nm @@ -5,7 +5,7 @@ name = iputils version = s20071127 -release = 3 +release = 4 groups = Networking/Tools url = http://www.skbuff.net/iputils @@ -48,39 +48,45 @@ build end install - mkdir -pv %{BUILDROOT}/{bin,sbin} %{BUILDROOT}/usr/sbin - mkdir -pv %{BUILDROOT}/usr/share/man/man8 - - install -cp clockdiff %{BUILDROOT}/usr/sbin/ - install -cp arping %{BUILDROOT}/sbin/ - install -cp ping %{BUILDROOT}/bin/ - install -cp ping6 %{BUILDROOT}/bin/ - install -cp rdisc %{BUILDROOT}/sbin/ - install -cp tracepath %{BUILDROOT}/bin/ - install -cp tracepath6 %{BUILDROOT}/bin/ - - install -cp doc/clockdiff.8 %{BUILDROOT}/usr/share/man/man8/ - install -cp doc/arping.8 %{BUILDROOT}/usr/share/man/man8/ - install -cp doc/ping.8 %{BUILDROOT}/usr/share/man/man8/ - install -cp doc/rdisc.8 %{BUILDROOT}/usr/share/man/man8/ - install -cp doc/tracepath.8 %{BUILDROOT}/usr/share/man/man8/ - - ln -svf ../../sbin/arping %{BUILDROOT}/usr/sbin/arping - ln -svf ../../bin/ping6 %{BUILDROOT}/usr/sbin/ - ln -svf ../../bin/tracepath %{BUILDROOT}/usr/sbin/ - ln -svf ../../bin/tracepath6 %{BUILDROOT}/usr/sbin/ - - ln -s ping.8 %{BUILDROOT}/usr/share/man/man8/ping6.8 - ln -s tracepath.8 %{BUILDROOT}/usr/share/man/man8/tracepath6.8 - - setcap cap_net_admin=ep %{BUILDROOT}/bin/ping - setcap cap_net_admin=ep %{BUILDROOT}/bin/ping6 + mkdir -pv %{BUILDROOT}{%{bindir},%{sbindir}} + mkdir -pv %{BUILDROOT}%{mandir}/man8 + + install -cp clockdiff %{BUILDROOT}%{sbindir} + install -cp arping %{BUILDROOT}%{sbindir} + install -cp ping %{BUILDROOT}%{bindir} + install -cp ping6 %{BUILDROOT}%{bindir} + install -cp rdisc %{BUILDROOT}%{sbindir} + install -cp tracepath %{BUILDROOT}%{bindir} + install -cp tracepath6 %{BUILDROOT}%{bindir} + + install -cp doc/clockdiff.8 %{BUILDROOT}%{mandir}/man8/ + install -cp doc/arping.8 %{BUILDROOT}%{mandir}/man8/ + install -cp doc/ping.8 %{BUILDROOT}%{mandir}/man8/ + install -cp doc/rdisc.8 %{BUILDROOT}%{mandir}/man8/ + install -cp doc/tracepath.8 %{BUILDROOT}%{mandir}/man8/ + + ln -svf ../bin/ping6 %{BUILDROOT}%{sbindir} + ln -svf ../bin/tracepath %{BUILDROOT}%{sbindir} + ln -svf ../bin/tracepath6 %{BUILDROOT}%{sbindir} + + ln -s ping.8 %{BUILDROOT}%{mandir}/man8/ping6.8 + ln -s tracepath.8 %{BUILDROOT}%{mandir}/man8/tracepath6.8 + + setcap cap_net_admin=ep %{BUILDROOT}%{bindir}/ping + setcap cap_net_admin=ep %{BUILDROOT}%{bindir}/ping6 end end packages package %{name} groups += Base + + provides + /bin/ping + /bin/ping6 + /sbin/arping + /sbin/rdisc + end end package %{name}-debuginfo diff --git a/kbd/kbd.nm b/kbd/kbd.nm index 2fe9da1..62186f9 100644 --- a/kbd/kbd.nm +++ b/kbd/kbd.nm @@ -5,7 +5,7 @@ name = kbd version = 1.15.3 -release = 1 +release = 2 epoch = 1 groups = System/Base @@ -31,7 +31,7 @@ build end configure_options += \ - --datadir=/lib/kbd \ + --datadir=%{prefix}/lib/kbd \ --disable-rpath \ --enable-nls @@ -62,15 +62,13 @@ build cd %{DIR_APP}/po rm -f gr.po gr.gmo end - - install_cmds - mkdir -pv %{BUILDROOT}/bin - mv -v %{BUILDROOT}/usr/bin/{kbd_mode,loadkeys,openvt,setfont} %{BUILDROOT}/bin - end end packages package %{name} + conflicts + filesystem < 002 + end end package %{name}-debuginfo diff --git a/libselinux/libselinux.nm b/libselinux/libselinux.nm index d3982b0..41ee027 100644 --- a/libselinux/libselinux.nm +++ b/libselinux/libselinux.nm @@ -37,8 +37,10 @@ build # Install libraries to correct place. make_install_targets += \ + BINDIR="%{BUILDROOT}%{bindir}" \ + SBINDIR="%{BUILDROOT}%{sbindir}" \ LIBDIR="%{BUILDROOT}%{libdir}" \ - SHLIBDIR="%{BUILDROOT}/%{lib}" + SHLIBDIR="%{BUILDROOT}%{libdir}" install_cmds make install-pywrap %{make_install_targets} DESTDIR=%{BUILDROOT} @@ -57,9 +59,6 @@ build rm -f %{BUILDROOT}/usr/sbin/selinuxdisable rm -f %{BUILDROOT}/usr/sbin/getseuser rm -f %{BUILDROOT}/usr/sbin/selinux_check_securetty_context - - # Move binaries from /sbin to /usr/sbin - mv %{BUILDROOT}/sbin/* %{BUILDROOT}/usr/sbin end end @@ -78,7 +77,7 @@ packages files /usr/sbin/* - /usr/share/man/man{5,8}/* + /usr/share/man/man{5,8} end end diff --git a/libselinux/patches/libselinux-rhat.patch2 b/libselinux/patches/libselinux-rhat.patch2 index 2c5ee11..7a50559 100644 --- a/libselinux/patches/libselinux-rhat.patch2 +++ b/libselinux/patches/libselinux-rhat.patch2 @@ -1,3 +1,92 @@ +diff --git a/libselinux/Makefile b/libselinux/Makefile +index 9feaf94..fd4f0b1 100644 +--- a/libselinux/Makefile ++++ b/libselinux/Makefile +@@ -1,3 +1,5 @@ ++SUBDIRS = src include utils man ++ + DISABLE_AVC ?= n + DISABLE_SETRANS ?= n + DISABLE_RPM ?= n +@@ -19,41 +21,24 @@ ifeq ($(DISABLE_SETRANS),y) + endif + export DISABLE_AVC DISABLE_SETRANS DISABLE_RPM DISABLE_BOOL EMFLAGS + +-all: +- $(MAKE) -C src +- $(MAKE) -C utils ++all install relabel clean distclean indent: ++ @for subdir in $(SUBDIRS); do \ ++ (cd $$subdir && $(MAKE) $@) || exit 1; \ ++ done + + swigify: all +- $(MAKE) -C src swigify ++ $(MAKE) -C src swigify $@ + + pywrap: +- $(MAKE) -C src pywrap ++ $(MAKE) -C src pywrap $@ + + rubywrap: +- $(MAKE) -C src rubywrap +- +-install: +- $(MAKE) -C include install +- $(MAKE) -C src install +- $(MAKE) -C utils install +- $(MAKE) -C man install ++ $(MAKE) -C src rubywrap $@ + + install-pywrap: +- $(MAKE) -C src install-pywrap ++ $(MAKE) -C src install-pywrap $@ + + install-rubywrap: +- $(MAKE) -C src install-rubywrap +- +-relabel: +- $(MAKE) -C src relabel +- +-clean distclean: +- $(MAKE) -C src $@ +- $(MAKE) -C utils clean +- +-indent: +- $(MAKE) -C src $@ +- $(MAKE) -C utils $@ +- $(MAKE) -C include $@ ++ $(MAKE) -C src install-rubywrap $@ + + test: +diff --git a/libselinux/include/Makefile b/libselinux/include/Makefile +index 09bcea3..dd264d0 100644 +--- a/libselinux/include/Makefile ++++ b/libselinux/include/Makefile +@@ -11,3 +11,6 @@ install: all + indent: + ../../scripts/Lindent $(wildcard selinux/*.h) + ++distclean clean: ++ -rm -f selinux/*~ ++ +diff --git a/libselinux/include/selinux/avc.h b/libselinux/include/selinux/avc.h +index da18e41..87a2b12 100644 +--- a/libselinux/include/selinux/avc.h ++++ b/libselinux/include/selinux/avc.h +@@ -130,7 +130,11 @@ struct avc_memory_callback { + + struct avc_log_callback { + /* log the printf-style format and arguments. */ +- void (*func_log) (const char *fmt, ...); ++ void ++#ifdef __GNUC__ ++__attribute__ ((format(printf, 1, 2))) ++#endif ++ (*func_log) (const char *fmt, ...); + /* store a string representation of auditdata (corresponding + to the given security class) into msgbuf. */ + void (*func_audit) (void *auditdata, security_class_t cls, diff --git a/libselinux/include/selinux/label.h b/libselinux/include/selinux/label.h index 1a54307..f6eeb21 100644 --- a/libselinux/include/selinux/label.h @@ -15,7 +104,7 @@ index 1a54307..f6eeb21 100644 /* * Label operations diff --git a/libselinux/include/selinux/selinux.h b/libselinux/include/selinux/selinux.h -index 2985f6f..826ed71 100644 +index 2985f6f..e0b2dd4 100644 --- a/libselinux/include/selinux/selinux.h +++ b/libselinux/include/selinux/selinux.h @@ -139,7 +139,10 @@ struct av_decision { @@ -42,6 +131,24 @@ index 2985f6f..826ed71 100644 /* Free the memory allocated by matchpathcon_init. */ extern void matchpathcon_fini(void); +@@ -537,7 +545,7 @@ extern int selinux_check_securetty_context(const security_context_t tty_context) + Normally, this is determined automatically during libselinux + initialization, but this is not always possible, e.g. for /sbin/init + which performs the initial mount of selinuxfs. */ +-void set_selinuxmnt(char *mnt); ++void set_selinuxmnt(const char *mnt); + + /* Check if selinuxfs exists as a kernel filesystem */ + int selinuxfs_exists(void); +diff --git a/libselinux/man/Makefile b/libselinux/man/Makefile +index a20a5d1..a53c4ad 100644 +--- a/libselinux/man/Makefile ++++ b/libselinux/man/Makefile +@@ -13,3 +13,4 @@ install: all + install -m 644 man5/*.5 $(MAN5DIR) + install -m 644 man8/*.8 $(MAN8DIR) + ++indent distclean clean: diff --git a/libselinux/man/man3/matchpathcon.3 b/libselinux/man/man3/matchpathcon.3 index cdbb252..b6814ed 100644 --- a/libselinux/man/man3/matchpathcon.3 @@ -73,10 +180,24 @@ index cdbb252..b6814ed 100644 frees the memory allocated by a prior call to .B matchpathcon_init. diff --git a/libselinux/man/man3/selabel_open.3 b/libselinux/man/man3/selabel_open.3 -index 8674e37..89bb4d3 100644 +index 8674e37..fc5b120 100644 --- a/libselinux/man/man3/selabel_open.3 +++ b/libselinux/man/man3/selabel_open.3 -@@ -66,6 +66,13 @@ A non-null value for this option enables context validation. By default, +@@ -37,8 +37,11 @@ structures of length + .ta 4n 16n 24n + .nf + struct selinux_opt { +- int type; +- const char *value; ++ int type; ++ union { ++ const char *value; ++ const char **values; ++ }; + }; + .fi + .ta +@@ -66,6 +69,13 @@ A non-null value for this option enables context validation. By default, is used; a custom validation function can be provided via .BR selinux_set_callback (3). Note that an invalid context may not be treated as an error unless it is actually encountered during a lookup operation. @@ -90,11 +211,72 @@ index 8674e37..89bb4d3 100644 .SH "BACKENDS" -@@ -99,4 +106,3 @@ Eamon Walsh <ewalsh(a)tycho.nsa.gov> +@@ -99,4 +109,3 @@ Eamon Walsh <ewalsh(a)tycho.nsa.gov> .BR selabel_stats (3), .BR selinux_set_callback (3), .BR selinux (8) - +diff --git a/libselinux/man/man8/selinux.8 b/libselinux/man/man8/selinux.8 +index 1fc5b95..9f16f77 100644 +--- a/libselinux/man/man8/selinux.8 ++++ b/libselinux/man/man8/selinux.8 +@@ -12,7 +12,7 @@ enforcement of many kinds of mandatory access control policies, + including those based on the concepts of Type Enforcement®, Role- + Based Access Control, and Multi-Level Security. Background + information and technical documentation about SELinux can be found at +-http://www.nsa.gov/selinux. ++http://www.nsa.gov/research/selinux. + + The + .I /etc/selinux/config +diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile +index 1ddddb0..985842d 100644 +--- a/libselinux/src/Makefile ++++ b/libselinux/src/Makefile +@@ -51,9 +51,29 @@ endif + GENERATED=$(SWIGCOUT) $(SWIGRUBYCOUT) selinuxswig_python_exception.i + SRCS= $(filter-out $(UNUSED_SRCS) $(GENERATED) audit2why.c, $(wildcard *.c)) + ++MAX_STACK_SIZE=32768 ++ + OBJS= $(patsubst %.c,%.o,$(SRCS)) + LOBJS= $(patsubst %.c,%.lo,$(SRCS)) +-CFLAGS ?= -Werror -Wall -W -Wundef -Wshadow -Wmissing-noreturn -Wmissing-format-attribute ++CFLAGS ?= -Wall -W -Wundef -Wformat-y2k -Wformat-security -Winit-self -Wmissing-include-dirs \ ++ -Wunused -Wunknown-pragmas -Wstrict-aliasing -Wshadow -Wpointer-arith \ ++ -Wbad-function-cast -Wcast-align -Wwrite-strings -Wlogical-op -Waggregate-return \ ++ -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes \ ++ -Wmissing-declarations -Wmissing-noreturn -Wmissing-format-attribute \ ++ -Wredundant-decls -Wnested-externs -Winline -Winvalid-pch -Wvolatile-register-var \ ++ -Wdisabled-optimization -Wbuiltin-macro-redefined -Wmudflap -Wpacked-bitfield-compat \ ++ -Wsync-nand -Wattributes -Wcoverage-mismatch -Wmultichar -Wcpp \ ++ -Wdeprecated-declarations -Wdiv-by-zero -Wdouble-promotion -Wendif-labels -Wextra \ ++ -Wformat-contains-nul -Wformat-extra-args -Wformat-zero-length -Wformat=2 -Wmultichar \ ++ -Wnormalized=nfc -Woverflow -Wpointer-to-int-cast -Wpragmas -Wsuggest-attribute=const \ ++ -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure -Wtrampolines \ ++ -Wno-missing-field-initializers -Wno-sign-compare -Wjump-misses-init \ ++ -Wno-format-nonliteral -Wframe-larger-than=$(MAX_STACK_SIZE) -Wp,-D_FORTIFY_SOURCE=2 \ ++ -fstack-protector-all --param=ssp-buffer-size=4 -fexceptions \ ++ -fasynchronous-unwind-tables -fdiagnostics-show-option -funit-at-a-time \ ++ -fipa-pure-const -Wno-suggest-attribute=pure -Wno-suggest-attribute=const \ ++ -Werror -Wno-aggregate-return -Wno-redundant-decls ++ + override CFLAGS += -I../include -I$(INCLUDEDIR) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(EMFLAGS) + RANLIB=ranlib + +diff --git a/libselinux/src/avc_internal.h b/libselinux/src/avc_internal.h +index 53610e8..f851659 100644 +--- a/libselinux/src/avc_internal.h ++++ b/libselinux/src/avc_internal.h +@@ -20,7 +20,7 @@ + extern void *(*avc_func_malloc) (size_t) hidden; + extern void (*avc_func_free) (void *)hidden; + +-extern void (*avc_func_log) (const char *, ...)hidden; ++extern void (*avc_func_log) (const char *, ...) __attribute__((__format__(printf,1,2))) hidden; + extern void (*avc_func_audit) (void *, security_class_t, char *, size_t)hidden; + + extern int avc_using_threads hidden; diff --git a/libselinux/src/callbacks.c b/libselinux/src/callbacks.c index b245364..7c47222 100644 --- a/libselinux/src/callbacks.c @@ -107,8 +289,44 @@ index b245364..7c47222 100644 va_start(ap, fmt); rc = vfprintf(stderr, fmt, ap); va_end(ap); +diff --git a/libselinux/src/get_default_type.c b/libselinux/src/get_default_type.c +index ca3d291..27f2ae5 100644 +--- a/libselinux/src/get_default_type.c ++++ b/libselinux/src/get_default_type.c +@@ -27,7 +27,8 @@ int get_default_type(const char *role, char **type) + static int find_default_type(FILE * fp, const char *role, char **type) + { + char buf[250]; +- char *ptr = "", *end, *t; ++ const char *ptr = "", *end; ++ char *t; + size_t len; + int found = 0; + +diff --git a/libselinux/src/init.c b/libselinux/src/init.c +index 00afde7..6d1ef33 100644 +--- a/libselinux/src/init.c ++++ b/libselinux/src/init.c +@@ -28,7 +28,7 @@ int obj_class_compat = 1; + * The file system is read/write + * then set this as the default file system. + */ +-static int verify_selinuxmnt(char *mnt) ++static int verify_selinuxmnt(const char *mnt) + { + struct statfs sfbuf; + int rc; +@@ -139,7 +139,7 @@ void fini_selinuxmnt(void) + + hidden_def(fini_selinuxmnt) + +-void set_selinuxmnt(char *mnt) ++void set_selinuxmnt(const char *mnt) + { + selinux_mnt = strdup(mnt); + } diff --git a/libselinux/src/label_file.c b/libselinux/src/label_file.c -index ac11b37..42889cf 100644 +index 7bc46cc..82a608c 100644 --- a/libselinux/src/label_file.c +++ b/libselinux/src/label_file.c @@ -27,6 +27,7 @@ @@ -181,7 +399,7 @@ index ac11b37..42889cf 100644 break; case SELABEL_OPT_BASEONLY: baseonly = !!opts[n].value; -@@ -480,7 +497,7 @@ static int init(struct selabel_handle *rec, struct selinux_opt *opts, +@@ -481,7 +498,7 @@ static int init(struct selabel_handle *rec, struct selinux_opt *opts, while (getline(&line_buf, &line_len, fp) > 0) { if (data->nspec >= maxnspec) break; @@ -190,7 +408,7 @@ index ac11b37..42889cf 100644 if (status) goto finish; } -@@ -496,7 +513,7 @@ static int init(struct selabel_handle *rec, struct selinux_opt *opts, +@@ -497,7 +514,7 @@ static int init(struct selabel_handle *rec, struct selinux_opt *opts, while (getline(&line_buf, &line_len, homedirfp) > 0) { if (data->nspec >= maxnspec) break; @@ -199,7 +417,7 @@ index ac11b37..42889cf 100644 if (status) goto finish; } -@@ -506,7 +523,7 @@ static int init(struct selabel_handle *rec, struct selinux_opt *opts, +@@ -507,7 +524,7 @@ static int init(struct selabel_handle *rec, struct selinux_opt *opts, while (getline(&line_buf, &line_len, localfp) > 0) { if (data->nspec >= maxnspec) break; @@ -208,8 +426,21 @@ index ac11b37..42889cf 100644 if (status) goto finish; } +diff --git a/libselinux/src/load_policy.c b/libselinux/src/load_policy.c +index f569664..10e29b9 100644 +--- a/libselinux/src/load_policy.c ++++ b/libselinux/src/load_policy.c +@@ -369,7 +369,7 @@ int selinux_init_load_policy(int *enforce) + * Check for the existence of SELinux via selinuxfs, and + * mount it if present for use in the calls below. + */ +- char *mntpoint = NULL; ++ const char *mntpoint = NULL; + if (mount(SELINUXFS, SELINUXMNT, SELINUXFS, 0, 0) == 0 || errno == EBUSY) { + mntpoint = SELINUXMNT; + } else { diff --git a/libselinux/src/matchpathcon.c b/libselinux/src/matchpathcon.c -index c396add..489ef3a 100644 +index 48f7a11..ca87bd2 100644 --- a/libselinux/src/matchpathcon.c +++ b/libselinux/src/matchpathcon.c @@ -2,6 +2,7 @@ @@ -229,7 +460,16 @@ index c396add..489ef3a 100644 va_end(ap); } -@@ -304,7 +305,7 @@ static void matchpathcon_init_once(void) +@@ -292,6 +293,8 @@ static void matchpathcon_thread_destructor(void __attribute__((unused)) *ptr) + matchpathcon_fini(); + } + ++void __attribute__((destructor)) matchpathcon_lib_destructor(void); ++ + void __attribute__((destructor)) matchpathcon_lib_destructor(void) + { + if (destructor_key_initialized) +@@ -304,7 +307,7 @@ static void matchpathcon_init_once(void) destructor_key_initialized = 1; } @@ -238,7 +478,7 @@ index c396add..489ef3a 100644 { if (!mycanoncon) mycanoncon = default_canoncon; -@@ -312,15 +313,22 @@ int matchpathcon_init_prefix(const char *path, const char *subset) +@@ -312,15 +315,22 @@ int matchpathcon_init_prefix(const char *path, const char *subset) __selinux_once(once, matchpathcon_init_once); __selinux_setspecific(destructor_key, (void *)1); @@ -253,16 +493,227 @@ index c396add..489ef3a 100644 return hnd ? 0 : -1; } +hidden_def(matchpathcon_init_prefixes) - ++ +int matchpathcon_init_prefix(const char *path, const char *prefix) +{ + const char *prefixes[2] = { prefix, NULL }; -+ + + return matchpathcon_init_prefixes(path, prefixes); +} hidden_def(matchpathcon_init_prefix) int matchpathcon_init(const char *path) +diff --git a/libselinux/src/selinux_config.c b/libselinux/src/selinux_config.c +index f4c33df..f42cb7c 100644 +--- a/libselinux/src/selinux_config.c ++++ b/libselinux/src/selinux_config.c +@@ -246,172 +246,172 @@ static const char *get_path(int idx) + return file_paths[idx]; + } + +-const char *selinux_default_type_path() ++const char *selinux_default_type_path(void) + { + return get_path(DEFAULT_TYPE); + } + + hidden_def(selinux_default_type_path) + +-const char *selinux_policy_root() ++const char *selinux_policy_root(void) + { + __selinux_once(once, init_selinux_config); + return selinux_policyroot; + } + +-const char *selinux_path() ++const char *selinux_path(void) + { + return selinux_rootpath; + } + + hidden_def(selinux_path) + +-const char *selinux_default_context_path() ++const char *selinux_default_context_path(void) + { + return get_path(DEFAULT_CONTEXTS); + } + + hidden_def(selinux_default_context_path) + +-const char *selinux_securetty_types_path() ++const char *selinux_securetty_types_path(void) + { + return get_path(SECURETTY_TYPES); + } + + hidden_def(selinux_securetty_types_path) + +-const char *selinux_failsafe_context_path() ++const char *selinux_failsafe_context_path(void) + { + return get_path(FAILSAFE_CONTEXT); + } + + hidden_def(selinux_failsafe_context_path) + +-const char *selinux_removable_context_path() ++const char *selinux_removable_context_path(void) + { + return get_path(REMOVABLE_CONTEXT); + } + + hidden_def(selinux_removable_context_path) + +-const char *selinux_binary_policy_path() ++const char *selinux_binary_policy_path(void) + { + return get_path(BINPOLICY); + } + + hidden_def(selinux_binary_policy_path) + +-const char *selinux_file_context_path() ++const char *selinux_file_context_path(void) + { + return get_path(FILE_CONTEXTS); + } + + hidden_def(selinux_file_context_path) + +-const char *selinux_homedir_context_path() ++const char *selinux_homedir_context_path(void) + { + return get_path(HOMEDIR_CONTEXTS); + } + + hidden_def(selinux_homedir_context_path) + +-const char *selinux_media_context_path() ++const char *selinux_media_context_path(void) + { + return get_path(MEDIA_CONTEXTS); + } + + hidden_def(selinux_media_context_path) + +-const char *selinux_customizable_types_path() ++const char *selinux_customizable_types_path(void) + { + return get_path(CUSTOMIZABLE_TYPES); + } + + hidden_def(selinux_customizable_types_path) + +-const char *selinux_contexts_path() ++const char *selinux_contexts_path(void) + { + return get_path(CONTEXTS_DIR); + } + +-const char *selinux_user_contexts_path() ++const char *selinux_user_contexts_path(void) + { + return get_path(USER_CONTEXTS); + } + + hidden_def(selinux_user_contexts_path) + +-const char *selinux_booleans_path() ++const char *selinux_booleans_path(void) + { + return get_path(BOOLEANS); + } + + hidden_def(selinux_booleans_path) + +-const char *selinux_users_path() ++const char *selinux_users_path(void) + { + return get_path(USERS_DIR); + } + + hidden_def(selinux_users_path) + +-const char *selinux_usersconf_path() ++const char *selinux_usersconf_path(void) + { + return get_path(SEUSERS); + } + + hidden_def(selinux_usersconf_path) + +-const char *selinux_translations_path() ++const char *selinux_translations_path(void) + { + return get_path(TRANSLATIONS); + } + + hidden_def(selinux_translations_path) + +-const char *selinux_colors_path() ++const char *selinux_colors_path(void) + { + return get_path(COLORS); + } + + hidden_def(selinux_colors_path) + +-const char *selinux_netfilter_context_path() ++const char *selinux_netfilter_context_path(void) + { + return get_path(NETFILTER_CONTEXTS); + } + + hidden_def(selinux_netfilter_context_path) + +-const char *selinux_file_context_homedir_path() ++const char *selinux_file_context_homedir_path(void) + { + return get_path(FILE_CONTEXTS_HOMEDIR); + } + + hidden_def(selinux_file_context_homedir_path) + +-const char *selinux_file_context_local_path() ++const char *selinux_file_context_local_path(void) + { + return get_path(FILE_CONTEXTS_LOCAL); + } + + hidden_def(selinux_file_context_local_path) + +-const char *selinux_x_context_path() ++const char *selinux_x_context_path(void) + { + return get_path(X_CONTEXTS); + } + + hidden_def(selinux_x_context_path) + +-const char *selinux_virtual_domain_context_path() ++const char *selinux_virtual_domain_context_path(void) + { + return get_path(VIRTUAL_DOMAIN); + } + + hidden_def(selinux_virtual_domain_context_path) + +-const char *selinux_virtual_image_context_path() ++const char *selinux_virtual_image_context_path(void) + { + return get_path(VIRTUAL_IMAGE); + } +@@ -430,7 +430,7 @@ const char * selinux_file_context_subs_dist_path(void) { + + hidden_def(selinux_file_context_subs_dist_path) + +-const char *selinux_sepgsql_context_path() ++const char *selinux_sepgsql_context_path(void) + { + return get_path(SEPGSQL_CONTEXTS); + } diff --git a/libselinux/src/selinux_internal.h b/libselinux/src/selinux_internal.h index 710396a..9a3fc14 100644 --- a/libselinux/src/selinux_internal.h @@ -275,3 +726,264 @@ index 710396a..9a3fc14 100644 hidden_proto(matchpathcon_init_prefix) hidden_proto(selinux_users_path) hidden_proto(selinux_usersconf_path); +diff --git a/libselinux/src/setrans_client.c b/libselinux/src/setrans_client.c +index e074142..9432f49 100644 +--- a/libselinux/src/setrans_client.c ++++ b/libselinux/src/setrans_client.c +@@ -253,6 +253,8 @@ static void setrans_thread_destructor(void __attribute__((unused)) *unused) + free(prev_r2c_raw); + } + ++void __attribute__((destructor)) setrans_lib_destructor(void); ++ + void __attribute__((destructor)) setrans_lib_destructor(void) + { + if (destructor_key_initialized) +diff --git a/libselinux/src/seusers.c b/libselinux/src/seusers.c +index b653cad..5cdf6c0 100644 +--- a/libselinux/src/seusers.c ++++ b/libselinux/src/seusers.c +@@ -269,9 +269,10 @@ int getseuser(const char *username, const char *service, + size_t lineno = 0; + char *rec = NULL; + char *path=NULL; ++ FILE *fp = NULL; + if (asprintf(&path,"%s/logins/%s", selinux_policy_root(), username) < 0) + goto err; +- FILE *fp = fopen(path, "r"); ++ fp = fopen(path, "r"); + free(path); + if (fp == NULL) goto err; + __fsetlocking(fp, FSETLOCKING_BYCALLER); +diff --git a/libselinux/src/stringrep.c b/libselinux/src/stringrep.c +index f0167e7..176ac34 100644 +--- a/libselinux/src/stringrep.c ++++ b/libselinux/src/stringrep.c +@@ -305,28 +305,6 @@ err1: + return NULL; + } + +-void flush_class_cache(void) +-{ +- struct discover_class_node *cur = discover_class_cache, *prev = NULL; +- size_t i; +- +- while (cur != NULL) { +- free(cur->name); +- +- for (i=0 ; i<MAXVECTORS ; i++) +- free(cur->perms[i]); +- +- free(cur->perms); +- +- prev = cur; +- cur = cur->next; +- +- free(prev); +- } +- +- discover_class_cache = NULL; +-} +- + static security_class_t string_to_security_class_compat(const char *s) + { + unsigned int val; +diff --git a/libselinux/utils/Makefile b/libselinux/utils/Makefile +index 6f5aa52..d76ccfa 100644 +--- a/libselinux/utils/Makefile ++++ b/libselinux/utils/Makefile +@@ -1,10 +1,28 @@ + # Installation directories. + PREFIX ?= $(DESTDIR)/usr + LIBDIR ?= $(PREFIX)/lib +-BINDIR ?= $(PREFIX)/sbin +-_BINDIR ?= $(DESTDIR)/sbin +- +-CFLAGS ?= -Werror -Wall -W ++USRBINDIR ?= $(PREFIX)/sbin ++SBINDIR ?= $(DESTDIR)/sbin ++ ++MAX_STACK_SIZE=8192 ++CFLAGS ?= -Wall -W -Wundef -Wformat-y2k -Wformat-security -Winit-self -Wmissing-include-dirs \ ++ -Wunused -Wunknown-pragmas -Wstrict-aliasing -Wshadow -Wpointer-arith \ ++ -Wbad-function-cast -Wcast-align -Wwrite-strings -Wlogical-op -Waggregate-return \ ++ -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes \ ++ -Wmissing-declarations -Wmissing-noreturn -Wmissing-format-attribute \ ++ -Wredundant-decls -Wnested-externs -Winline -Winvalid-pch -Wvolatile-register-var \ ++ -Wdisabled-optimization -Wbuiltin-macro-redefined -Wmudflap -Wpacked-bitfield-compat \ ++ -Wsync-nand -Wattributes -Wcoverage-mismatch -Wmultichar -Wcpp \ ++ -Wdeprecated-declarations -Wdiv-by-zero -Wdouble-promotion -Wendif-labels -Wextra \ ++ -Wformat-contains-nul -Wformat-extra-args -Wformat-zero-length -Wformat=2 -Wmultichar \ ++ -Wnormalized=nfc -Woverflow -Wpointer-to-int-cast -Wpragmas -Wsuggest-attribute=const \ ++ -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure -Wtrampolines \ ++ -Wno-missing-field-initializers -Wno-sign-compare -Wjump-misses-init \ ++ -Wno-format-nonliteral -Wframe-larger-than=$(MAX_STACK_SIZE) -Wp,-D_FORTIFY_SOURCE=2 \ ++ -fstack-protector-all --param=ssp-buffer-size=4 -fexceptions \ ++ -fasynchronous-unwind-tables -fdiagnostics-show-option -funit-at-a-time \ ++ -fipa-pure-const -Wno-suggest-attribute=pure -Wno-suggest-attribute=const \ ++ -Werror -Wno-aggregate-return -Wno-redundant-decls + override CFLAGS += -I../include -D_GNU_SOURCE $(EMFLAGS) + LDLIBS += -L../src -lselinux -L$(LIBDIR) + +@@ -17,18 +35,18 @@ endif + ifeq ($(DISABLE_BOOL),y) + UNUSED_TARGETS+=getsebool togglesebool + endif +-TARGETS:= $(filter-out $(UNUSED_TARGETS) matchpathcon, $(TARGETS)) ++TARGETS:= $(filter-out $(UNUSED_TARGETS), $(TARGETS)) + +-all: $(TARGETS) matchpathcon ++all: $(TARGETS) + + install: all +- -mkdir -p $(BINDIR) +- install -m 755 $(TARGETS) $(BINDIR) +- -mkdir -p $(_BINDIR) +- install -m 755 matchpathcon $(_BINDIR) +- (cd $(BINDIR); ln -fs ../../sbin/matchpathcon) ++ -mkdir -p $(USRBINDIR) ++ install -m 755 $(TARGETS) $(USRBINDIR) ++ -mkdir -p $(SBINDIR) + clean: +- rm -f $(TARGETS) matchpathcon *.o *~ ++ rm -f $(TARGETS) *.o *~ ++ ++distclean: clean + + indent: + ../../scripts/Lindent $(wildcard *.[ch]) +diff --git a/libselinux/utils/avcstat.c b/libselinux/utils/avcstat.c +index 772118a..7239ef2 100644 +--- a/libselinux/utils/avcstat.c ++++ b/libselinux/utils/avcstat.c +@@ -43,7 +43,7 @@ static char buf[DEF_BUF_SIZE]; + /* selinuxfs mount point */ + extern char *selinux_mnt; + +-static void die(const char *msg, ...) ++static __attribute__((__format__(printf,1,2))) void die(const char *msg, ...) + { + va_list args; + +@@ -118,7 +118,7 @@ int main(int argc, char **argv) + exit(0); + default: + usage(); +- die("unrecognized parameter", i); ++ die("unrecognized parameter '%c'", i); + } + } + +diff --git a/libselinux/utils/getconlist.c b/libselinux/utils/getconlist.c +index 4f473e4..94c9bff 100644 +--- a/libselinux/utils/getconlist.c ++++ b/libselinux/utils/getconlist.c +@@ -9,7 +9,7 @@ + #include <selinux/selinux.h> + #include <selinux/get_context_list.h> + +-void usage(char *name, char *detail, int rc) ++static void usage(const char *name, const char *detail, int rc) + { + fprintf(stderr, "usage: %s [-l level] user [context]\n", name); + if (detail) +diff --git a/libselinux/utils/getdefaultcon.c b/libselinux/utils/getdefaultcon.c +index e6eb98b..049e75c 100644 +--- a/libselinux/utils/getdefaultcon.c ++++ b/libselinux/utils/getdefaultcon.c +@@ -9,7 +9,7 @@ + #include <selinux/selinux.h> + #include <selinux/get_context_list.h> + +-void usage(char *name, char *detail, int rc) ++static void usage(const char *name, const char *detail, int rc) + { + fprintf(stderr, "usage: %s [-l level] user fromcon\n", name); + if (detail) +diff --git a/libselinux/utils/getsebool.c b/libselinux/utils/getsebool.c +index cab2bb9..3a90449 100644 +--- a/libselinux/utils/getsebool.c ++++ b/libselinux/utils/getsebool.c +@@ -6,7 +6,7 @@ + #include <string.h> + #include <selinux/selinux.h> + +-void usage(const char *progname) ++static void usage(const char *progname) + { + fprintf(stderr, "usage: %s -a or %s boolean...\n", progname, progname); + exit(1); +diff --git a/libselinux/utils/matchpathcon.c b/libselinux/utils/matchpathcon.c +index 5f0a4c2..b1adadd 100644 +--- a/libselinux/utils/matchpathcon.c ++++ b/libselinux/utils/matchpathcon.c +@@ -13,7 +13,7 @@ + #include <stdlib.h> + + +-void usage(const char *progname) ++static void usage(const char *progname) + { + fprintf(stderr, + "usage: %s [-N] [-n] [-f file_contexts] [-p prefix] [-Vq] path...\n", +@@ -21,7 +21,7 @@ void usage(const char *progname) + exit(1); + } + +-int printmatchpathcon(char *path, int header, int mode) ++static int printmatchpathcon(const char *path, int header, int mode) + { + char *buf; + int rc = matchpathcon(path, mode, &buf); +diff --git a/libselinux/utils/selinux_check_securetty_context.c b/libselinux/utils/selinux_check_securetty_context.c +index 95bfb7f..b158eb3 100644 +--- a/libselinux/utils/selinux_check_securetty_context.c ++++ b/libselinux/utils/selinux_check_securetty_context.c +@@ -9,7 +9,7 @@ + #include <sys/errno.h> + #include <selinux/selinux.h> + +-void usage(const char *progname) ++static void usage(const char *progname) + { + fprintf(stderr, "usage: %s tty_context...\n", progname); + exit(1); +diff --git a/libselinux/utils/selinuxexeccon.c b/libselinux/utils/selinuxexeccon.c +index c55fde9..476f564 100644 +--- a/libselinux/utils/selinuxexeccon.c ++++ b/libselinux/utils/selinuxexeccon.c +@@ -9,7 +9,7 @@ + #include <selinux/flask.h> + #include <selinux/selinux.h> + +-void usage(char *name, char *detail, int rc) ++static void usage(const char *name, const char *detail, int rc) + { + fprintf(stderr, "usage: %s command [ fromcon ]\n", name); + if (detail) +diff --git a/libselinux/utils/setenforce.c b/libselinux/utils/setenforce.c +index e45b804..df58597 100644 +--- a/libselinux/utils/setenforce.c ++++ b/libselinux/utils/setenforce.c +@@ -6,7 +6,7 @@ + #include <strings.h> + #include <selinux/selinux.h> + +-void usage(const char *progname) ++static void usage(const char *progname) + { + fprintf(stderr, "usage: %s [ Enforcing | Permissive | 1 | 0 ]\n", + progname); +diff --git a/libselinux/utils/togglesebool.c b/libselinux/utils/togglesebool.c +index 680ed8d..ad0d2a2 100644 +--- a/libselinux/utils/togglesebool.c ++++ b/libselinux/utils/togglesebool.c +@@ -10,7 +10,7 @@ + + /* Attempt to rollback the transaction. No need to check error + codes since this is rolling back something that blew up. */ +-void rollback(int argc, char **argv) ++static void rollback(int argc, char **argv) + { + int i; + diff --git a/setup/profile b/setup/profile index 2d66685..cc63878 100644 --- a/setup/profile +++ b/setup/profile @@ -35,16 +35,14 @@ fi # Path manipulation if [ "$EUID" = "0" ]; then - pathmunge /sbin pathmunge /usr/sbin pathmunge /usr/local/sbin else pathmunge /usr/local/sbin after pathmunge /usr/sbin after - pathmunge /sbin after fi -HOSTNAME=`/bin/hostname 2>/dev/null` +HOSTNAME=`/usr/bin/hostname 2>/dev/null` HISTSIZE=1000 if [ "$HISTCONTROL" = "ignorespace" ] ; then export HISTCONTROL=ignoreboth diff --git a/setup/setup.nm b/setup/setup.nm index 891af40..0eb5c99 100644 --- a/setup/setup.nm +++ b/setup/setup.nm @@ -5,7 +5,7 @@ name = setup version = 3.0 -release = 4 +release = 5 arch = noarch groups = Base Build System/Base @@ -50,6 +50,10 @@ packages package %{name} requires = iana-etc + conflicts + filesystem < 002 + end + configfiles /etc/aliases /etc/exports hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. c4f0a82e1dceed11d9b7b4b2c56d69fcf6a6073d
by git＠ipfire.org 14 Apr '12

14 Apr '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via c4f0a82e1dceed11d9b7b4b2c56d69fcf6a6073d (commit) via 9118c7ca93fef4edea7e774d0af690e5e4dfd689 (commit) from be90e5a50b457151d8c9757fca9bc09a61ae35a8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c4f0a82e1dceed11d9b7b4b2c56d69fcf6a6073d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Apr 14 22:42:17 2012 +0200 findutils: Move to /usr. commit 9118c7ca93fef4edea7e774d0af690e5e4dfd689 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Apr 14 22:41:34 2012 +0200 bash: Move to /usr. ----------------------------------------------------------------------- Summary of changes: bash/bash.nm | 17 +++++++++++++---- findutils/findutils.nm | 17 +++++++++-------- 2 files changed, 22 insertions(+), 12 deletions(-) Difference in files: diff --git a/bash/bash.nm b/bash/bash.nm index 4ea4fb9..c71e528 100644 --- a/bash/bash.nm +++ b/bash/bash.nm @@ -5,7 +5,7 @@ name = bash version = 4.2 -release = 8 +release = 9 groups = System/Tools url = http://www.gnu.org/software/bash/ @@ -26,6 +26,7 @@ build autoconf automake bison + filesystem >= 002 ncurses-devel readline-devel end @@ -41,7 +42,6 @@ build end configure_options += \ - --bindir=/bin \ --without-bash-malloc \ --with-installed-readline @@ -51,7 +51,7 @@ build #end install_cmds - mkdir -pv %{BUILDROOT}/{bin,etc/profile.d,root} + mkdir -pv %{BUILDROOT}/{etc/profile.d,root} # Bash startup files cp -vf %{DIR_SOURCE}/dot_bash_logout %{BUILDROOT}/root/.bash_logout @@ -61,7 +61,7 @@ build # /etc/profile.d cp -vf %{DIR_SOURCE}/profile.d/* %{BUILDROOT}/etc/profile.d - ln -svf bash %{BUILDROOT}/bin/sh + ln -svf bash %{BUILDROOT}%{bindir}/sh end end @@ -75,6 +75,15 @@ packages /etc/profile end + provides + /bin/bash + /bin/sh + end + + conflicts + filesystem < 002 + end + script posttransin # Create /etc/shells, if it does not exist. [ -f "/etc/shells" ] || touch /etc/shells diff --git a/findutils/findutils.nm b/findutils/findutils.nm index 652d138..c05b867 100644 --- a/findutils/findutils.nm +++ b/findutils/findutils.nm @@ -5,7 +5,7 @@ name = findutils version = 4.5.10 -release = 2 +release = 3 groups = System/Tools url = http://www.gnu.org/software/findutils/ @@ -35,18 +35,19 @@ build test make check end - - install_cmds - mkdir -pv %{BUILDROOT}/bin - mv -v %{BUILDROOT}/usr/bin/find %{BUILDROOT}/bin - - sed -i -e 's/find:=${BINDIR}/find:=\/bin/' %{BUILDROOT}/usr/bin/updatedb - end end packages package %{name} groups += Base Build + + provides + /bin/find + end + + conflicts + filesystem < 002 + end end package %{name}-debuginfo hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. be90e5a50b457151d8c9757fca9bc09a61ae35a8
by git＠ipfire.org 14 Apr '12

14 Apr '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via be90e5a50b457151d8c9757fca9bc09a61ae35a8 (commit) from f43b253bcea71435c8d9131aed19578132055ef8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit be90e5a50b457151d8c9757fca9bc09a61ae35a8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Apr 14 22:14:16 2012 +0200 gawk: Move tool to /usr. ----------------------------------------------------------------------- Summary of changes: gawk/gawk.nm | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) Difference in files: diff --git a/gawk/gawk.nm b/gawk/gawk.nm index 3cd81fa..2b7d077 100644 --- a/gawk/gawk.nm +++ b/gawk/gawk.nm @@ -5,7 +5,7 @@ name = gawk version = 4.0.1 -release = 1 +release = 2 groups = System/Tools url = http://www.gnu.org/software/gawk/gawk.html @@ -28,8 +28,6 @@ build end configure_options += \ - --bindir=/bin \ - --libexecdir=%{libdir} \ --with-libsigsegv-prefix=no test @@ -37,20 +35,25 @@ build end install_cmds - mkdir -pv %{BUILDROOT}/usr/bin - ln -svf ../../bin/awk %{BUILDROOT}/usr/bin/awk - ln -svf ../../bin/gawk %{BUILDROOT}/usr/bin/gawk - - mv -v %{BUILDROOT}/bin/{p,i}gawk %{BUILDROOT}/usr/bin/ + ln -svf gawk %{BUILDROOT}/usr/bin/awk # Remove versioned binary. - rm -rfv %{BUILDROOT}/bin/{,p}gawk-* + rm -rfv %{BUILDROOT}%{bindir}/{,p}gawk-* end end packages package %{name} groups += Base Build + + provides + /bin/awk + /bin/gawk + end + + conflicts + filesystem < 002 + end end package %{name}-debuginfo hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. f43b253bcea71435c8d9131aed19578132055ef8
by git＠ipfire.org 14 Apr '12

14 Apr '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via f43b253bcea71435c8d9131aed19578132055ef8 (commit) from 47a5ddc10e8bffd874f520fb6be69872b941468f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f43b253bcea71435c8d9131aed19578132055ef8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Apr 14 21:41:01 2012 +0200 filesystem: Perform UsrMove (#10081). This will create /bin, /sbin, /lib and /lib64 into symlinks pointing to their corresponding directories in /usr. See bug description for more information. ----------------------------------------------------------------------- Summary of changes: filesystem/filesystem.nm | 38 +++++++++++++++++++++++++++++++------- 1 files changed, 31 insertions(+), 7 deletions(-) Difference in files: diff --git a/filesystem/filesystem.nm b/filesystem/filesystem.nm index 425514e..65d62e9 100644 --- a/filesystem/filesystem.nm +++ b/filesystem/filesystem.nm @@ -4,8 +4,8 @@ ############################################################################### name = filesystem -version = 001 -release = 3 +version = 002 +release = 1 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = Base Build System/Base @@ -24,6 +24,12 @@ end sources = build + # Pakfire supports python scriptlets since + # version 0.9.22. + requires + pakfire-builder >= 0.9.22 + end + DIR_APP = %{DIR_SRC} build @@ -33,23 +39,18 @@ build install cd %{BUILDROOT} mkdir -pv \ - bin \ boot \ dev \ etc/pki \ etc/skel \ etc/sysconfig \ home \ - lib \ - %{lib} \ - lib/modules \ media \ mnt \ opt \ proc \ root \ run/lock \ - sbin \ srv \ sys \ tmp \ @@ -58,6 +59,7 @@ build usr/lib \ usr/%{lib} \ usr/lib/locale \ + usr/lib/modules \ usr/sbin \ usr/share/{aclocal,dict,doc,empty,info,mime-info,misc} \ usr/share/man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p} \ @@ -83,6 +85,11 @@ build var/db \ var/cache + ln -snf usr/bin bin + ln -snf usr/sbin sbin + ln -snf usr/lib lib + [ "%{lib}" = "lib" ] || ln -snf usr/%{lib} %{lib} + ln -snf ../var/tmp usr/tmp ln -snf spool/mail var/mail @@ -100,6 +107,23 @@ end packages package %{name} prerequires = setup + + # We do not know, if the filesystem package is the first + # in the transaction, so we create the symlinks prior to running + # the transaction. + script pretransin python + if not os.path.exists("/usr"): + os.makedirs("/usr") + + for dir in ("/lib", "/%{lib}", "/sbin", "/bin"): + usr_dir = "/usr%s" % dir + + if not os.path.exists(usr_dir): + os.makedirs(usr_dir) + + if not os.path.exists(dir): + os.symlink(usr_dir[1:], dir) + end end # Although this package is not noarch, it does not hooks/post-receive -- IPFire 3.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM April 2012