orion pushed to zabbix (master). "Change %{name} to %{srcname} where
needed"
by notificationsï¼ fedoraproject.org
From 70939859d8de468bed188ceaf82cdc7e8a05d79a Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion(a)cora.nwra.com>
Date: Fri, 30 Jun 2017 15:08:39 -0600
Subject: Change %{name} to %{srcname} where needed
---
zabbix.spec | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/zabbix.spec b/zabbix.spec
index a13bb4b..2bdc3e7 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -422,13 +422,13 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/%{srcname}/web/zabbix.conf.php
# Replace bundled font and JS libraries
# There is no jquery-ui package yet
-rm frontends/php/fonts/DejaVuSans.ttf && ln -sf %{_datadir}/fonts/dejavu/DejaVuSans.ttf $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts/DejaVuSans.ttf
-rm frontends/php/js/vendor/jquery.js && ln -sf %{_datadir}/web-assets/jquery/1/jquery.js $RPM_BUILD_ROOT%{_datadir}/%{name}/js/vendor/jquery.js
-rm frontends/php/js/vendor/prototype.js && ln -sf %{_datadir}/prototype/prototype.js $RPM_BUILD_ROOT%{_datadir}/%{name}/js/vendor/prototype.js
+rm frontends/php/fonts/DejaVuSans.ttf && ln -sf %{_datadir}/fonts/dejavu/DejaVuSans.ttf $RPM_BUILD_ROOT%{_datadir}/%{srcname}/fonts/DejaVuSans.ttf
+rm frontends/php/js/vendor/jquery.js && ln -sf %{_datadir}/web-assets/jquery/1/jquery.js $RPM_BUILD_ROOT%{_datadir}/%{srcname}/js/vendor/jquery.js
+rm frontends/php/js/vendor/prototype.js && ln -sf %{_datadir}/prototype/prototype.js $RPM_BUILD_ROOT%{_datadir}/%{srcname}/js/vendor/prototype.js
# Move MVC override directory out; We are not owning or creating this directory!
#TODO: README dort
-rm -r frontends/php/local/ && ln -sf %{_usr}/local/share/zabbix/local $RPM_BUILD_ROOT%{_datadir}/%{name}/local
+rm -r frontends/php/local/ && ln -sf %{_usr}/local/share/zabbix/local $RPM_BUILD_ROOT%{_datadir}/%{srcname}/local
#TODO: local vielleicht doch unter /etc/zabbix/web?
# This file is used to switch the frontend to maintenance mode
--
cgit v1.1
https://src.fedoraproject.org/cgit/zabbix.git/commit/?h=master&id=7093985...
5Â years, 7Â months
kevin pushed to rkhunter (master). "- Update to 1.4.4. Fixes bug
#1466318 (..more)"
by notificationsï¼ fedoraproject.org
From 6a0737b2c494a7bf39fb62864f490d2308b51aee Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin(a)scrye.com>
Date: Fri, 30 Jun 2017 15:06:00 -0600
Subject: - Update to 1.4.4. Fixes bug #1466318 - Fix for logger and spaces.
Fixes bug #1284403
---
.gitignore | 1 +
rkhunter-1.4.2-fedoraconfig.patch | 215 --------------------------------------
rkhunter-1.4.2-grepopt.patch | 11 --
rkhunter-1.4.2-ipcs-locale.patch | 18 ----
rkhunter-1.4.4-fedoraconfig.patch | 213 +++++++++++++++++++++++++++++++++++++
rkhunter.spec | 25 ++---
sources | 2 +-
7 files changed, 223 insertions(+), 262 deletions(-)
delete mode 100644 rkhunter-1.4.2-fedoraconfig.patch
delete mode 100644 rkhunter-1.4.2-grepopt.patch
delete mode 100644 rkhunter-1.4.2-ipcs-locale.patch
create mode 100644 rkhunter-1.4.4-fedoraconfig.patch
diff --git a/.gitignore b/.gitignore
index 8ffe1c8..1422757 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ rkhunter-1.3.6.tar.gz
/rkhunter-1.3.8.tar.gz
/rkhunter-1.4.0.tar.gz
/rkhunter-1.4.2.tar.gz
+/rkhunter-1.4.4.tar.gz
diff --git a/rkhunter-1.4.2-fedoraconfig.patch b/rkhunter-1.4.2-fedoraconfig.patch
deleted file mode 100644
index 9b86c3d..0000000
--- a/rkhunter-1.4.2-fedoraconfig.patch
+++ /dev/null
@@ -1,215 +0,0 @@
---- rkhunter-1.4.2.orig/files/rkhunter.conf 2017-01-25 21:03:14.142522097 -0500
-+++ rkhunter-1.4.2/files/rkhunter.conf 2017-01-25 21:05:50.114146953 -0500
-@@ -155,6 +155,7 @@
- # default directory beneath the installation directory.
- #
- #TMPDIR=/var/lib/rkhunter/tmp
-+TMPDIR=/var/lib/rkhunter
-
- #
- # This option specifies the database directory to use.
-@@ -163,7 +164,7 @@
- # subsequently commented out or removed, then the program will assume a
- # default directory beneath the installation directory.
- #
--#DBDIR=/var/lib/rkhunter/db
-+DBDIR=/var/lib/rkhunter/db
-
- #
- # This option specifies the script directory to use.
-@@ -172,6 +173,7 @@
- # subsequently commented out or removed, then the program will not run.
- #
- #SCRIPTDIR=/usr/local/lib/rkhunter/scripts
-+SCRIPTDIR=/usr/share/rkhunter/scripts
-
- #
- # This option can be used to modify the command directory list used by rkhunter
-@@ -228,7 +230,7 @@
- #
- # The default value is '/var/log/rkhunter.log'.
- #
--LOGFILE=/var/log/rkhunter.log
-+LOGFILE=/var/log/rkhunter/rkhunter.log
-
- #
- # Set this option to '1' if the log file is to be appended to whenever rkhunter
-@@ -238,6 +240,7 @@
- # The default value is '0'.
- #
- #APPEND_LOG=0
-+APPEND_LOG=1
-
- #
- # Set the following option to '1' if the log file is to be copied when rkhunter
-@@ -304,6 +307,7 @@
- # The default value is 'no'.
- #
- #ALLOW_SSH_ROOT_USER=no
-+ALLOW_SSH_ROOT_USER=yes
-
- #
- # Set this option to '1' to allow the use of the SSH-1 protocol, but note
-@@ -318,6 +322,7 @@
- # The default value is '0'.
- #
- #ALLOW_SSH_PROT_V1=0
-+ALLOW_SSH_PROT_V1=2
-
- #
- # This setting tells rkhunter the directory containing the SSH configuration
-@@ -350,7 +355,8 @@
- # program defaults.
- #
- ENABLE_TESTS=ALL
--DISABLE_TESTS=suspscan hidden_ports hidden_procs deleted_files packet_cap_apps
-+#DISABLE_TESTS=suspscan hidden_ports hidden_procs deleted_files packet_cap_apps
-+DISABLE_TESTS=suspscan hidden_ports deleted_files packet_cap_apps apps
-
- #
- # The HASH_CMD option can be used to specify the command to use for the file
-@@ -422,6 +428,7 @@
- # Also see the PKGMGR_NO_VRFY and USE_SUNSUM options.
- #
- #PKGMGR=NONE
-+PKGMGR=RPM
-
- #
- # It is possible that a file, which is part of a package, may have been
-@@ -545,6 +552,14 @@
- # The default value is the null string.
- #
- #EXISTWHITELIST=""
-+EXISTWHITELIST=/bin/ad
-+# FreeIPA Certificate Authority
-+EXISTWHITELIST=/var/log/pki-ca/system
-+# FreeIPA Certificate Authority
-+EXISTWHITELIST=/var/log/pki/pki-tomcat/ca/system
-+# Some non default installed files we check
-+EXISTWHITELIST=/usr/bin/GET
-+EXISTWHITELIST=/usr/bin/whatis
-
- #
- # Whitelist various attributes of the specified file. The attributes are those
-@@ -575,6 +590,12 @@
- # The default value is the null string.
- #
- #SCRIPTWHITELIST=/usr/bin/groups
-+SCRIPTWHITELIST=/usr/bin/whatis
-+SCRIPTWHITELIST=/usr/bin/ldd
-+SCRIPTWHITELIST=/usr/bin/groups
-+SCRIPTWHITELIST=/usr/bin/GET
-+SCRIPTWHITELIST=/sbin/ifup
-+SCRIPTWHITELIST=/sbin/ifdown
-
- #
- # Allow the specified file to have the immutable attribute set.
-@@ -605,6 +626,19 @@
- #ALLOWHIDDENDIR=/dev/.udev
- #ALLOWHIDDENDIR=/dev/.udevdb
- #ALLOWHIDDENDIR=/dev/.mdadm
-+ALLOWHIDDENDIR="/etc/.java"
-+ALLOWHIDDENDIR=/dev/.udev
-+ALLOWHIDDENDIR=/dev/.udevdb
-+ALLOWHIDDENDIR=/dev/.udev.tdb
-+ALLOWHIDDENDIR=/dev/.static
-+ALLOWHIDDENDIR=/dev/.initramfs
-+ALLOWHIDDENDIR=/dev/.SRC-unix
-+ALLOWHIDDENDIR=/dev/.mdadm
-+ALLOWHIDDENDIR=/dev/.systemd
-+ALLOWHIDDENDIR=/dev/.mount
-+# for etckeeper
-+ALLOWHIDDENDIR=/etc/.git
-+ALLOWHIDDENDIR=/etc/.bzr
-
- #
- # Allow the specified hidden file to be whitelisted.
-@@ -620,6 +654,45 @@
- #ALLOWHIDDENFILE=/usr/lib/hmaccalc/sha1hmac.hmac
- #ALLOWHIDDENFILE=/usr/lib/hmaccalc/sha256hmac.hmac
- #ALLOWHIDDENFILE=/usr/sbin/.sshd.hmac
-+ALLOWHIDDENFILE="/usr/share/man/man1/..1.gz"
-+ALLOWHIDDENFILE=/lib*/.libcrypto.so.*.hmac
-+ALLOWHIDDENFILE=/lib*/.libssl.so.*.hmac
-+ALLOWHIDDENFILE=/usr/bin/.fipscheck.hmac
-+ALLOWHIDDENFILE=/usr/bin/.ssh.hmac
-+ALLOWHIDDENFILE=/usr/bin/.ssh-keygen.hmac
-+ALLOWHIDDENFILE=/usr/bin/.ssh-keyscan.hmac
-+ALLOWHIDDENFILE=/usr/bin/.ssh-add.hmac
-+ALLOWHIDDENFILE=/usr/bin/.ssh-agent.hmac
-+ALLOWHIDDENFILE=/usr/lib*/.libfipscheck.so.*.hmac
-+ALLOWHIDDENFILE=/usr/lib*/.libgcrypt.so.*.hmac
-+ALLOWHIDDENFILE=/usr/lib*/hmaccalc/sha1hmac.hmac
-+ALLOWHIDDENFILE=/usr/lib*/hmaccalc/sha256hmac.hmac
-+ALLOWHIDDENFILE=/usr/lib*/hmaccalc/sha384hmac.hmac
-+ALLOWHIDDENFILE=/usr/lib*/hmaccalc/sha512hmac.hmac
-+ALLOWHIDDENFILE=/usr/sbin/.sshd.hmac
-+ALLOWHIDDENFILE=/dev/.mdadm.map
-+ALLOWHIDDENFILE=/usr/share/man/man5/.k5login.5.gz
-+ALLOWHIDDENFILE=/usr/share/man/man5/.k5identity.5.gz
-+ALLOWHIDDENFILE=/usr/sbin/.ipsec.hmac
-+# etckeeper
-+ALLOWHIDDENFILE=/etc/.etckeeper
-+ALLOWHIDDENFILE=/etc/.gitignore
-+ALLOWHIDDENFILE=/etc/.bzrignore
-+# systemd
-+ALLOWHIDDENFILE=/etc/.updated
-+
-+
-+# Allow PCS/Pacemaker/Corosync
-+ALLOWDEVFILE=/dev/shm/qb-attrd-*
-+ALLOWDEVFILE=/dev/shm/qb-cfg-*
-+ALLOWDEVFILE=/dev/shm/qb-cib_rw-*
-+ALLOWDEVFILE=/dev/shm/qb-cib_shm-*
-+ALLOWDEVFILE=/dev/shm/qb-corosync-*
-+ALLOWDEVFILE=/dev/shm/qb-cpg-*
-+ALLOWDEVFILE=/dev/shm/qb-lrmd-*
-+ALLOWDEVFILE=/dev/shm/qb-pengine-*
-+ALLOWDEVFILE=/dev/shm/qb-quorum-*
-+ALLOWDEVFILE=/dev/shm/qb-stonith-*
-
- #
- # Allow the specified process to use deleted files. The process name may be
-@@ -681,6 +754,24 @@
- #
- #ALLOWDEVFILE=/dev/shm/pulse-shm-*
- #ALLOWDEVFILE=/dev/shm/sem.ADBE_*
-+ALLOWDEVFILE=/dev/shm/pulse-shm-*
-+ALLOWDEVFILE=/dev/md/md-device-map
-+# tomboy creates this one
-+ALLOWDEVFILE="/dev/shm/mono.*"
-+# created by libv4l
-+ALLOWDEVFILE="/dev/shm/libv4l-*"
-+# created by spice video
-+ALLOWDEVFILE="/dev/shm/spice.*"
-+# created by mdadm
-+ALLOWDEVFILE="/dev/md/autorebuild.pid"
-+# 389 Directory Server
-+ALLOWDEVFILE=/dev/shm/sem.slapd-*.stats
-+# squid proxy
-+ALLOWDEVFILE=/dev/shm/squid-cf*
-+# squid ssl cache
-+ALLOWDEVFILE=/dev/shm/squid-ssl_session_cache.shm
-+# allow lldpad state file
-+ALLOWDEVFILE=/dev/shm/lldpad.state
-
- #
- # This option is used to indicate if the Phalanx2 test is to perform a basic
-@@ -1004,6 +1095,11 @@
- #
- #RTKT_DIR_WHITELIST=""
- #RTKT_FILE_WHITELIST=""
-+RTKT_FILE_WHITELIST=/bin/ad
-+# FreeIPA Certificate Authority
-+RTKT_FILE_WHITELIST=/var/log/pki-ca/system
-+# FreeIPA Certificate Authority
-+RTKT_FILE_WHITELIST=/var/log/pki/pki-tomcat/ca/system
-
- #
- # The following option can be used to whitelist shared library files that would
-@@ -1222,3 +1318,5 @@
- #
- #EMPTY_LOGFILES=""
- #MISSING_LOGFILES=""
-+
-+INSTALLDIR="/usr"
diff --git a/rkhunter-1.4.2-grepopt.patch b/rkhunter-1.4.2-grepopt.patch
deleted file mode 100644
index 6f1f6fb..0000000
--- a/rkhunter-1.4.2-grepopt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur rkhunter-1.4.2.orig/files/rkhunter rkhunter-1.4.2/files/rkhunter
---- rkhunter-1.4.2.orig/files/rkhunter 2014-12-20 09:07:54.826773450 -0700
-+++ rkhunter-1.4.2/files/rkhunter 2014-12-20 09:08:45.739800180 -0700
-@@ -18480,6 +18480,7 @@
- case "${OPERATING_SYSTEM}" in
- Linux)
- LINUXOS=1
-+ GREP_OPT="-a"
- ;;
- *BSD|DragonFly)
- BSDOS=1
diff --git a/rkhunter-1.4.2-ipcs-locale.patch b/rkhunter-1.4.2-ipcs-locale.patch
deleted file mode 100644
index 0457e4c..0000000
--- a/rkhunter-1.4.2-ipcs-locale.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Nur rkhunter-1.4.2.orig/files/rkhunter rkhunter-1.4.2/files/rkhunter
---- rkhunter-1.4.2.orig/files/rkhunter 2014-03-12 14:54:55.000000000 -0600
-+++ rkhunter-1.4.2/files/rkhunter 2014-04-06 11:39:44.776583858 -0600
-@@ -13964,11 +13964,11 @@
- touch "${IPCS_TMPFILE}"
- FOUND=0; echo $FOUND > "${IPCS_TMPFILE}"
-
-- if [ `${IPCS_CMD} -u 2>/dev/null | awk -F' ' '/segments allocated/ {print $3}'` -ne 0 ]; then
-- ${IPCS_CMD} -m | grep "^0x" | while read RKH_SHM_KEY RKH_SHM_SHMID RKH_SHM_OWNER RKH_SHM_PERMS RKH_SHM_BYTES RKH_SHM_NATTACH RKH_SHM_STATUS; do
-+ if [ `LC_ALL=C ${IPCS_CMD} -u 2>/dev/null | awk -F' ' '/segments allocated/ {print $3}'` -ne 0 ]; then
-+ LC_ALL=C ${IPCS_CMD} -m | grep "^0x" | while read RKH_SHM_KEY RKH_SHM_SHMID RKH_SHM_OWNER RKH_SHM_PERMS RKH_SHM_BYTES RKH_SHM_NATTACH RKH_SHM_STATUS; do
- if [ $RKH_SHM_PERMS -eq 666 -a $RKH_SHM_BYTES -ge 1000000 ]; then
- FOUND=1; echo $FOUND > "${IPCS_TMPFILE}"
-- ${IPCS_CMD} -p | grep "^${RKH_SHM_SHMID}" | while read RKH_SHM_SHMID RKH_SHM_OWNER RKH_SHM_CPID RKH_SHM_LPID; do
-+ LC_ALL=C ${IPCS_CMD} -p | grep "^${RKH_SHM_SHMID}" | while read RKH_SHM_SHMID RKH_SHM_OWNER RKH_SHM_CPID RKH_SHM_LPID; do
- RKH_SHM_PATH=`${READLINK_CMD} -f /proc/${RKH_SHM_CPID}/exe`
- if [ $VERBOSE_LOGGING -eq 1 ]; then
- display --to LOG --type PLAIN --result FOUND --log-indent 2 ROOTKIT_MALWARE_IPCS_DETAILS "${RKH_SHM_PATH}" "${RKH_SHM_CPID}" "${RKH_SHM_OWNER}"
diff --git a/rkhunter-1.4.4-fedoraconfig.patch b/rkhunter-1.4.4-fedoraconfig.patch
new file mode 100644
index 0000000..ca26113
--- /dev/null
+++ b/rkhunter-1.4.4-fedoraconfig.patch
@@ -0,0 +1,213 @@
+diff -Nur rkhunter-1.4.4.orig/files/rkhunter.conf rkhunter-1.4.4/files/rkhunter.conf
+--- rkhunter-1.4.4.orig/files/rkhunter.conf 2017-06-22 18:19:20.000000000 -0600
++++ rkhunter-1.4.4/files/rkhunter.conf 2017-06-30 14:45:05.104227416 -0600
+@@ -158,6 +158,7 @@
+ # default directory beneath the installation directory.
+ #
+ #TMPDIR=/var/lib/rkhunter/tmp
++TMPDIR=/var/lib/rkhunter
+
+ #
+ # This option specifies the database directory to use.
+@@ -167,6 +168,7 @@
+ # default directory beneath the installation directory.
+ #
+ #DBDIR=/var/lib/rkhunter/db
++DBDIR=/var/lib/rkhunter/db
+
+ #
+ # This option specifies the script directory to use.
+@@ -175,6 +177,7 @@
+ # subsequently commented out or removed, then the program will not run.
+ #
+ #SCRIPTDIR=/usr/local/lib/rkhunter/scripts
++SCRIPTDIR=/usr/share/rkhunter/scripts
+
+ #
+ # This option can be used to modify the command directory list used by rkhunter
+@@ -231,7 +234,7 @@
+ #
+ # The default value is '/var/log/rkhunter.log'.
+ #
+-LOGFILE=/var/log/rkhunter.log
++LOGFILE=/var/log/rkhunter/rkhunter.log
+
+ #
+ # Set this option to '1' if the log file is to be appended to whenever rkhunter
+@@ -241,6 +244,7 @@
+ # The default value is '0'.
+ #
+ #APPEND_LOG=0
++APPEND_LOG=1
+
+ #
+ # Set the following option to '1' if the log file is to be copied when rkhunter
+@@ -307,6 +311,7 @@
+ # The default value is 'no'.
+ #
+ #ALLOW_SSH_ROOT_USER=no
++ALLOW_SSH_ROOT_USER=yes
+
+ #
+ # Set this option to '1' to allow the use of the SSH-1 protocol, but note
+@@ -321,6 +326,7 @@
+ # The default value is '0'.
+ #
+ #ALLOW_SSH_PROT_V1=0
++ALLOW_SSH_PROT_V1=2
+
+ #
+ # This setting tells rkhunter the directory containing the SSH configuration
+@@ -353,7 +359,8 @@
+ # program defaults.
+ #
+ ENABLE_TESTS=ALL
+-DISABLE_TESTS=suspscan hidden_ports hidden_procs deleted_files packet_cap_apps apps
++#DISABLE_TESTS=suspscan hidden_ports hidden_procs deleted_files packet_cap_apps apps
++DISABLE_TESTS=suspscan hidden_ports deleted_files packet_cap_apps apps
+
+ #
+ # The HASH_CMD option can be used to specify the command to use for the file
+@@ -434,6 +441,7 @@
+ # Also see the PKGMGR_NO_VRFY and USE_SUNSUM options.
+ #
+ #PKGMGR=NONE
++PKGMGR=RPM
+
+ #
+ # It is possible that a file, which is part of a package, may have been
+@@ -557,6 +565,14 @@
+ # The default value is the null string.
+ #
+ #EXISTWHITELIST=""
++EXISTWHITELIST=/bin/ad
++# FreeIPA Certificate Authority
++EXISTWHITELIST=/var/log/pki-ca/system
++# FreeIPA Certificate Authority
++EXISTWHITELIST=/var/log/pki/pki-tomcat/ca/system
++# Some non default installed files we check
++EXISTWHITELIST=/usr/bin/GET
++EXISTWHITELIST=/usr/bin/whatis
+
+ #
+ # Whitelist various attributes of the specified file. The attributes are those
+@@ -587,6 +603,12 @@
+ # The default value is the null string.
+ #
+ #SCRIPTWHITELIST=/usr/bin/groups
++SCRIPTWHITELIST=/usr/bin/whatis
++SCRIPTWHITELIST=/usr/bin/ldd
++SCRIPTWHITELIST=/usr/bin/groups
++SCRIPTWHITELIST=/usr/bin/GET
++SCRIPTWHITELIST=/sbin/ifup
++SCRIPTWHITELIST=/sbin/ifdown
+
+ #
+ # Allow the specified file to have the immutable attribute set.
+@@ -617,6 +639,19 @@
+ #ALLOWHIDDENDIR=/dev/.udev
+ #ALLOWHIDDENDIR=/dev/.udevdb
+ #ALLOWHIDDENDIR=/dev/.mdadm
++ALLOWHIDDENDIR="/etc/.java"
++ALLOWHIDDENDIR=/dev/.udev
++ALLOWHIDDENDIR=/dev/.udevdb
++ALLOWHIDDENDIR=/dev/.udev.tdb
++ALLOWHIDDENDIR=/dev/.static
++ALLOWHIDDENDIR=/dev/.initramfs
++ALLOWHIDDENDIR=/dev/.SRC-unix
++ALLOWHIDDENDIR=/dev/.mdadm
++ALLOWHIDDENDIR=/dev/.systemd
++ALLOWHIDDENDIR=/dev/.mount
++# for etckeeper
++ALLOWHIDDENDIR=/etc/.git
++ALLOWHIDDENDIR=/etc/.bzr
+
+ #
+ # Allow the specified hidden file to be whitelisted.
+@@ -632,6 +667,32 @@
+ #ALLOWHIDDENFILE=/usr/lib/hmaccalc/sha1hmac.hmac
+ #ALLOWHIDDENFILE=/usr/lib/hmaccalc/sha256hmac.hmac
+ #ALLOWHIDDENFILE=/usr/sbin/.sshd.hmac
++ALLOWHIDDENFILE="/usr/share/man/man1/..1.gz"
++ALLOWHIDDENFILE=/lib*/.libcrypto.so.*.hmac
++ALLOWHIDDENFILE=/lib*/.libssl.so.*.hmac
++ALLOWHIDDENFILE=/usr/bin/.fipscheck.hmac
++ALLOWHIDDENFILE=/usr/bin/.ssh.hmac
++ALLOWHIDDENFILE=/usr/bin/.ssh-keygen.hmac
++ALLOWHIDDENFILE=/usr/bin/.ssh-keyscan.hmac
++ALLOWHIDDENFILE=/usr/bin/.ssh-add.hmac
++ALLOWHIDDENFILE=/usr/bin/.ssh-agent.hmac
++ALLOWHIDDENFILE=/usr/lib*/.libfipscheck.so.*.hmac
++ALLOWHIDDENFILE=/usr/lib*/.libgcrypt.so.*.hmac
++ALLOWHIDDENFILE=/usr/lib*/hmaccalc/sha1hmac.hmac
++ALLOWHIDDENFILE=/usr/lib*/hmaccalc/sha256hmac.hmac
++ALLOWHIDDENFILE=/usr/lib*/hmaccalc/sha384hmac.hmac
++ALLOWHIDDENFILE=/usr/lib*/hmaccalc/sha512hmac.hmac
++ALLOWHIDDENFILE=/usr/sbin/.sshd.hmac
++ALLOWHIDDENFILE=/dev/.mdadm.map
++ALLOWHIDDENFILE=/usr/share/man/man5/.k5login.5.gz
++ALLOWHIDDENFILE=/usr/share/man/man5/.k5identity.5.gz
++ALLOWHIDDENFILE=/usr/sbin/.ipsec.hmac
++# etckeeper
++ALLOWHIDDENFILE=/etc/.etckeeper
++ALLOWHIDDENFILE=/etc/.gitignore
++ALLOWHIDDENFILE=/etc/.bzrignore
++# systemd
++ALLOWHIDDENFILE=/etc/.updated
+
+ #
+ # Allow the specified process to use deleted files. The process name may be
+@@ -701,6 +762,35 @@
+ #
+ #ALLOWDEVFILE=/dev/shm/pulse-shm-*
+ #ALLOWDEVFILE=/dev/shm/sem.ADBE_*
++ALLOWDEVFILE=/dev/shm/pulse-shm-*
++ALLOWDEVFILE=/dev/md/md-device-map
++# tomboy creates this one
++ALLOWDEVFILE="/dev/shm/mono.*"
++# created by libv4l
++ALLOWDEVFILE="/dev/shm/libv4l-*"
++# created by spice video
++ALLOWDEVFILE="/dev/shm/spice.*"
++# created by mdadm
++ALLOWDEVFILE="/dev/md/autorebuild.pid"
++# 389 Directory Server
++ALLOWDEVFILE=/dev/shm/sem.slapd-*.stats
++# squid proxy
++ALLOWDEVFILE=/dev/shm/squid-cf*
++# squid ssl cache
++ALLOWDEVFILE=/dev/shm/squid-ssl_session_cache.shm
++# allow lldpad state file
++ALLOWDEVFILE=/dev/shm/lldpad.state
++# Allow PCS/Pacemaker/Corosync
++ALLOWDEVFILE=/dev/shm/qb-attrd-*
++ALLOWDEVFILE=/dev/shm/qb-cfg-*
++ALLOWDEVFILE=/dev/shm/qb-cib_rw-*
++ALLOWDEVFILE=/dev/shm/qb-cib_shm-*
++ALLOWDEVFILE=/dev/shm/qb-corosync-*
++ALLOWDEVFILE=/dev/shm/qb-cpg-*
++ALLOWDEVFILE=/dev/shm/qb-lrmd-*
++ALLOWDEVFILE=/dev/shm/qb-pengine-*
++ALLOWDEVFILE=/dev/shm/qb-quorum-*
++ALLOWDEVFILE=/dev/shm/qb-stonith-*
+
+ #
+ # Allow the specified process pathnames to use shared memory segments.
+@@ -1035,6 +1125,11 @@
+ #
+ #RTKT_DIR_WHITELIST=""
+ #RTKT_FILE_WHITELIST=""
++RTKT_FILE_WHITELIST=/bin/ad
++# FreeIPA Certificate Authority
++RTKT_FILE_WHITELIST=/var/log/pki-ca/system
++# FreeIPA Certificate Authority
++RTKT_FILE_WHITELIST=/var/log/pki/pki-tomcat/ca/system
+
+ #
+ # The following option can be used to whitelist shared library files that would
+@@ -1274,3 +1369,5 @@
+ # The default value is '0'.
+ #
+ #GLOBSTAR=0
++
++INSTALLDIR="/usr"
diff --git a/rkhunter.spec b/rkhunter.spec
index a1a2ce8..9b3d533 100644
--- a/rkhunter.spec
+++ b/rkhunter.spec
@@ -2,8 +2,8 @@
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
Name: rkhunter
-Version: 1.4.2
-Release: 13%{?dist}
+Version: 1.4.4
+Release: 1%{?dist}
Summary: A host-based tool to scan for rootkits, backdoors and local exploits
Group: Applications/System
@@ -12,17 +12,8 @@ URL: http://rkhunter.sourceforge.net/
Source0: http://downloads.sourceforge.net/rkhunter/rkhunter-%{version}.tar.gz
Source2: 01-rkhunter
Source3: rkhunter.sysconfig
-Patch0: rkhunter-1.4.2-fedoraconfig.patch
-#
-# Fix issue with ipcs command and locales
-#
-Patch1: rkhunter-1.4.2-ipcs-locale.patch
-#
-# Fix grep -a issue
-#
-Patch2: rkhunter-1.4.2-grepopt.patch
+Patch0: rkhunter-1.4.4-fedoraconfig.patch
BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: perl-generators
Requires: coreutils, binutils, kmod, findutils, grep
@@ -37,11 +28,7 @@ and other unwanted tools.
%prep
-%setup -q
-
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%autosetup -p1
%{__cat} <<'EOF' >%{name}.logrotate
%{_localstatedir}/log/%{name}/%{name}.log {
@@ -111,6 +98,10 @@ EOF
%{_mandir}/man8/*
%changelog
+* Thu Jun 29 2017 Kevin Fenzi <kevin(a)scrye.com> - 1.4.4-1
+- Update to 1.4.4. Fixes bug #1466318
+- Fix for logger and spaces. Fixes bug #1284403
+
* Sat Feb 11 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.4.2-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
diff --git a/sources b/sources
index 873ec5b..458900a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-85ad366b7f3999eb2a9371e39a1a4df7 rkhunter-1.4.2.tar.gz
+SHA512 (rkhunter-1.4.4.tar.gz) = 87e9c617220765678cc4519eee27d1d56185c3a7fb1d6338c8fb984ac4f5176c31bb54b69e1de615d66a0cf1e72b672e66b368e37851a459def69463cbb8661e
--
cgit v1.1
https://src.fedoraproject.org/cgit/rkhunter.git/commit/?h=master&id=6a073...
5Â years, 7Â months
mohanboddu pushed to generic-release (f26). "Setup for F26 final
(..more)"
by notificationsï¼ fedoraproject.org
From fc6630c52793a507488ee7ce40ad884e0916f94c Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu(a)redhat.com>
Date: Fri, 30 Jun 2017 16:46:49 -0400
Subject: Setup for F26 final Sync presets from fedora-release
Signed-off-by: Mohan Boddu <mboddu(a)redhat.com>
---
90-default.preset | 112 ++++++++++++++++++++++++++++++++++++++++++++++-----
generic-release.spec | 6 ++-
2 files changed, 107 insertions(+), 11 deletions(-)
diff --git a/90-default.preset b/90-default.preset
index bcf1461..10ff383 100644
--- a/90-default.preset
+++ b/90-default.preset
@@ -4,21 +4,47 @@
# On Fedora we deviate from some upstream defaults
disable systemd-timesyncd.service
disable systemd-networkd.service
+disable systemd-networkd-wait-online.service
disable systemd-resolved.service
+# These presets were last validated en-masse on 2015-09-09
+# https://fedorahosted.org/fesco/ticket/1472
+
# System stuff
+# https://fedoraproject.org/w/index.php?title=Starting_services_by_default&...
enable sshd.service
+
+# Locally-running services
enable atd.*
enable crond.*
+
+# Approved by FESCo - https://fedorahosted.org/fesco/ticket/636
enable chronyd.service
+
+# https://fedoraproject.org/w/index.php?title=Starting_services_by_default&...
+# https://bugzilla.redhat.com/show_bug.cgi?id=1455704
enable NetworkManager.service
+enable NetworkManager-wait-online.service
enable NetworkManager-dispatcher.service
enable ModemManager.service
+
+# Approved by FESCo - https://fedorahosted.org/fesco/ticket/1311
enable auditd.service
+
+# Locally-running service
enable restorecond.service
+
+# Approved by FESCo - https://fedorahosted.org/fesco/ticket/1166
enable bluetooth.*
+
+# https://fedoraproject.org/w/index.php?title=Starting_services_by_default&...
enable avahi-daemon.*
-enable cups.*
+
+# Default configuration is locally-running only
+# CUPS is now socket-activatable for local use-cases, so don't enable cups.service
+# https://pagure.io/fesco/issue/1701
+enable cups.socket
+enable cups.path
# The various syslog implementations
enable rsyslog.*
@@ -26,14 +52,23 @@ enable syslog-ng.*
enable sysklogd.*
# Network facing
+# https://fedoraproject.org/w/index.php?title=Starting_services_by_default&...
enable firewalld.service
+
+# Approved by FESCo - https://fedorahosted.org/fesco/ticket/544
enable libvirtd.service
+
+# https://fedoraproject.org/w/index.php?title=Starting_services_by_default&...
enable xinetd.service
-enable ladvd.service
# Storage
+# Approved by FESCo - https://fedorahosted.org/fesco/ticket/391
enable multipathd.service
+
+# Approved by FESCo - https://fedorahosted.org/fesco/ticket/876
enable libstoragemgmt.service
+
+# Locally-running services
enable lvm2-monitor.*
enable lvm2-lvmetad.*
enable dm-event.*
@@ -52,10 +87,6 @@ enable qemu-guest-agent.service
# https://bugzilla.redhat.com/show_bug.cgi?id=928726
enable dnf-makecache.timer
-# https://bugzilla.redhat.com/show_bug.cgi?id=929403
-enable initial-setup-graphical.service
-enable initial-setup-text.service
-
# https://bugzilla.redhat.com/show_bug.cgi?id=957135
enable vmtoolsd.service
@@ -76,6 +107,7 @@ enable dnssec-triggerd.service
enable uuidd.socket
# Hardware
+# Locally-running service
enable gpm.*
# https://bugzilla.redhat.com/show_bug.cgi?id=1066421
@@ -93,21 +125,24 @@ enable lvm2-lvmpolld.*
# https://fedoraproject.org/wiki/Changes/UEFISecureBootBlacklistUpdates
enable dbxtool.service
+# Locally-running services
enable irqbalance.service
enable lm_sensors.service
enable mcelog.*
-enable acpid.*
enable smartd.service
enable pcscd.socket
enable rngd.service
# Other stuff
+# Approved by FESCo - https://fedorahosted.org/fesco/ticket/937
+# Note: abrt-ccpp.service is excluded in favor of systemd-coredump.
enable abrtd.service
-enable abrt-ccpp.service
+enable abrt-journal-core.service
enable abrt-oops.service
enable abrt-xorg.service
enable abrt-vmcore.service
-enable lttng-sessiond.service
+
+# Locally-running services
enable ksm.service
enable ksmtuned.service
enable rootfs-resize.service
@@ -120,12 +155,69 @@ enable xenstored.service
enable xenconsoled.service
# Desktop stuff
+# Locally-running services
enable accounts-daemon.service
enable rtkit-daemon.service
enable upower.service
enable udisks2.service
enable polkit.service
-enable packagekit-offline-update.service
# https://bugzilla.redhat.com/show_bug.cgi?id=1187072
enable timedatex.service
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1231745
+enable mlocate-updatedb.timer
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1218999
+enable sa-update.timer
+
+# Hyper-V guest support daemons
+# https://bugzilla.redhat.com/show_bug.cgi?id=1279322
+enable vmtoolsd.service
+
+# mcelog is a utility that collects and decodes Machine Check Exception data
+# on x86-32 and x86-64 systems.
+# https://bugzilla.redhat.com/show_bug.cgi?id=1302179
+enable mcelog.service
+
+# OPAL-prd is a utility specific to ppc64le systems
+# It is the "OPAL Processor Recovery Diagnostics Daemon"
+# https://bugzilla.redhat.com/show_bug.cgi?id=1312018
+enable opal-prd.service
+
+# virtlog.service is sometimes used by VMs started by libvirt.service
+# Enable virtlog.socket to have it socket activated
+# https://bugzilla.redhat.com/show_bug.cgi?id=1290357
+enable virtlogd.socket
+
+# lircd is the Linux Infrared Control daemon
+# Starting with version 0.9.4, it requires no manual configuration
+# https://bugzilla.redhat.com/show_bug.cgi?id=1340061
+enable lircd.socket
+
+# IPSec management
+# https://bugzilla.redhat.com/show_bug.cgi?id=1276285
+enable pluto.socket
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1367932
+# Automatically refresh installed snaps
+enable snapd.refresh.timer
+# Socket activated daemon to manage snaps
+enable snapd.socket
+
+# Support for dual-GPU systems
+# https://bugzilla.redhat.com/show_bug.cgi?id=1389762
+enable switcheroo-control.service
+
+# Support for the DRBD link-cleaning service
+# https://bugzilla.redhat.com/show_bug.cgi?id=1399387
+enable drbdlinksclean.service
+
+# Enable the System Security Services Daemon
+enable sssd.service
+
+# Enable ostree-remount on ostree-based systems
+# (Does nothing on non-ostree systems)
+# https://bugzilla.redhat.com/show_bug.cgi?id=1451458
+enable ostree-remount.service
+
diff --git a/generic-release.spec b/generic-release.spec
index 483922d..f3e8aa0 100644
--- a/generic-release.spec
+++ b/generic-release.spec
@@ -4,7 +4,7 @@
Summary: Generic release files
Name: generic-release
Version: 26
-Release: 0.1
+Release: 1
License: MIT
Group: System Environment/Base
Source0: LICENSE
@@ -119,6 +119,10 @@ rm -rf %{buildroot}
%doc README.Generic-Release-Notes
%changelog
+* Fri Jun 30 2017 Mohan Boddu <mboddu(a)redhat.com> - 26-1
+- Setup for F26 final
+- Sync presets from fedora-release
+
* Thu Aug 04 2016 Bruno Wolff III <bruno(a)wolff.to> - 26-0.1
- Rawhide is now 26
--
cgit v1.1
https://src.fedoraproject.org/cgit/generic-release.git/commit/?h=f26&id=f...
5Â years, 7Â months
mohanboddu pushed to fedora-repos (f26). "Fix Fedora 14 secondary key
(..more)"
by notificationsï¼ fedoraproject.org
From 0a4799f1dffbce59083e2d28bcb10fa116299939 Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu(a)redhat.com>
Date: Fri, 30 Jun 2017 16:27:22 -0400
Subject: Fix Fedora 14 secondary key Setup for F26 Final Disable
updates-testing Set metadata expiry for fedora repo
Signed-off-by: Mohan Boddu <mboddu(a)redhat.com>
---
fedora-repos.spec | 8 +++++++-
sources | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/fedora-repos.spec b/fedora-repos.spec
index 7fa4e65..4a6a46b 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,7 +1,7 @@
Summary: Fedora package repositories
Name: fedora-repos
Version: 26
-Release: 0.9
+Release: 1
License: MIT
Group: System Environment/Base
URL: https://pagure.io/fedora-repos/
@@ -72,6 +72,12 @@ done
%config(noreplace) /etc/yum.repos.d/fedora-rawhide.repo
%changelog
+* Fri Jun 30 2017 Mohan Boddu <mboddu(a)redhat.com> - 26-1
+- Fix Fedora 14 secondary key
+- Setup for F26 Final
+- Disable updates-testing
+- Set metadata expiry for fedora repo
+
* Tue May 16 2017 Dennis Gilmore <dennis(a)ausil.us> - 26-0.9
- add the missing Fedora 14 secondary arch key
- add the new modularity key
diff --git a/sources b/sources
index 1be64f7..a00bac6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fedora-repos-26.tar.bz2) = c3e2a0de724021c93e71c18f392a45951eb7a7ae249cdeb7e36f10402082a0b2203809e771361accca54735ea325d07c5c95edafcfd914bc3a3c3643e0a1e9f9
+SHA512 (fedora-repos-26.tar.bz2) = c05bdf6441166d44b5dc741ae6e2b7aaa2378fbb6dd2e4ee8d2154d0cff6812f92f5c428b4a361ef250a95d3fb27ce359f2962d7e0a726629d3565891e605a6a
--
cgit v1.1
https://src.fedoraproject.org/cgit/fedora-repos.git/commit/?h=f26&id=0a47...
5Â years, 7Â months
mohanboddu pushed to fedora-release (f26). "Setup for F26 Final
(..more)"
by notificationsï¼ fedoraproject.org
From 1d31f005c2f52deeddbbf8a2a2f9bc41afde6ee4 Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu(a)redhat.com>
Date: Fri, 30 Jun 2017 16:24:26 -0400
Subject: Setup for F26 Final Enable NetworkManager-wait-online.service to
match NetworkManager.service
Signed-off-by: Mohan Boddu <mboddu(a)redhat.com>
---
fedora-release.spec | 8 ++++++--
sources | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/fedora-release.spec b/fedora-release.spec
index 25c2a36..4ae3e67 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -9,7 +9,7 @@
Summary: Fedora release files
Name: fedora-release
Version: 26
-Release: 0.7
+Release: 1
License: MIT
Group: System Environment/Base
URL: https://pagure.io/fedora-release
@@ -27,7 +27,7 @@ Provides: fedora-release-standard = 22-0.8
Obsoletes: fedora-release-standard < 22-0.8
-Requires: fedora-repos(%{version})
+Requires: fedora-repos(%{version}) >= 1
BuildArch: noarch
%description
@@ -344,6 +344,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
/usr/sbin/convert-to-edition
%changelog
+* Fri Jun 30 2017 Mohan Boddu <mboddu(a)redhat.com> - 26-0.8
+- Setup for F26 Final
+- Enable NetworkManager-wait-online.service to match NetworkManager.service
+
* Wed May 17 2017 Mohan Boddu <mboddu(a)redhat.com> - 26-0.7
- Enable cups on-demand socket activation
- Enable ostree-remount on ostree-based systems
diff --git a/sources b/sources
index f14a305..28d5a58 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fedora-release-26.tar.bz2) = 07b44f441032fb81621630a64e2c30dbc93da1e2508d15bb7f79e0ccbd57480d577c879c1746b801506c04f14dada813db5fafd91a9c9371eabafdfe5d5c4efe
+SHA512 (fedora-release-26.tar.bz2) = ece2a1a87bf90166c051978144b7e2ac8b13a548663cce593f7734dc2b7fbef89f46fd6d3b135f40b61c508da44e0274a30c24324850a6774c7ace42f8781cfa
--
cgit v1.1
https://src.fedoraproject.org/cgit/fedora-release.git/commit/?h=f26&id=1d...
5Â years, 7Â months
zdohnal pushed to cups (master). "rebase to 2.2.4"
by notificationsï¼ fedoraproject.org
From 7dc7717327954839d7f7aebfbec0a99c42a35796 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal(a)redhat.com>
Date: Fri, 30 Jun 2017 22:21:46 +0200
Subject: rebase to 2.2.4
---
.gitignore | 2 +
cups-0755.patch | 14 ++---
cups-2.2.2-source.tar.gz.sig | Bin 543 -> 0 bytes
cups-2.2.4-source.tar.gz.sig | Bin 0 -> 543 bytes
cups-avahi-no-threaded.patch | 60 +++++++++----------
cups-enum-all.patch | 17 ------
cups-lspp.patch | 138 +++++++++++++++++++++----------------------
cups-no-gzip-man.patch | 10 ++--
cups.spec | 14 ++---
sources | 2 +-
10 files changed, 121 insertions(+), 136 deletions(-)
delete mode 100644 cups-2.2.2-source.tar.gz.sig
create mode 100644 cups-2.2.4-source.tar.gz.sig
delete mode 100644 cups-enum-all.patch
diff --git a/.gitignore b/.gitignore
index b57bd7e..e660847 100644
--- a/.gitignore
+++ b/.gitignore
@@ -81,3 +81,5 @@ cups-1.4.4-source.tar.bz2
/cups-2.2.1-source.tar.gz
/cups-2.2.2-source.tar.gz
/cups-2.2.3-source.tar.gz
+/.metadata/
+/cups-2.2.4-source.tar.gz
diff --git a/cups-0755.patch b/cups-0755.patch
index b0df3a0..0c3b18b 100644
--- a/cups-0755.patch
+++ b/cups-0755.patch
@@ -1,20 +1,20 @@
-diff -up cups-1.6b1/Makedefs.in.0755 cups-1.6b1/Makedefs.in
---- cups-1.6b1/Makedefs.in.0755 2012-05-23 01:58:31.000000000 +0200
-+++ cups-1.6b1/Makedefs.in 2012-05-25 16:09:40.545463214 +0200
-@@ -40,14 +40,14 @@ SHELL = /bin/sh
+diff -up cups-2.2.4/Makedefs.in.0755 cups-2.2.4/Makedefs.in
+--- cups-2.2.4/Makedefs.in.0755 2017-06-30 20:39:59.411493947 +0200
++++ cups-2.2.4/Makedefs.in 2017-06-30 20:43:29.553609350 +0200
+@@ -38,14 +38,14 @@ SHELL = /bin/sh
# Installation programs...
#
--INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
+-INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
+INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
INSTALL_COMPDATA = $(INSTALL) -c -m 444 @INSTALL_GZIP@
INSTALL_CONFIG = $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
INSTALL_DATA = $(INSTALL) -c -m 444
INSTALL_DIR = $(INSTALL) -d
--INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
+-INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
+INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
INSTALL_MAN = $(INSTALL) -c -m 444
--INSTALL_SCRIPT = $(INSTALL) -c -m 555
+-INSTALL_SCRIPT = $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
+INSTALL_SCRIPT = $(INSTALL) -c -m 755
#
diff --git a/cups-2.2.2-source.tar.gz.sig b/cups-2.2.2-source.tar.gz.sig
deleted file mode 100644
index 4ea98b9..0000000
Binary files a/cups-2.2.2-source.tar.gz.sig and /dev/null differ
diff --git a/cups-2.2.4-source.tar.gz.sig b/cups-2.2.4-source.tar.gz.sig
new file mode 100644
index 0000000..ff0ee05
Binary files /dev/null and b/cups-2.2.4-source.tar.gz.sig differ
diff --git a/cups-avahi-no-threaded.patch b/cups-avahi-no-threaded.patch
index f81c71f..e36e7b4 100644
--- a/cups-avahi-no-threaded.patch
+++ b/cups-avahi-no-threaded.patch
@@ -1,6 +1,6 @@
-diff -up cups-2.2b2/scheduler/avahi.c.avahi-no-threaded cups-2.2b2/scheduler/avahi.c
---- cups-2.2b2/scheduler/avahi.c.avahi-no-threaded 2016-06-27 17:55:19.568728958 +0200
-+++ cups-2.2b2/scheduler/avahi.c 2016-06-27 17:55:19.568728958 +0200
+diff -up cups-2.2.4/scheduler/avahi.c.avahi-no-threaded cups-2.2.4/scheduler/avahi.c
+--- cups-2.2.4/scheduler/avahi.c.avahi-no-threaded 2017-06-30 21:04:37.013278512 +0200
++++ cups-2.2.4/scheduler/avahi.c 2017-06-30 21:04:37.013278512 +0200
@@ -0,0 +1,441 @@
+/*
+ * "$Id$"
@@ -443,9 +443,9 @@ diff -up cups-2.2b2/scheduler/avahi.c.avahi-no-threaded cups-2.2b2/scheduler/ava
+/*
+ * End of "$Id$".
+ */
-diff -up cups-2.2b2/scheduler/avahi.h.avahi-no-threaded cups-2.2b2/scheduler/avahi.h
---- cups-2.2b2/scheduler/avahi.h.avahi-no-threaded 2016-06-27 17:55:19.568728958 +0200
-+++ cups-2.2b2/scheduler/avahi.h 2016-06-27 17:55:19.568728958 +0200
+diff -up cups-2.2.4/scheduler/avahi.h.avahi-no-threaded cups-2.2.4/scheduler/avahi.h
+--- cups-2.2.4/scheduler/avahi.h.avahi-no-threaded 2017-06-30 21:04:37.013278512 +0200
++++ cups-2.2.4/scheduler/avahi.h 2017-06-30 21:04:37.013278512 +0200
@@ -0,0 +1,69 @@
+/*
+ * "$Id$"
@@ -516,9 +516,9 @@ diff -up cups-2.2b2/scheduler/avahi.h.avahi-no-threaded cups-2.2b2/scheduler/ava
+/*
+ * End of "$Id$".
+ */
-diff -up cups-2.2b2/scheduler/cupsd.h.avahi-no-threaded cups-2.2b2/scheduler/cupsd.h
---- cups-2.2b2/scheduler/cupsd.h.avahi-no-threaded 2016-06-24 17:43:35.000000000 +0200
-+++ cups-2.2b2/scheduler/cupsd.h 2016-06-27 17:57:45.476572827 +0200
+diff -up cups-2.2.4/scheduler/cupsd.h.avahi-no-threaded cups-2.2.4/scheduler/cupsd.h
+--- cups-2.2.4/scheduler/cupsd.h.avahi-no-threaded 2017-06-30 17:44:38.000000000 +0200
++++ cups-2.2.4/scheduler/cupsd.h 2017-06-30 21:04:37.013278512 +0200
@@ -118,6 +118,7 @@ extern const char *cups_hstrerror(int);
#include "colorman.h"
#include "conf.h"
@@ -570,9 +570,9 @@ diff -up cups-2.2b2/scheduler/cupsd.h.avahi-no-threaded cups-2.2b2/scheduler/cup
+extern void cupsdRemoveTimeout (cupsd_timeout_t *timeout);
+#endif /* HAVE_AVAHI */
\ No newline at end of file
-diff -up cups-2.2b2/scheduler/dirsvc.c.avahi-no-threaded cups-2.2b2/scheduler/dirsvc.c
---- cups-2.2b2/scheduler/dirsvc.c.avahi-no-threaded 2016-06-24 17:43:35.000000000 +0200
-+++ cups-2.2b2/scheduler/dirsvc.c 2016-06-27 17:55:19.569728950 +0200
+diff -up cups-2.2.4/scheduler/dirsvc.c.avahi-no-threaded cups-2.2.4/scheduler/dirsvc.c
+--- cups-2.2.4/scheduler/dirsvc.c.avahi-no-threaded 2017-06-30 17:44:38.000000000 +0200
++++ cups-2.2.4/scheduler/dirsvc.c 2017-06-30 21:04:37.051278174 +0200
@@ -193,7 +193,7 @@ cupsdStartBrowsing(void)
cupsdUpdateDNSSDName();
@@ -673,9 +673,9 @@ diff -up cups-2.2b2/scheduler/dirsvc.c.avahi-no-threaded cups-2.2b2/scheduler/di
DNSSDMaster = NULL;
}
# endif /* HAVE_DNSSD */
-diff -up cups-2.2b2/scheduler/dirsvc.h.avahi-no-threaded cups-2.2b2/scheduler/dirsvc.h
---- cups-2.2b2/scheduler/dirsvc.h.avahi-no-threaded 2016-06-24 17:43:35.000000000 +0200
-+++ cups-2.2b2/scheduler/dirsvc.h 2016-06-27 17:55:19.569728950 +0200
+diff -up cups-2.2.4/scheduler/dirsvc.h.avahi-no-threaded cups-2.2.4/scheduler/dirsvc.h
+--- cups-2.2.4/scheduler/dirsvc.h.avahi-no-threaded 2017-06-30 17:44:38.000000000 +0200
++++ cups-2.2.4/scheduler/dirsvc.h 2017-06-30 21:04:37.051278174 +0200
@@ -49,7 +49,7 @@ VAR cups_array_t *DNSSDPrinters VALUE(NU
VAR DNSServiceRef DNSSDMaster VALUE(NULL);
/* Master DNS-SD service reference */
@@ -685,10 +685,10 @@ diff -up cups-2.2b2/scheduler/dirsvc.h.avahi-no-threaded cups-2.2b2/scheduler/di
/* Master polling interface for Avahi */
VAR AvahiClient *DNSSDClient VALUE(NULL);
/* Client information */
-diff -up cups-2.2b2/scheduler/main.c.avahi-no-threaded cups-2.2b2/scheduler/main.c
---- cups-2.2b2/scheduler/main.c.avahi-no-threaded 2016-06-27 17:55:19.555729061 +0200
-+++ cups-2.2b2/scheduler/main.c 2016-06-27 17:58:44.350106330 +0200
-@@ -131,7 +131,10 @@ main(int argc, /* I - Number of comm
+diff -up cups-2.2.4/scheduler/main.c.avahi-no-threaded cups-2.2.4/scheduler/main.c
+--- cups-2.2.4/scheduler/main.c.avahi-no-threaded 2017-06-30 21:04:37.002278610 +0200
++++ cups-2.2.4/scheduler/main.c 2017-06-30 21:05:55.015584932 +0200
+@@ -133,7 +133,10 @@ main(int argc, /* I - Number of comm
int service_idle_exit;
/* Idle exit on select timeout? */
#endif /* HAVE_ONDEMAND */
@@ -700,7 +700,7 @@ diff -up cups-2.2b2/scheduler/main.c.avahi-no-threaded cups-2.2b2/scheduler/main
#ifdef HAVE_GETEUID
/*
-@@ -609,6 +612,14 @@ main(int argc, /* I - Number of comm
+@@ -611,6 +614,14 @@ main(int argc, /* I - Number of comm
httpInitialize();
@@ -715,7 +715,7 @@ diff -up cups-2.2b2/scheduler/main.c.avahi-no-threaded cups-2.2b2/scheduler/main
cupsdStartServer();
/*
-@@ -930,6 +941,16 @@ main(int argc, /* I - Number of comm
+@@ -926,6 +937,16 @@ main(int argc, /* I - Number of comm
}
#endif /* __APPLE__ */
@@ -732,9 +732,9 @@ diff -up cups-2.2b2/scheduler/main.c.avahi-no-threaded cups-2.2b2/scheduler/main
#ifndef __APPLE__
/*
* Update the network interfaces once a minute...
-@@ -1620,6 +1641,10 @@ select_timeout(int fds) /* I - Number
- cupsd_client_t *con; /* Client information */
+@@ -1630,6 +1651,10 @@ select_timeout(int fds) /* I - Number
cupsd_job_t *job; /* Job information */
+ cupsd_printer_t *printer; /* Printer information */
const char *why; /* Debugging aid */
+#ifdef HAVE_AVAHI
+ cupsd_timeout_t *tmo; /* Timed callback */
@@ -743,7 +743,7 @@ diff -up cups-2.2b2/scheduler/main.c.avahi-no-threaded cups-2.2b2/scheduler/main
cupsdLogMessage(CUPSD_LOG_DEBUG2, "select_timeout: JobHistoryUpdate=%ld",
-@@ -1665,6 +1690,19 @@ select_timeout(int fds) /* I - Number
+@@ -1675,6 +1700,19 @@ select_timeout(int fds) /* I - Number
}
#endif /* __APPLE__ */
@@ -763,9 +763,9 @@ diff -up cups-2.2b2/scheduler/main.c.avahi-no-threaded cups-2.2b2/scheduler/main
/*
* Check whether we are accepting new connections...
*/
-diff -up cups-2.2b2/scheduler/Makefile.avahi-no-threaded cups-2.2b2/scheduler/Makefile
---- cups-2.2b2/scheduler/Makefile.avahi-no-threaded 2016-06-24 17:43:35.000000000 +0200
-+++ cups-2.2b2/scheduler/Makefile 2016-06-27 17:55:19.569728950 +0200
+diff -up cups-2.2.4/scheduler/Makefile.avahi-no-threaded cups-2.2.4/scheduler/Makefile
+--- cups-2.2.4/scheduler/Makefile.avahi-no-threaded 2017-06-30 17:44:38.000000000 +0200
++++ cups-2.2.4/scheduler/Makefile 2017-06-30 21:04:37.053278156 +0200
@@ -15,6 +15,7 @@ include ../Makedefs
CUPSDOBJS = \
@@ -784,9 +784,9 @@ diff -up cups-2.2b2/scheduler/Makefile.avahi-no-threaded cups-2.2b2/scheduler/Ma
LIBOBJS = \
filter.o \
mime.o \
-diff -up cups-2.2b2/scheduler/timeout.c.avahi-no-threaded cups-2.2b2/scheduler/timeout.c
---- cups-2.2b2/scheduler/timeout.c.avahi-no-threaded 2016-06-27 17:55:19.569728950 +0200
-+++ cups-2.2b2/scheduler/timeout.c 2016-06-27 17:55:19.569728950 +0200
+diff -up cups-2.2.4/scheduler/timeout.c.avahi-no-threaded cups-2.2.4/scheduler/timeout.c
+--- cups-2.2.4/scheduler/timeout.c.avahi-no-threaded 2017-06-30 21:04:37.053278156 +0200
++++ cups-2.2.4/scheduler/timeout.c 2017-06-30 21:04:37.053278156 +0200
@@ -0,0 +1,235 @@
+/*
+ * "$Id$"
diff --git a/cups-enum-all.patch b/cups-enum-all.patch
deleted file mode 100644
index 0ac3983..0000000
--- a/cups-enum-all.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up cups-1.6.2/cups/dest.c.enum-all cups-1.6.2/cups/dest.c
---- cups-1.6.2/cups/dest.c.enum-all 2013-06-04 10:58:36.169786250 +0100
-+++ cups-1.6.2/cups/dest.c 2013-06-04 10:59:02.147900811 +0100
-@@ -2724,9 +2724,12 @@ cups_dnssd_browse_cb(
- break;
-
- case AVAHI_BROWSER_REMOVE:
-- case AVAHI_BROWSER_ALL_FOR_NOW:
- case AVAHI_BROWSER_CACHE_EXHAUSTED:
- break;
-+
-+ case AVAHI_BROWSER_ALL_FOR_NOW:
-+ avahi_simple_poll_quit(data->simple_poll);
-+ break;
- }
- }
-
diff --git a/cups-lspp.patch b/cups-lspp.patch
index 8128732..904b3cb 100644
--- a/cups-lspp.patch
+++ b/cups-lspp.patch
@@ -1,6 +1,6 @@
-diff -up cups-2.2.2/config.h.in.lspp cups-2.2.2/config.h.in
---- cups-2.2.2/config.h.in.lspp 2017-01-17 20:27:22.000000000 +0100
-+++ cups-2.2.2/config.h.in 2017-01-19 11:34:39.235988617 +0100
+diff -up cups-2.2.4/config.h.in.lspp cups-2.2.4/config.h.in
+--- cups-2.2.4/config.h.in.lspp 2017-06-30 17:44:38.000000000 +0200
++++ cups-2.2.4/config.h.in 2017-06-30 21:06:35.855221795 +0200
@@ -730,4 +730,11 @@ static __inline int _cups_abs(int i) { r
# endif /* __GNUC__ || __STDC_VERSION__ */
#endif /* !HAVE_ABS && !abs */
@@ -13,9 +13,9 @@ diff -up cups-2.2.2/config.h.in.lspp cups-2.2.2/config.h.in
+
+
#endif /* !_CUPS_CONFIG_H_ */
-diff -up cups-2.2.2/config-scripts/cups-lspp.m4.lspp cups-2.2.2/config-scripts/cups-lspp.m4
---- cups-2.2.2/config-scripts/cups-lspp.m4.lspp 2017-01-19 11:34:39.235988617 +0100
-+++ cups-2.2.2/config-scripts/cups-lspp.m4 2017-01-19 11:34:39.235988617 +0100
+diff -up cups-2.2.4/config-scripts/cups-lspp.m4.lspp cups-2.2.4/config-scripts/cups-lspp.m4
+--- cups-2.2.4/config-scripts/cups-lspp.m4.lspp 2017-06-30 21:06:35.856221786 +0200
++++ cups-2.2.4/config-scripts/cups-lspp.m4 2017-06-30 21:06:35.856221786 +0200
@@ -0,0 +1,36 @@
+dnl
+dnl LSPP code for the Common UNIX Printing System (CUPS).
@@ -53,9 +53,9 @@ diff -up cups-2.2.2/config-scripts/cups-lspp.m4.lspp cups-2.2.2/config-scripts/c
+ ;;
+ esac
+fi
-diff -up cups-2.2.2/configure.ac.lspp cups-2.2.2/configure.ac
---- cups-2.2.2/configure.ac.lspp 2017-01-17 20:27:22.000000000 +0100
-+++ cups-2.2.2/configure.ac 2017-01-19 11:34:39.235988617 +0100
+diff -up cups-2.2.4/configure.ac.lspp cups-2.2.4/configure.ac
+--- cups-2.2.4/configure.ac.lspp 2017-06-30 17:44:38.000000000 +0200
++++ cups-2.2.4/configure.ac 2017-06-30 21:06:35.856221786 +0200
@@ -38,6 +38,8 @@ sinclude(config-scripts/cups-startup.m4)
sinclude(config-scripts/cups-defaults.m4)
sinclude(config-scripts/cups-scripting.m4)
@@ -65,9 +65,9 @@ diff -up cups-2.2.2/configure.ac.lspp cups-2.2.2/configure.ac
INSTALL_LANGUAGES=""
UNINSTALL_LANGUAGES=""
LANGFILES=""
-diff -up cups-2.2.2/filter/common.c.lspp cups-2.2.2/filter/common.c
---- cups-2.2.2/filter/common.c.lspp 2017-01-17 20:27:22.000000000 +0100
-+++ cups-2.2.2/filter/common.c 2017-01-19 11:34:39.235988617 +0100
+diff -up cups-2.2.4/filter/common.c.lspp cups-2.2.4/filter/common.c
+--- cups-2.2.4/filter/common.c.lspp 2017-06-30 17:44:38.000000000 +0200
++++ cups-2.2.4/filter/common.c 2017-06-30 21:06:35.857221777 +0200
@@ -17,6 +17,12 @@
* Include necessary headers...
*/
@@ -236,9 +236,9 @@ diff -up cups-2.2.2/filter/common.c.lspp cups-2.2.2/filter/common.c
/*
-diff -up cups-2.2.2/filter/pstops.c.lspp cups-2.2.2/filter/pstops.c
---- cups-2.2.2/filter/pstops.c.lspp 2017-01-17 20:27:22.000000000 +0100
-+++ cups-2.2.2/filter/pstops.c 2017-01-19 11:34:39.236988608 +0100
+diff -up cups-2.2.4/filter/pstops.c.lspp cups-2.2.4/filter/pstops.c
+--- cups-2.2.4/filter/pstops.c.lspp 2017-06-30 17:44:38.000000000 +0200
++++ cups-2.2.4/filter/pstops.c 2017-06-30 21:06:35.857221777 +0200
@@ -3176,6 +3176,18 @@ write_label_prolog(pstops_doc_t *doc, /*
{
const char *classification; /* CLASSIFICATION environment variable */
@@ -394,21 +394,21 @@ diff -up cups-2.2.2/filter/pstops.c.lspp cups-2.2.2/filter/pstops.c
/*
-diff -up cups-2.2.2/Makedefs.in.lspp cups-2.2.2/Makedefs.in
---- cups-2.2.2/Makedefs.in.lspp 2017-01-19 11:34:39.206988873 +0100
-+++ cups-2.2.2/Makedefs.in 2017-01-19 11:34:39.236988608 +0100
-@@ -143,7 +143,7 @@ LDFLAGS = -L../cgi-bin -L../cups -L../f
+diff -up cups-2.2.4/Makedefs.in.lspp cups-2.2.4/Makedefs.in
+--- cups-2.2.4/Makedefs.in.lspp 2017-06-30 21:06:35.858221768 +0200
++++ cups-2.2.4/Makedefs.in 2017-06-30 21:08:33.477175926 +0200
+@@ -151,7 +151,7 @@ LDFLAGS = -L../cgi-bin -L../cups -L../f
@LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
- LINKCUPS = @LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(LIBZ)
+ LINKCUPS = @LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(SSLLIBS) $(LIBZ)
LINKCUPSIMAGE = @LINKCUPSIMAGE@
-LIBS = $(LINKCUPS) $(COMMONLIBS)
+LIBS = $(LINKCUPS) $(COMMONLIBS) @LIBAUDIT@ @LIBSELINUX@
ONDEMANDFLAGS = @ONDEMANDFLAGS@
ONDEMANDLIBS = @ONDEMANDLIBS@
OPTIM = @OPTIM@
-diff -up cups-2.2.2/scheduler/client.c.lspp cups-2.2.2/scheduler/client.c
---- cups-2.2.2/scheduler/client.c.lspp 2017-01-17 20:27:22.000000000 +0100
-+++ cups-2.2.2/scheduler/client.c 2017-01-19 11:34:39.281988212 +0100
+diff -up cups-2.2.4/scheduler/client.c.lspp cups-2.2.4/scheduler/client.c
+--- cups-2.2.4/scheduler/client.c.lspp 2017-06-30 17:44:38.000000000 +0200
++++ cups-2.2.4/scheduler/client.c 2017-06-30 21:06:35.900221395 +0200
@@ -22,12 +22,20 @@
#define _HTTP_NO_PRIVATE
#include "cupsd.h"
@@ -578,7 +578,7 @@ diff -up cups-2.2.2/scheduler/client.c.lspp cups-2.2.2/scheduler/client.c
if (httpGetState(con->http) != HTTP_STATE_POST_SEND)
{
if (!httpWait(con->http, 0))
-@@ -3456,6 +3591,49 @@ is_path_absolute(const char *path) /* I
+@@ -3454,6 +3589,49 @@ is_path_absolute(const char *path) /* I
return (1);
}
@@ -628,9 +628,9 @@ diff -up cups-2.2.2/scheduler/client.c.lspp cups-2.2.2/scheduler/client.c
/*
* 'pipe_command()' - Pipe the output of a command to the remote client.
-diff -up cups-2.2.2/scheduler/client.h.lspp cups-2.2.2/scheduler/client.h
---- cups-2.2.2/scheduler/client.h.lspp 2017-01-17 20:27:22.000000000 +0100
-+++ cups-2.2.2/scheduler/client.h 2017-01-19 11:34:39.281988212 +0100
+diff -up cups-2.2.4/scheduler/client.h.lspp cups-2.2.4/scheduler/client.h
+--- cups-2.2.4/scheduler/client.h.lspp 2017-06-30 17:44:38.000000000 +0200
++++ cups-2.2.4/scheduler/client.h 2017-06-30 21:06:35.900221395 +0200
@@ -16,6 +16,13 @@
#endif /* HAVE_AUTHORIZATION_H */
@@ -666,9 +666,9 @@ diff -up cups-2.2.2/scheduler/client.h.lspp cups-2.2.2/scheduler/client.h
#ifdef HAVE_SSL
extern int cupsdEndTLS(cupsd_client_t *con);
-diff -up cups-2.2.2/scheduler/conf.c.lspp cups-2.2.2/scheduler/conf.c
---- cups-2.2.2/scheduler/conf.c.lspp 2017-01-19 11:34:39.232988644 +0100
-+++ cups-2.2.2/scheduler/conf.c 2017-01-19 11:34:39.282988203 +0100
+diff -up cups-2.2.4/scheduler/conf.c.lspp cups-2.2.4/scheduler/conf.c
+--- cups-2.2.4/scheduler/conf.c.lspp 2017-06-30 21:06:35.853221813 +0200
++++ cups-2.2.4/scheduler/conf.c 2017-06-30 21:06:35.901221386 +0200
@@ -40,6 +40,9 @@
# define INADDR_NONE 0xffffffff
#endif /* !INADDR_NONE */
@@ -726,7 +726,7 @@ diff -up cups-2.2.2/scheduler/conf.c.lspp cups-2.2.2/scheduler/conf.c
cupsdLogMessage(CUPSD_LOG_INFO, "Remote access is %s.",
RemotePort ? "enabled" : "disabled");
-@@ -1276,7 +1305,19 @@ cupsdReadConfiguration(void)
+@@ -1285,7 +1314,19 @@ cupsdReadConfiguration(void)
cupsdClearString(&Classification);
if (Classification)
@@ -746,7 +746,7 @@ diff -up cups-2.2.2/scheduler/conf.c.lspp cups-2.2.2/scheduler/conf.c
/*
* Check the MaxClients setting, and then allocate memory for it...
-@@ -3753,6 +3794,18 @@ read_location(cups_file_t *fp, /* I - C
+@@ -3764,6 +3805,18 @@ read_location(cups_file_t *fp, /* I - C
return ((FatalErrors & CUPSD_FATAL_CONFIG) ? 0 : linenum);
}
@@ -765,9 +765,9 @@ diff -up cups-2.2.2/scheduler/conf.c.lspp cups-2.2.2/scheduler/conf.c
/*
* 'read_policy()' - Read a <Policy name> definition.
-diff -up cups-2.2.2/scheduler/conf.h.lspp cups-2.2.2/scheduler/conf.h
---- cups-2.2.2/scheduler/conf.h.lspp 2017-01-19 11:34:39.175989146 +0100
-+++ cups-2.2.2/scheduler/conf.h 2017-01-19 11:34:39.283988194 +0100
+diff -up cups-2.2.4/scheduler/conf.h.lspp cups-2.2.4/scheduler/conf.h
+--- cups-2.2.4/scheduler/conf.h.lspp 2017-06-30 21:06:35.796222319 +0200
++++ cups-2.2.4/scheduler/conf.h 2017-06-30 21:06:35.901221386 +0200
@@ -250,6 +250,13 @@ VAR char *ServerKeychain VALUE(NULL);
/* Keychain holding cert + key */
#endif /* HAVE_SSL */
@@ -792,9 +792,9 @@ diff -up cups-2.2.2/scheduler/conf.h.lspp cups-2.2.2/scheduler/conf.h
/*
* Prototypes...
-diff -up cups-2.2.2/scheduler/cupsd.h.lspp cups-2.2.2/scheduler/cupsd.h
---- cups-2.2.2/scheduler/cupsd.h.lspp 2017-01-19 11:34:39.224988714 +0100
-+++ cups-2.2.2/scheduler/cupsd.h 2017-01-19 11:34:39.283988194 +0100
+diff -up cups-2.2.4/scheduler/cupsd.h.lspp cups-2.2.4/scheduler/cupsd.h
+--- cups-2.2.4/scheduler/cupsd.h.lspp 2017-06-30 21:06:35.841221919 +0200
++++ cups-2.2.4/scheduler/cupsd.h 2017-06-30 21:06:35.901221386 +0200
@@ -11,6 +11,8 @@
* file is missing or damaged, see the license at "http://www.cups.org/".
*/
@@ -826,9 +826,9 @@ diff -up cups-2.2.2/scheduler/cupsd.h.lspp cups-2.2.2/scheduler/cupsd.h
/*
* Some OS's don't have hstrerror(), most notably Solaris...
*/
-diff -up cups-2.2.2/scheduler/ipp.c.lspp cups-2.2.2/scheduler/ipp.c
---- cups-2.2.2/scheduler/ipp.c.lspp 2017-01-19 11:34:39.190989014 +0100
-+++ cups-2.2.2/scheduler/ipp.c 2017-01-19 11:49:37.704922404 +0100
+diff -up cups-2.2.4/scheduler/ipp.c.lspp cups-2.2.4/scheduler/ipp.c
+--- cups-2.2.4/scheduler/ipp.c.lspp 2017-06-30 21:06:35.815222151 +0200
++++ cups-2.2.4/scheduler/ipp.c 2017-06-30 21:06:35.902221377 +0200
@@ -14,6 +14,9 @@
* missing or damaged, see the license at "http://www.cups.org/".
*/
@@ -1395,7 +1395,7 @@ diff -up cups-2.2.2/scheduler/ipp.c.lspp cups-2.2.2/scheduler/ipp.c
if (!strcmp(s, "printer-name"))
{
cupsFilePuts(out, job->dest);
-@@ -6429,6 +6888,22 @@ get_job_attrs(cupsd_client_t *con, /* I
+@@ -6432,6 +6891,22 @@ get_job_attrs(cupsd_client_t *con, /* I
exclude = cupsdGetPrivateAttrs(policy, con, printer, job->username);
@@ -1418,7 +1418,7 @@ diff -up cups-2.2.2/scheduler/ipp.c.lspp cups-2.2.2/scheduler/ipp.c
/*
* Copy attributes...
*/
-@@ -6826,6 +7301,11 @@ get_jobs(cupsd_client_t *con, /* I - C
+@@ -6829,6 +7304,11 @@ get_jobs(cupsd_client_t *con, /* I - C
if (username[0] && _cups_strcasecmp(username, job->username))
continue;
@@ -1430,7 +1430,7 @@ diff -up cups-2.2.2/scheduler/ipp.c.lspp cups-2.2.2/scheduler/ipp.c
if (count > 0)
ippAddSeparator(con->response);
-@@ -11457,6 +11937,11 @@ validate_user(cupsd_job_t *job, /* I
+@@ -11460,6 +11940,11 @@ validate_user(cupsd_job_t *job, /* I
strlcpy(username, get_username(con), userlen);
@@ -1442,9 +1442,9 @@ diff -up cups-2.2.2/scheduler/ipp.c.lspp cups-2.2.2/scheduler/ipp.c
/*
* Check the username against the owner...
*/
-diff -up cups-2.2.2/scheduler/job.c.lspp cups-2.2.2/scheduler/job.c
---- cups-2.2.2/scheduler/job.c.lspp 2017-01-19 11:34:39.202988908 +0100
-+++ cups-2.2.2/scheduler/job.c 2017-01-19 11:51:43.774763010 +0100
+diff -up cups-2.2.4/scheduler/job.c.lspp cups-2.2.4/scheduler/job.c
+--- cups-2.2.4/scheduler/job.c.lspp 2017-06-30 21:06:35.826222053 +0200
++++ cups-2.2.4/scheduler/job.c 2017-06-30 21:06:35.903221368 +0200
@@ -11,6 +11,9 @@
* missing or damaged, see the license at "http://www.cups.org/".
*/
@@ -1470,7 +1470,7 @@ diff -up cups-2.2.2/scheduler/job.c.lspp cups-2.2.2/scheduler/job.c
/*
* Design Notes for Job Management
-@@ -546,6 +557,14 @@ cupsdContinueJob(cupsd_job_t *job) /* I
+@@ -547,6 +558,14 @@ cupsdContinueJob(cupsd_job_t *job) /* I
/* PRINTER_STATE_REASONS env var */
rip_max_cache[255];
/* RIP_MAX_CACHE env variable */
@@ -1485,7 +1485,7 @@ diff -up cups-2.2.2/scheduler/job.c.lspp cups-2.2.2/scheduler/job.c
cupsdLogMessage(CUPSD_LOG_DEBUG2,
-@@ -1082,6 +1101,67 @@ cupsdContinueJob(cupsd_job_t *job) /* I
+@@ -1083,6 +1102,67 @@ cupsdContinueJob(cupsd_job_t *job) /* I
if (final_content_type[0])
envp[envc ++] = final_content_type;
@@ -1553,7 +1553,7 @@ diff -up cups-2.2.2/scheduler/job.c.lspp cups-2.2.2/scheduler/job.c
if (Classification && !banner_page)
{
if ((attr = ippFindAttribute(job->attrs, "job-sheets",
-@@ -1905,6 +1985,22 @@ cupsdLoadJob(cupsd_job_t *job) /* I - J
+@@ -1908,6 +1988,22 @@ cupsdLoadJob(cupsd_job_t *job) /* I - J
ippSetString(job->attrs, &job->reasons, 0, "none");
}
@@ -1576,7 +1576,7 @@ diff -up cups-2.2.2/scheduler/job.c.lspp cups-2.2.2/scheduler/job.c
job->impressions = ippFindAttribute(job->attrs, "job-impressions-completed", IPP_TAG_INTEGER);
job->sheets = ippFindAttribute(job->attrs, "job-media-sheets-completed", IPP_TAG_INTEGER);
job->job_sheets = ippFindAttribute(job->attrs, "job-sheets", IPP_TAG_NAME);
-@@ -2318,6 +2414,14 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J
+@@ -2321,6 +2417,14 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J
{
char filename[1024]; /* Job control filename */
cups_file_t *fp; /* Job file */
@@ -1591,7 +1591,7 @@ diff -up cups-2.2.2/scheduler/job.c.lspp cups-2.2.2/scheduler/job.c
cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdSaveJob(job=%p(%d)): job->attrs=%p",
-@@ -2340,6 +2444,78 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J
+@@ -2343,6 +2447,78 @@ cupsdSaveJob(cupsd_job_t *job) /* I - J
fchown(cupsFileNumber(fp), RunUser, Group);
@@ -1670,7 +1670,7 @@ diff -up cups-2.2.2/scheduler/job.c.lspp cups-2.2.2/scheduler/job.c
job->attrs->state = IPP_IDLE;
if (ippWriteIO(fp, (ipp_iocb_t)cupsFileWrite, 1, NULL,
-@@ -3926,6 +4102,19 @@ get_options(cupsd_job_t *job, /* I - Jo
+@@ -3931,6 +4107,19 @@ get_options(cupsd_job_t *job, /* I - Jo
banner_page)
continue;
@@ -1690,7 +1690,7 @@ diff -up cups-2.2.2/scheduler/job.c.lspp cups-2.2.2/scheduler/job.c
/*
* Otherwise add them to the list...
*/
-@@ -4687,6 +4876,18 @@ start_job(cupsd_job_t *job, /* I -
+@@ -4692,6 +4881,18 @@ start_job(cupsd_job_t *job, /* I -
cupsd_printer_t *printer) /* I - Printer to print job */
{
const char *filename; /* Support filename */
@@ -1709,7 +1709,7 @@ diff -up cups-2.2.2/scheduler/job.c.lspp cups-2.2.2/scheduler/job.c
ipp_attribute_t *cancel_after = ippFindAttribute(job->attrs,
"job-cancel-after",
IPP_TAG_INTEGER);
-@@ -4863,6 +5064,113 @@ start_job(cupsd_job_t *job, /* I -
+@@ -4868,6 +5069,113 @@ start_job(cupsd_job_t *job, /* I -
fcntl(job->side_pipes[1], F_SETFD,
fcntl(job->side_pipes[1], F_GETFD) | FD_CLOEXEC);
@@ -1823,9 +1823,9 @@ diff -up cups-2.2.2/scheduler/job.c.lspp cups-2.2.2/scheduler/job.c
/*
* Now start the first file in the job...
*/
-diff -up cups-2.2.2/scheduler/job.h.lspp cups-2.2.2/scheduler/job.h
---- cups-2.2.2/scheduler/job.h.lspp 2017-01-17 20:27:22.000000000 +0100
-+++ cups-2.2.2/scheduler/job.h 2017-01-19 11:52:53.997134426 +0100
+diff -up cups-2.2.4/scheduler/job.h.lspp cups-2.2.4/scheduler/job.h
+--- cups-2.2.4/scheduler/job.h.lspp 2017-06-30 17:44:38.000000000 +0200
++++ cups-2.2.4/scheduler/job.h 2017-06-30 21:06:35.903221368 +0200
@@ -11,6 +11,13 @@
* missing or damaged, see the license at "http://www.cups.org/".
*/
@@ -1851,9 +1851,9 @@ diff -up cups-2.2.2/scheduler/job.h.lspp cups-2.2.2/scheduler/job.h
};
typedef struct cupsd_joblog_s /**** Job log message ****/
-diff -up cups-2.2.2/scheduler/main.c.lspp cups-2.2.2/scheduler/main.c
---- cups-2.2.2/scheduler/main.c.lspp 2017-01-19 11:34:39.225988705 +0100
-+++ cups-2.2.2/scheduler/main.c 2017-01-19 11:34:39.286988168 +0100
+diff -up cups-2.2.4/scheduler/main.c.lspp cups-2.2.4/scheduler/main.c
+--- cups-2.2.4/scheduler/main.c.lspp 2017-06-30 21:06:35.854221804 +0200
++++ cups-2.2.4/scheduler/main.c 2017-06-30 21:06:35.904221359 +0200
@@ -56,6 +56,9 @@
# include <sys/param.h>
#endif /* HAVE_SYS_PARAM_H */
@@ -1864,7 +1864,7 @@ diff -up cups-2.2.2/scheduler/main.c.lspp cups-2.2.2/scheduler/main.c
/*
* Local functions...
-@@ -122,6 +125,9 @@ main(int argc, /* I - Number of comm
+@@ -124,6 +127,9 @@ main(int argc, /* I - Number of comm
#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
struct sigaction action; /* Actions for POSIX signals */
#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
@@ -1874,7 +1874,7 @@ diff -up cups-2.2.2/scheduler/main.c.lspp cups-2.2.2/scheduler/main.c
#ifdef __APPLE__
int use_sysman = 1; /* Use system management functions? */
#else
-@@ -508,6 +514,25 @@ main(int argc, /* I - Number of comm
+@@ -518,6 +524,25 @@ main(int argc, /* I - Number of comm
exit(errno);
}
@@ -1900,7 +1900,7 @@ diff -up cups-2.2.2/scheduler/main.c.lspp cups-2.2.2/scheduler/main.c
/*
* Set the timezone info...
*/
-@@ -1201,6 +1226,11 @@ main(int argc, /* I - Number of comm
+@@ -1225,6 +1250,11 @@ main(int argc, /* I - Number of comm
cupsdStopSelect();
@@ -1912,9 +1912,9 @@ diff -up cups-2.2.2/scheduler/main.c.lspp cups-2.2.2/scheduler/main.c
return (!stop_scheduler);
}
-diff -up cups-2.2.2/scheduler/printers.c.lspp cups-2.2.2/scheduler/printers.c
---- cups-2.2.2/scheduler/printers.c.lspp 2017-01-19 11:34:39.177989128 +0100
-+++ cups-2.2.2/scheduler/printers.c 2017-01-19 11:53:39.614723905 +0100
+diff -up cups-2.2.4/scheduler/printers.c.lspp cups-2.2.4/scheduler/printers.c
+--- cups-2.2.4/scheduler/printers.c.lspp 2017-06-30 21:06:35.800222284 +0200
++++ cups-2.2.4/scheduler/printers.c 2017-06-30 21:06:35.904221359 +0200
@@ -11,6 +11,8 @@
* missing or damaged, see the license at "http://www.cups.org/".
*/
@@ -1935,7 +1935,7 @@ diff -up cups-2.2.2/scheduler/printers.c.lspp cups-2.2.2/scheduler/printers.c
/*
* Local functions...
-@@ -2191,6 +2197,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
+@@ -2212,6 +2218,13 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
ipp_attribute_t *attr; /* Attribute data */
char *name, /* Current user/group name */
*filter; /* Current filter */
@@ -1949,7 +1949,7 @@ diff -up cups-2.2.2/scheduler/printers.c.lspp cups-2.2.2/scheduler/printers.c
DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name,
-@@ -2318,6 +2331,45 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
+@@ -2339,6 +2352,45 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)
attr->values[1].string.text = _cupsStrAlloc(Classification ?
Classification : p->job_sheets[1]);
}
diff --git a/cups-no-gzip-man.patch b/cups-no-gzip-man.patch
index 9bffccc..c476b7b 100644
--- a/cups-no-gzip-man.patch
+++ b/cups-no-gzip-man.patch
@@ -1,9 +1,9 @@
-diff -up cups-2.2b2/config-scripts/cups-manpages.m4.no-gzip-man cups-2.2b2/config-scripts/cups-manpages.m4
---- cups-2.2b2/config-scripts/cups-manpages.m4.no-gzip-man 2016-06-27 14:59:39.642245559 +0200
-+++ cups-2.2b2/config-scripts/cups-manpages.m4 2016-06-27 15:05:02.553627348 +0200
-@@ -53,10 +53,10 @@ case "$uname" in
+diff -up cups-2.2.4/config-scripts/cups-manpages.m4.no-gzip-man cups-2.2.4/config-scripts/cups-manpages.m4
+--- cups-2.2.4/config-scripts/cups-manpages.m4.no-gzip-man 2017-06-30 20:37:09.470034273 +0200
++++ cups-2.2.4/config-scripts/cups-manpages.m4 2017-06-30 20:39:15.982884832 +0200
+@@ -53,10 +53,10 @@ case "$host_os_name" in
;;
- Linux* | GNU* | Darwin*)
+ linux* | gnu* | darwin*)
# Linux, GNU Hurd, and macOS
- MAN1EXT=1.gz
- MAN5EXT=5.gz
diff --git a/cups.spec b/cups.spec
index f60d438..145d88c 100644
--- a/cups.spec
+++ b/cups.spec
@@ -14,8 +14,8 @@
Summary: CUPS printing system
Name: cups
Epoch: 1
-Version: 2.2.3
-Release: 6%{?dist}
+Version: 2.2.4
+Release: 1%{?dist}
License: GPLv2
Url: http://www.cups.org/
Source0: https://github.com/apple/cups/releases/download/v%{VERSION}/cups-%{VERSIO...
@@ -52,7 +52,6 @@ Patch23: cups-dnssd-deviceid.patch
Patch24: cups-ricoh-deviceid-oid.patch
Patch25: cups-systemd-socket.patch
Patch27: cups-avahi-address.patch
-Patch28: cups-enum-all.patch
Patch29: cups-dymo-deviceid.patch
Patch30: cups-freebind.patch
Patch31: cups-no-gcry.patch
@@ -236,8 +235,6 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
%patch25 -p1 -b .systemd-socket
# Use IP address when resolving DNSSD URIs (bug #948288).
%patch27 -p1 -b .avahi-address
-# Return from cupsEnumDests() once all records have been returned.
-%patch28 -p1 -b .enum-all
# Added IEEE 1284 Device ID for a Dymo device (bug #747866).
%patch29 -p1 -b .dymo-deviceid
# Use IP_FREEBIND socket option when binding listening sockets (bug #970809).
@@ -278,7 +275,7 @@ sed -i -e 's,^SystemGroup .*$, SystemGroup sys root wheel,' conf/cups-files.conf
# Let's look at the compilation command lines.
perl -pi -e "s,^.SILENT:,," Makedefs.in
-f=CREDITS.txt
+f=CREDITS.md
mv "$f" "$f"~
iconv -f MACINTOSH -t UTF-8 "$f"~ > "$f"
rm -f "$f"~
@@ -480,7 +477,7 @@ exit 0
rm -f %{cups_serverbin}/backend/smb
%files -f %{name}.lang
-%doc README.txt CREDITS.txt CHANGES.txt
+%doc README.md CREDITS.md CHANGES.md
%dir %attr(0755,root,lp) %{_sysconfdir}/cups
%dir %attr(0755,root,lp) %{_localstatedir}/run/cups
%dir %attr(0511,lp,sys) %{_localstatedir}/run/cups/certs
@@ -623,6 +620,9 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz
%changelog
+* Fri Jun 30 2017 Zdenek Dohnal <zdohnal(a)redhat.com> - 1:2.2.4-1
+- rebase to 2.2.4
+
* Thu Jun 29 2017 Zdenek Dohnal <zdohnal(a)redhat.com> - 1:2.2.3-6
- update python dependencies accordingly Fedora Guideline for Python (python-cups -> python3-cups)
diff --git a/sources b/sources
index b7a4149..2754467 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cups-2.2.3-source.tar.gz) = 0f3e2aa8e514dad056b4878b0657491d35796b62021092cd5dd480b67a8423fc0fdb822ccb4bc72a454c3ced20c160c8631d44c182c87a3993b882df904aaec7
+SHA512 (cups-2.2.4-source.tar.gz) = 132e1896c5b8466e0c38decbb1210b420f1fa811a761150abdf07112bab290d51883f58a9a441fdc51e7094d94036288d564d6f39e9ee65e9c298e00088469d3
--
cgit v1.1
https://src.fedoraproject.org/cgit/cups.git/commit/?h=master&id=7dc771732...
5Â years, 7Â months