Development October 2016

development@lists.ipfire.org

10 participants
79 discussions

[PATCH] dmraid: Update to 1.0.0.rc16
by Stefan Schantl 21 Oct '16

21 Oct '16

This is a minor update to the latest available version of dmraid. * Drop SELinux support. Fixes #11204. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- dmraid/dmraid.nm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dmraid/dmraid.nm b/dmraid/dmraid.nm index f3d6c31..5581d03 100644 --- a/dmraid/dmraid.nm +++ b/dmraid/dmraid.nm @@ -4,8 +4,8 @@ ############################################################################### name = dmraid -version = 1.0.0.rc15 -release = 5 +version = 1.0.0.rc16 +release = 1 groups = System/Filesystems url = http://people.redhat.com/heinzm/sw/dmraid @@ -23,8 +23,7 @@ sources = %{thisapp}.tar.bz2 build requires - libdevmapper-devel - libselinux-devel + libdevmapper-devel >= 2.02.166 end DIR_APP = %{DIR_SRC}/%{name}/%{version} @@ -34,8 +33,7 @@ build configure_options += \ --disable-static \ - --disable-static_link \ - --enable-libselinux + --disable-static_link # Dmraid doesn't automatically build and install a versioned library # so we do it on or own. @@ -43,6 +41,10 @@ build make -C lib libdmraid.so end + test + # Package does not offer any kind of testsuite. + end + install_cmds # Install development headers. mkdir -pv %{BUILDROOT}%{includedir}/dmraid -- 2.7.4

1 0

[PATCH] lvm2: Update to 2.02.166
by Stefan Schantl 21 Oct '16

21 Oct '16

This is a minor update to the latest available version of lvm2. * Splitt package into more sub-packages. * Enable systemd support and add scriptlets. * Drop SELinux support. Fixes #11215. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- lvm2/lvm2.nm | 177 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 173 insertions(+), 4 deletions(-) diff --git a/lvm2/lvm2.nm b/lvm2/lvm2.nm index 02e4f84..de4bcec 100644 --- a/lvm2/lvm2.nm +++ b/lvm2/lvm2.nm @@ -4,7 +4,7 @@ ############################################################################### name = lvm2 -version = 2.02.147 +version = 2.02.166 release = 1 thisapp = LVM2.%{version} @@ -27,26 +27,195 @@ sources = %{thisapp}.tgz build requires - libselinux-devel pkg-config + libblkid-devel + libudev-devel ncurses-devel readline-devel + systemd-devel end configure_options += \ + --with-default-dm-run-dir=/run \ + --with-default-run-dir=/run/lvm \ + --with-default-pid-dir=/run/lvm \ + --with-default-locking-dir=/run/lock/lvm \ --with-usrlibdir=%{libdir} \ - --enable-pkgconfig + --disable-lvm1_fallback \ + --disable-selinux \ + --enable-fsadm \ + --with-pool=internal \ + --enable-write_install \ + --with-user= \ + --with-group= \ + --with-device-uid=0 \ + --with-device-gid=6 \ + --with-device-mode=0660 \ + --enable-dmeventd \ + --enable-blkid_wiping \ + --enable-pkgconfig \ + --enable-applib \ + --enable-cmdlib \ + --with-udevdir=%{prefix}/lib/udev/rules.d \ + --enable-udev_sync + + test + # Skip the testsuite, because it requires a mounted + # /tmp with support for block devices (without "nodev") + # and at least one available loopback device, which is not + # available in or chroot build environment. + end + + install_cmds + make install_system_dirs DESTDIR=%{BUILDROOT} + make install_systemd_units DESTDIR=%{BUILDROOT} + make install_systemd_generators DESTDIR=%{BUILDROOT} + make install_tmpfiles_configuration DESTDIR=%{BUILDROOT} + end end packages package %{name} + prerequires += \ + systemd-units + + requires + %{name}-libs = %{thisver} + end + + script postin + systemctl daemon-reload >/dev/null 2>&1 || : + + # Enable lvm2-monitor.service on completely new installations. + systemctl --no-reload enable lvm2-monitor.service >/dev/null 2>&1 || : + end + + script preun + systemctl --no-reload disable lvm2-monitor.service >/dev/null 2>&1 || : + systemctl stop lvm2-monitor.service >/dev/null 2>&1 || : + end + + script postun + systemctl daemon-reload >/dev/null 2>&1 || : + end + + script postup + systemctl daemon-reload >/dev/null 2>&1 || : + systemctl try-restart lvm2-monitor.service >/dev/null 2>&1 || : + end + end + + package %{name}-libs + template LIBS + + requires + libdevmapper = %{thisver} + end + + files += \ + %{libdir}/libdevmapper-event-lvm2.so.* \ + %{libdir}/device-mapper + end + + package %{name}-devel + template DEVEL + end + + package device-mapper + summary = Device mapper utility. + description + This package contains the supporting userspace utility, dmsetup, + for the kernel device-mapper and the dmeventd daemon for monitoring + the state of device-mapper devices. + end + + prerequires += \ + systemd-units + + requires + libdevmapper = %{thisver} + util-linux >= 2.24 + end + + conflicts + dracut < 002 + end + + files + %{sbindir}/blkdeactivate + %{sbindir}/dmeventd + %{sbindir}/dmsetup + %{sbindir}/dmstats + %{mandir}/man8/blkdeactivate.8.gz + %{mandir}/man8/dmeventd.8.gz + %{mandir}/man8/dmsetup.8.gz + %{mandir}/man8/dmstats.8.gz + %{udevdir}/10-dm.rules + %{udevdir}/13-dm-disk.rules + %{udevdir}/95-dm-notify.rules + %{unitdir}/dm-event.socket + %{unitdir}/dm-event.service + end + + script postin + systemctl daemon-reload >/dev/null 2>&1 || : + + # dm-event.socket is always enabled and started and ready to + # serve if dmeventd is used. + systemctl --no-reload enable dm-event.socket >/dev/null 2>&1 || : + end + + script preun + systemctl --no-reload disable dm-event.service >/dev/null 2>&1 || : + systemctl --no-reload disable dm-event.socket >/dev/null 2>&1 || : + systemctl stop dm-event.socket >/dev/null 2>&1 || : + systemctl stop dm-event.service >/dev/null 2>&1 || : + end + + script postun + systemctl daemon-reload >/dev/null 2>&1 || : + end + + script postup + systemctl daemon-reload >/dev/null 2>&1 || : + systemctl try-restart dm-event.service >/dev/null 2>&1 || : + end + end package libdevmapper template LIBS + + summary = Device-mapper shared libraries. + description + This package contains the device-mapper shared libraries, + libdevmapper and libdevmapper-event. + end + + files + %{libdir}/libdevmapper.so.* + %{libdir}/libdevmapper-event.so.* + end end package libdevmapper-devel - template DEVEL + summary = Development libraries and headers for the device-mapper. + description + This package contains files needed to develop applications that use + the device-mapper libraries. + end + + requires + libdevmapper = %{thisver} + end + + files + %{libdir}/libdevmapper.so + %{libdir}/libdevmapper-event.so + %{includedir}/libdevmapper.h + %{includedir}/libdevmapper-event.h + %{libdir}/pkgconfig/devmapper.pc + %{libdir}/pkgconfig/devmapper-event.pc + end end package %{name}-debuginfo -- 2.7.4

1 0

[PATCH v2] readline: update to 7.0
by Marcel Lorenz 21 Oct '16

21 Oct '16

The readline 6.3 is moved to readline-compat. The old 5.2 version is continue to be built in compat Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> --- config/rootfiles/common/readline | 8 +++--- config/rootfiles/common/readline-compat | 4 +++ lfs/readline | 12 ++++----- lfs/readline-compat | 40 ++++++++++++++++++---------- src/patches/readline/readline63-007 | 47 +++++++++++++++++++++++++++++++++ src/patches/readline/readline63-008 | 47 +++++++++++++++++++++++++++++++++ 6 files changed, 134 insertions(+), 24 deletions(-) create mode 100644 src/patches/readline/readline63-007 create mode 100644 src/patches/readline/readline63-008 diff --git a/config/rootfiles/common/readline b/config/rootfiles/common/readline index b2ac26d..412de70 100644 --- a/config/rootfiles/common/readline +++ b/config/rootfiles/common/readline @@ -8,11 +8,11 @@ #usr/include/readline/rltypedefs.h #usr/include/readline/tilde.h #usr/lib/libhistory.so -usr/lib/libhistory.so.6 -usr/lib/libhistory.so.6.3 +usr/lib/libhistory.so.7 +usr/lib/libhistory.so.7.0 #usr/lib/libreadline.so -usr/lib/libreadline.so.6 -usr/lib/libreadline.so.6.3 +usr/lib/libreadline.so.7 +usr/lib/libreadline.so.7.0 #usr/share/doc/readline #usr/share/doc/readline/CHANGES #usr/share/doc/readline/INSTALL diff --git a/config/rootfiles/common/readline-compat b/config/rootfiles/common/readline-compat index 1ff7325..ade6e6f 100644 --- a/config/rootfiles/common/readline-compat +++ b/config/rootfiles/common/readline-compat @@ -2,3 +2,7 @@ lib/libhistory.so.5 lib/libhistory.so.5.2 lib/libreadline.so.5 lib/libreadline.so.5.2 +usr/lib/libhistory.so.6 +usr/lib/libhistory.so.6.3 +usr/lib/libreadline.so.6 +usr/lib/libreadline.so.6.3 diff --git a/lfs/readline b/lfs/readline index eb488e3..1e3ea47 100644 --- a/lfs/readline +++ b/lfs/readline @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2016 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 6.3 +VER = 7.0 THISAPP = readline-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 33c8fb279e981274f485fd91da77e94a +$(DL_FILE)_MD5 = 205b03a87fc83dab653b628c59b9fc91 install : $(TARGET) @@ -71,9 +71,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - for i in $$(seq 1 6); do \ - cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/readline/readline63-$$(printf "%03d" "$${i}") || exit 1; \ - done + # prevent in some cases to trigger a linking bug in ldconfig + cd $(DIR_APP) && sed -i '/MV.*old/d' Makefile.in + cd $(DIR_APP) && sed -i '/{OLDSUFF}/c:' support/shlib-install cd $(DIR_APP) && ./configure --prefix=/usr --disable-static cd $(DIR_APP) && make $(MAKETUNING) SHLIB_LIBS=-lncurses diff --git a/lfs/readline-compat b/lfs/readline-compat index 2f4388c..75675a0 100644 --- a/lfs/readline-compat +++ b/lfs/readline-compat @@ -24,7 +24,7 @@ include Config -VER = 5.2 +VER = 6.3 THISAPP = readline-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -36,11 +36,13 @@ TARGET = $(DIR_INFO)/$(THISAPP) # Top-level Rules ############################################################################### -objects = $(DL_FILE) +objects = $(DL_FILE) readline-5.2.tar.gz -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) +readline-5.2.tar.gz = $(DL_FROM)/readline-5.2.tar.gz -$(DL_FILE)_MD5 = e39331f32ad14009b9ff49cc10c5e751 +$(DL_FILE)_MD5 = 33c8fb279e981274f485fd91da77e94a +readline-5.2.tar.gz_MD5 = e39331f32ad14009b9ff49cc10c5e751 install : $(TARGET) @@ -70,17 +72,27 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - - for i in $$(seq 1 14); do \ - cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/readline/readline52-$$(printf "%03d" "$${i}") || exit 1; \ + for i in $$(seq 1 8); do \ + cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/readline/readline63-$$(printf "%03d" "$${i}") || exit 1; \ done - - cd $(DIR_APP) && ./configure --prefix=/usr --libdir=/lib --disable-static + cd $(DIR_APP) && ./configure --prefix=/usr --disable-static cd $(DIR_APP) && make $(MAKETUNING) SHLIB_LIBS=-lncurses - - cd $(DIR_APP)/shlib && install -m 755 libreadline.so.$(VER) /lib - cd $(DIR_APP)/shlib && install -m 755 libhistory.so.$(VER) /lib - ln -svf libreadline.so.$(VER) /lib/libreadline.so.5 - ln -svf libhistory.so.$(VER) /lib/libhistory.so.5 + cd $(DIR_APP)/shlib && install -m 755 libreadline.so.$(VER) /usr/lib + cd $(DIR_APP)/shlib && install -m 755 libhistory.so.$(VER) /usr/lib + ln -svf libreadline.so.$(VER) /usr/lib/libreadline.so.6 + ln -svf libhistory.so.$(VER) /usr/lib/libhistory.so.6 @rm -rf $(DIR_APP) + + # build 5.2 version + cd $(DIR_SRC) && tar axf $(DIR_DL)/readline-5.2.tar.gz + for i in $$(seq 1 14); do \ + cd $(DIR_SRC)/readline-5.2 && patch -Np0 < $(DIR_SRC)/src/patches/readline/readline52-$$(printf "%03d" "$${i}") || exit 1; \ + done + cd $(DIR_SRC)/readline-5.2 && ./configure --prefix=/usr --libdir=/lib --disable-static + cd $(DIR_SRC)/readline-5.2 && make $(MAKETUNING) SHLIB_LIBS=-lncurses + cd $(DIR_SRC)/readline-5.2/shlib && install -m 755 libreadline.so.5.2 /lib + cd $(DIR_SRC)/readline-5.2/shlib && install -m 755 libhistory.so.5.2 /lib + ln -svf libreadline.so.5.2 /lib/libreadline.so.5 + ln -svf libhistory.so.5.2 /lib/libhistory.so.5 + @rm -rf $(DIR_SRC)/readline-5.2 @$(POSTBUILD) diff --git a/src/patches/readline/readline63-007 b/src/patches/readline/readline63-007 new file mode 100644 index 0000000..1b65792 --- /dev/null +++ b/src/patches/readline/readline63-007 @@ -0,0 +1,47 @@ + READLINE PATCH REPORT + ===================== + +Readline-Release: 6.3 +Patch-ID: readline63-007 + +Bug-Reported-by: John Lenton +Bug-Reference-ID: +Bug-Reference-URL: https://bugs.launchpad.net/ubuntu/+source/bash/+bug/1317476 + +Bug-Description: + +Readline should allow SIGALRM and SIGVTALRM (if available) to `interrupt' +rl_getc and cause the handler to run when not in a signal handling context. + +Patch (apply with `patch -p0'): + +*** ../readline-6.3-patched/input.c 2014-01-10 15:07:08.000000000 -0500 +--- input.c 2014-05-30 16:20:56.000000000 -0400 +*************** +*** 535,540 **** +--- 538,551 ---- + else if (_rl_caught_signal == SIGHUP || _rl_caught_signal == SIGTERM) + return (RL_ISSTATE (RL_STATE_READCMD) ? READERR : EOF); ++ /* keyboard-generated signals of interest */ + else if (_rl_caught_signal == SIGINT || _rl_caught_signal == SIGQUIT) + RL_CHECK_SIGNALS (); ++ /* non-keyboard-generated signals of interest */ ++ else if (_rl_caught_signal == SIGALRM ++ #if defined (SIGVTALRM) ++ || _rl_caught_signal == SIGVTALRM ++ #endif ++ ) ++ RL_CHECK_SIGNALS (); + + if (rl_signal_event_hook) +*** ../readline-6.3/patchlevel 2013-11-15 08:11:11.000000000 -0500 +--- patchlevel 2014-03-21 08:28:40.000000000 -0400 +*************** +*** 1,3 **** + # Do not edit -- exists only for use by patch + +! 6 +--- 1,3 ---- + # Do not edit -- exists only for use by patch + +! 7 diff --git a/src/patches/readline/readline63-008 b/src/patches/readline/readline63-008 new file mode 100644 index 0000000..691016f --- /dev/null +++ b/src/patches/readline/readline63-008 @@ -0,0 +1,47 @@ + READLINE PATCH REPORT + ===================== + +Readline-Release: 6.3 +Patch-ID: readline63-008 + +Bug-Reported-by: Jared Yanovich <slovichon(a)gmail.com> +Bug-Reference-ID: <20140625225019.GJ17044(a)nightderanger.psc.edu> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-06/msg00070.html + +Bug-Description: + +When the readline `revert-all-at-newline' option is set, pressing newline +when the current line is one retrieved from history results in a double free +and a segmentation fault. + +Patch (apply with `patch -p0'): + +*** ../readline-6.3-patched/misc.c 2012-09-01 18:03:11.000000000 -0400 +--- misc.c 2014-06-30 13:41:19.000000000 -0400 +*************** +*** 462,465 **** +--- 462,466 ---- + /* Set up rl_line_buffer and other variables from history entry */ + rl_replace_from_history (entry, 0); /* entry->line is now current */ ++ entry->data = 0; /* entry->data is now current undo list */ + /* Undo all changes to this history entry */ + while (rl_undo_list) +*************** +*** 469,473 **** + FREE (entry->line); + entry->line = savestring (rl_line_buffer); +- entry->data = 0; + } + entry = previous_history (); +--- 470,473 ---- +*** ../readline-6.3/patchlevel 2013-11-15 08:11:11.000000000 -0500 +--- patchlevel 2014-03-21 08:28:40.000000000 -0400 +*************** +*** 1,3 **** + # Do not edit -- exists only for use by patch + +! 7 +--- 1,3 ---- + # Do not edit -- exists only for use by patch + +! 8 -- 2.9.3

1 0

[PATCH] passwd: Update to 0.79
by Stefan Schantl 21 Oct '16

21 Oct '16

This is a minor update to the lates available version of passwd. * Add download URL. * Drop SELinux support. Fixes #11221. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- passwd/passwd.nm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/passwd/passwd.nm b/passwd/passwd.nm index cc1958c..b7c34e0 100644 --- a/passwd/passwd.nm +++ b/passwd/passwd.nm @@ -4,8 +4,8 @@ ############################################################################### name = passwd -version = 0.76 -release = 2 +version = 0.79 +release = 1 groups = System/Base url = http://fedorahosted.org/passwd @@ -18,7 +18,7 @@ description Modules) library. end -source_dl = +source_dl = https://fedorahosted.org/releases/p/a/%{name}/ sources = %{thisapp}.tar.bz2 build @@ -28,12 +28,11 @@ build libuser-devel pam-devel pkg-config - libselinux-devel popt-devel end configure_options +=\ - --with-selinux \ + --without-selinux \ --with-audit \ --disable-static -- 2.7.4

1 0

[PATCH] patch: Update to 2.7.5
by Stefan Schantl 21 Oct '16

21 Oct '16

This is a minor update to the latest available version of patch. * Drop SELinux support. Fixes #11222. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- patch/patch.nm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/patch/patch.nm b/patch/patch.nm index 9a96a32..11d7251 100644 --- a/patch/patch.nm +++ b/patch/patch.nm @@ -4,7 +4,7 @@ ############################################################################### name = patch -version = 2.7.1 +version = 2.7.5 release = 1 groups = Development/Tools @@ -27,7 +27,6 @@ build requires attr-devel ed - libselinux-devel pkg-config end -- 2.7.4

1 0

[PATCH] cups: Update to 2.2.1
by Stefan Schantl 21 Oct '16

21 Oct '16

This is a minor update to the latest stable version of cups. * Enable the web administration interface. * Add support for systemd. * Splitt into more sub-pakages. * Drop SELinux support. Fixes #11202. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- cups/cups.logrotate | 5 -- cups/cups.nm | 167 +++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 152 insertions(+), 20 deletions(-) delete mode 100644 cups/cups.logrotate diff --git a/cups/cups.logrotate b/cups/cups.logrotate deleted file mode 100644 index 773c70f..0000000 --- a/cups/cups.logrotate +++ /dev/null @@ -1,5 +0,0 @@ -/var/log/cups/*_log { - missingok - notifempty - sharedscripts -} diff --git a/cups/cups.nm b/cups/cups.nm index a58ec49..1a2c127 100644 --- a/cups/cups.nm +++ b/cups/cups.nm @@ -4,8 +4,8 @@ ############################################################################### name = cups -version = 2.1.4 -release = 2 +version = 2.2.1 +release = 1 groups = Applications/Printing url = http://cups.org/software.php @@ -13,11 +13,11 @@ license = GPLv2+ summary = The common UNIX printing system. description - CUPS is the standards-based, open source printing system developed \ + CUPS is the standards-based, open source printing system developed by Apple Inc. for Mac OS(R) X and other UNIX(R)-like operating systems. end -source_dl = https://github.com/apple/cups/releases/download/release-%{version}/ +source_dl = https://github.com/apple/cups/releases/download/v%{version}/ sources = %{thisapp}-source.tar.gz build @@ -28,32 +28,37 @@ build avahi-devel cyrus-sasl-devel gcc-c++ - ghostscript gnutls-devel + libacl-devel libgcrypt-devel libjpeg-devel libpng-devel - libselinux-devel libtasn1-devel libtiff-devel + libusb-devel openldap-devel openssl-devel pam-devel - perl - python + systemd-devel zlib-devel end + CFLAGS += -DLDAP_DEPRECATED=1 + configure_options += \ - --sysconfdir=/etc \ - --localstatedir=/var \ + --localedir=%{datadir}/locale \ + --with-cupsd-file-perm=0755 \ --with-log-file-perm=0600 \ + --with-docdir=%{datadir}/%{name}/www \ + --with-dbusdir=%{sysconfdir}/dbus-1 \ --enable-pie \ --enable-relro \ --enable-avahi \ --enable-lspp \ --enable-threads \ - --enable-gnutls + --enable-gnutls \ + --enable-webif \ + --with-xinetd=no prepare_cmds aclocal -I config-scripts @@ -66,18 +71,129 @@ build # Remove sysvinit scripts rm -vfr %{BUILDROOT}/etc/init.d/cups %{BUILDROOT}/etc/rc*.d + # Install default config file. mkdir -pv %{BUILDROOT}/etc/cups cp -vf %{DIR_APP}/conf/cupsd.conf %{BUILDROOT}/etc/cups/ - # Logrotate - mkdir -pv %{BUILDROOT}/etc/logrotate.d/ - cp -vf %{DIR_SOURCE}/cups.logrotate %{BUILDROOT}/etc/logrotate.d/cups + # Rename systemd service files. + mv %{BUILDROOT}%{unitdir}/org.cups.cupsd.path \ + %{BUILDROOT}%{unitdir}/cups.path + mv %{BUILDROOT}%{unitdir}/org.cups.cupsd.service \ + %{BUILDROOT}%{unitdir}/cups.service + mv %{BUILDROOT}%{unitdir}/org.cups.cupsd.socket \ + %{BUILDROOT}%{unitdir}/cups.socket + mv %{BUILDROOT}%{unitdir}/org.cups.cups-lpd.socket \ + %{BUILDROOT}%{unitdir}/cups-lpd.socket + mv %{BUILDROOT}%{unitdir}/org.cups.cups-lpd@.service \ + %{BUILDROOT}%{unitdir}/cups-lpd@.service + + sed -i -e "s,org.cups.cupsd,cups,g" \ + %{BUILDROOT}%{unitdir}/cups.service + + # Fix permissions + chown root:lp %{BUILDROOT}%{localstatedir}/run/cups + chmod 0755 %{BUILDROOT}%{localstatedir}/run/cups end end packages package %{name} - requires = ghostscript + recomends + ghostscript + end + + script postin + systemctl daemon-reload >/dev/null 2>&1 || : + systemctl --no-reload enable cups.path >/dev/null 2>&1 || : + end + + script preun + systemctl --no-reload disable cups.path >/dev/null 2>&1 || : + systemctl --no-reload disable cupsd.socket >/dev/null 2>&1 || : + systemctl --no-reload disable cupsd.service >/dev/null 2>&1 || : + systemctl stop cupsd.socket >/dev/null 2>&1 || : + systemctl stop cupsd.service >/dev/null 2>&1 || : + systemctl stop cups.path >/dev/null 2>&1 || : + end + + script postun + systemctl daemon-reload >/dev/null 2>&1 || : + end + + script postup + systemctl daemon-reload >/dev/null 2>&1 || : + systemctl try-restart cups.path >/dev/null 2>&1 || : + systemctl try-restart cupsd.service >/dev/null 2>&1 || : + end + end + + package %{name}-client + summary = CUPS printing system - client programs. + description + CUPS printing system provides a portable printing layer for + UNIX operating systems. This package contains command-line client + programs. + end + + requires + %{name}-libs = %{thisver} + end + + provides += \ + lpr + + files + %{sbindir}/lpc.cups + %{bindir}/cancel* + %{bindir}/lp* + %{mandir}/man1/lp*.1.gz + %{mandir}/man1/cancel-cups.1.gz + %{mandir}/man8/lpc-cups.8.gz + end + end + + package %{name}-lpd + summary = CUPS printing system - lpd emulation. + description + CUPS printing system provides a portable printing layer for + UNIX operating systems. This is the package that provides standard + lpd emulation. + end + + requires + %{name} = %{thisver} + %{name}-libs = %{thisver} + end + + provides += \ + lpd + + files + %{unitdir}/cups-lpd.socket + %{unitdir}/cups-lpd@.service + %{prefix}/lib/daemon/cups-lpd + %{mandir}/man8/cups-lpd.8.gz + end + + script postin + systemctl daemon-reload >/dev/null 2>&1 || : + end + + script preun + systemctl --no-reload disable cups-lpd.socket >/dev/null 2>&1 || : + systemctl --no-reload disable cups-lpd@.service >/dev/null 2>&1 || : + systemctl stop cups-lpd.socket >/dev/null 2>&1 || : + systemctl stop cups-lpd@.service >/dev/null 2>&1 || : + end + + script postun + systemctl daemon-reload >/dev/null 2>&1 || : + end + + script postup + systemctl daemon-reload >/dev/null 2>&1 || : + systemctl try-restart cups-lpd@.service >/dev/null 2>&1 || : + end end package %{name}-devel @@ -90,6 +206,27 @@ packages template LIBS end + package %{name}-ipptool + summary = CUPS printing system - tool for performing IPP requests. + description + Sends IPP requests to the specified URI and tests and/or displays \ + the results. + end + + requires + %{name}-libs = %{thisver} + end + + files + %{bindir}/ipptool + %{bindir}/ippfind + %{datadir}/cups/ipptool + %{datadir}/cups/ipptool/* + %{mandir}/man1/ipptool.1.gz + %{mandir}/man5/ipptoolfile.5.gz + end + end + package %{name}-debuginfo template DEBUGINFO end -- 2.7.4

1 0

[PATCH] psmisc: Drop SELinux support
by Stefan Schantl 21 Oct '16

21 Oct '16

Fixes #11224. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- psmisc/psmisc.nm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/psmisc/psmisc.nm b/psmisc/psmisc.nm index 805ea84..99f3ba2 100644 --- a/psmisc/psmisc.nm +++ b/psmisc/psmisc.nm @@ -5,7 +5,7 @@ name = psmisc version = 22.21 -release = 1 +release = 2 groups = Applications/System url = http://sourceforge.net/projects/psmisc @@ -26,12 +26,8 @@ source_dl = http://downloads.sourceforge.net/project/psmisc/psmisc/ build requires - libselinux-devel ncurses-devel end - - configure_options += \ - --enable-selinux end packages -- 2.7.4

1 0

[PATCH] tar: Disable SELinux support
by Stefan Schantl 21 Oct '16

21 Oct '16

Fixes #11231. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- tar/tar.nm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tar/tar.nm b/tar/tar.nm index 3b400cf..26a1019 100644 --- a/tar/tar.nm +++ b/tar/tar.nm @@ -5,7 +5,7 @@ name = tar version = 1.29 -release = 1 +release = 2 groups = System/Packaging url = http://www.gnu.org/software/tar/ @@ -35,13 +35,11 @@ build gettext-devel libacl-devel libattr-devel - libselinux-devel texinfo end configure_options += \ --libexecdir=/usr/sbin \ - --enable-selinux \ FORCE_UNSAFE_CONFIGURE=1 prepare_cmds -- 2.7.4

1 0

[PATCH] libvirt: Update to 2.3.0
by Stefan Schantl 21 Oct '16

21 Oct '16

This is a major update to the latest available version of libvirt. * Drop SELinux support. Fixes #11212. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> --- libvirt/libvirt.nm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/libvirt/libvirt.nm b/libvirt/libvirt.nm index b05dd04..fc15edf 100644 --- a/libvirt/libvirt.nm +++ b/libvirt/libvirt.nm @@ -4,8 +4,8 @@ ############################################################################### name = libvirt -version = 1.3.3 -release = 2 +version = 2.3.0 +release = 1 maintainer = Ben Schweikert <ben.schweikert(a)ipfire.org> groups = Applications/Virtualization @@ -14,12 +14,12 @@ license = LGPLv2.1+ summary = A library for controlling VMs. description - A toolkit to interact with the virtualization capabilities of recent \ + A toolkit to interact with the virtualization capabilities of recent versions of Linux. end source_dl = ftp://libvirt.org/libvirt/ -sources = %{thisapp}.tar.gz +sources = %{thisapp}.tar.xz build requires @@ -29,7 +29,6 @@ build libcurl-devel libgcrypt-devel libnl-devel - libselinux-devel libdevmapper-devel libpciaccess-devel libssh2-devel @@ -65,8 +64,7 @@ build --with-storage-disk \ --with-avahi \ --with-udev \ - --with-libvirtd \ - --with-selinux + --with-libvirtd end packages -- 2.7.4

1 0

[PATCH] qemu: Update to 2.7.0
by Arne Fitzenreiter 20 Oct '16

20 Oct '16

Enables various modules and adds softmmu support for ARM, aarch64 and x86_64. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> --- qemu/qemu.nm | 62 ++++++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 50 insertions(+), 12 deletions(-) diff --git a/qemu/qemu.nm b/qemu/qemu.nm index 3499c4d..df81107 100644 --- a/qemu/qemu.nm +++ b/qemu/qemu.nm @@ -3,12 +3,12 @@ # Copyright (C) - IPFire Development Team <info(a)ipfire.org> # ############################################################################### -name = qemu-kvm -version = 0.15.0 +name = qemu +version = 2.7.0 release = 1 groups = Applications/Virtualization -url = http://www.linux-kvm.org/page/Main_Page +url = http://www.qemu.org license = GPLv2+ summary = QEMU is a generic and open source machine emulator and virtualizer. @@ -18,31 +18,69 @@ description architectures. end -source_dl = +source_dl = http://wiki.qemu-project.org/download/ +sources = %{thisapp}.tar.bz2 build requires + SDL-devel + autoconf + automake + bison + bzip2-devel + flex glib2-devel + gnutls-devel libcurl-devel + libgcrypt-devel + libjpeg-devel + libpng-devel + libtasn1-devel + libusb-devel libuuid-devel - gnutls-devel + lzo-devel ncurses-devel + nettle-devel pciutils-devel - sdl-devel + pixman-devel zlib-devel end + targets = aarch64-softmmu arm-softmmu x86_64-softmmu + configure_options = \ - --prefix=/usr \ - --enable-kvm \ + --prefix=%{prefix} \ + --bindir=%{bindir} \ + --sysconfdir=%{sysconfdir} \ + --libdir=%{libdir} \ + --libexecdir=%{libdir} \ + --datadir=%{datadir} \ + --mandir=%{mandir} \ + --localstatedir=%{localstatedir} \ --extra-cflags="%{CFLAGS}" \ + --extra-ldflags="%{LDFLAGS}" \ --disable-strip \ - --disable-xen \ - --sysconfdir=/etc \ - --target-list="i386-softmmu arm-softmmu" + --disable-werror \ + --target-list="%{targets}" \ + --enable-bzip2 \ + --enable-fdt \ + --enable-kvm \ + --enable-libusb \ + --enable-lzo \ + --enable-pie \ + --enable-vhdx \ + --enable-vnc \ + --enable-vnc-jpeg \ + --enable-vnc-png \ + --disable-xen configure_cmds - sed -e "s@-Wl,-rpath,/usr/lib@@g" -i */config-target.mak + sed -e "s@-Wl,-rpath,%{libdir}@@g" -i config-host.mak + end + + install_cmds + # Remove BIOS file which is an ELF files w/ invalid interpreter + rm -vf %{BUILDROOT}%{datadir}/qemu/s390-ccw.img end end -- 2.6.3

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development October 2016