bash, cups, git, gjs, gupnp-igd, iasl, kmymoney, nvidia-glx, parcelli…

…te, qemu, rsyslog, scons, squid

ChangeLog.All

@@ -1,3 +1,60 @@
+Thu Oct  2 19:58:38 BRT 2014
+rsyslog-8.4.2-x86_64-1xinc.txz
++--------------------------+
+Thu Oct  2 19:52:12 BRT 2014
+kmod-nvidia-custom-340.46-x86_64-1xinc.txz
++--------------------------+
+Thu Oct  2 19:51:45 BRT 2014
+nvidia-xconfig-340.46-x86_64-1xinc.txz
++--------------------------+
+Thu Oct  2 19:50:47 BRT 2014
+nvidia-persistenced-340.46-x86_64-1xinc.txz
++--------------------------+
+Thu Oct  2 19:48:45 BRT 2014
+nvidia-settings-340.46-x86_64-1xinc.txz
++--------------------------+
+Thu Oct  2 19:47:59 BRT 2014
+libxnvctrl-340.46-x86_64-1xinc.txz
++--------------------------+
+Thu Oct  2 19:45:31 BRT 2014
+nvidia-glx-340.46-x86_64-1xinc.txz
++--------------------------+
+Thu Oct  2 19:15:59 BRT 2014
+iasl-20140926-x86_64-1xinc.txz
++--------------------------+
+Thu Oct  2 19:13:09 BRT 2014
+bash-4.3.028-x86_64-1xinc.txz
++--------------------------+
+Thu Oct  2 19:09:47 BRT 2014
+parcellite-1.1.9-x86_64-1xinc.txz
++--------------------------+
+Thu Oct  2 19:08:18 BRT 2014
+gupnp-igd-0.2.4-x86_64-1xinc.txz
++--------------------------+
+Thu Oct  2 19:05:12 BRT 2014
+gjs-1.42.0-x86_64-1xinc.txz
++--------------------------+
+Wed Oct  1 23:23:56 BRT 2014
+cups-2.0.0-x86_64-1xinc.txz
++--------------------------+
+Wed Oct  1 22:35:08 BRT 2014
+qemu-2.1.2-x86_64-1xinc.txz
++--------------------------+
+Wed Oct  1 22:02:04 BRT 2014
+scons-2.3.4-x86_64-1xinc.txz
++--------------------------+
+Wed Oct  1 21:41:14 BRT 2014
+kmymoney-4.7.0-x86_64-1xinc.txz
++--------------------------+
+Wed Oct  1 21:30:00 BRT 2014
+squid-3.4.8-x86_64-1xinc.txz
++--------------------------+
+Wed Oct  1 21:26:59 BRT 2014
+xcb-util-keysyms-0.4.0-x86_64-1xinc.txz
++--------------------------+
+Tue Sep 30 22:36:17 BRT 2014
+git-2.1.2-x86_64-1xinc.txz
++--------------------------+
 Tue Sep 30 22:03:19 BRT 2014
 lilypond-2.19.15-x86_64-1xinc.txz
 +--------------------------+

bash/ChangeLog.SB

@@ -1,3 +1,7 @@
+Thu Oct  2 19:13:09 BRT 2014
+bash-4.3.028-x86_64-1xinc.txz:
+  Updated to 4.3.028.
++--------------------------+
 Sun Sep 28 11:05:43 BRT 2014
 bash-4.3.027-x86_64-1xinc.txz:
   Updated to 4.3.027.

bash/apply-patches.sh

@@ -52,7 +52,5 @@ patch -p0 -E --backup --verbose -i ${SB_PATCHDIR}/bash-4.3-parse-time-keyword.pa
 patch -p0 -E --backup --verbose -i ${SB_PATCHDIR}/bash-4.3-pathexp-globignore-delim.patch
 # rhbz#1102815 - fix double echoes in vi visual mode
 patch -p1 -E --backup --verbose -i ${SB_PATCHDIR}/bash-4.3-noecho.patch
-# rhbz#1146319 - cve-2014-7169
-patch -p0 -E --backup --verbose -i ${SB_PATCHDIR}/bash-4.2-cve-2014-7169-2.patch
 
 set +e +o pipefail

bash/bash.SlackBuild

@@ -44,7 +44,7 @@ NAME=bash
 NAME2=bash-doc
 PKG=${PKG:-${TMP}/package-${NAME}}
 
-VERSION=${VERSION:-4.3.027}
+VERSION=${VERSION:-4.3.028}
 SVER="$( echo ${VERSION} | cut -d . -f1-2 )"
 PATCHLEVEL="$( echo ${VERSION} | cut -d . -f3 )"
 [ "${PATCHLEVEL}" = "" ] && PATCHLEVEL=0

cups/ChangeLog.SB

@@ -1,3 +1,7 @@
+Wed Oct  1 23:23:56 BRT 2014
+cups-2.0.0-x86_64-1xinc.txz:
+  Updated to 2.0.0.
++--------------------------+
 Wed Jul 30 23:09:28 BRT 2014
 cups-1.7.5-x86_64-1xinc.txz:
   Updated to 1.7.5.

cups/apply-patches.sh

@@ -53,7 +53,6 @@ ApplyPatch cups-hp-deviceid-oid.patch
 ApplyPatch cups-dnssd-deviceid.patch
 ApplyPatch cups-ricoh-deviceid-oid.patch
 [ "${SB_SYSTEMD}" = "YES" ] && ApplyPatch cups-systemd-socket.patch
-[ "${SB_SYSTEMD}" = "YES" ] && ApplyPatch cups-lpd-manpage.patch
 ApplyPatch cups-avahi-address.patch
 ApplyPatch cups-usblp-quirks.patch
 ApplyPatch cups-enum-all.patch

cups/cups-compat32.SlackBuild

@@ -45,7 +45,7 @@ PNAME=cups
 NAME=cups-compat32
 PKG=${PKG:-${TMP}/package-${NAME}}
 
-VERSION=${VERSION:-1.7.5}
+VERSION=${VERSION:-2.0.0}
 if [ "${SB_NATIVE}" = "YES" ] ;then
   ARCH32=${ARCH32:-$(linux32 uname -m)}
 else
@@ -124,7 +124,7 @@ if [ "${SB_SYSTEMD}" = "YES" ] ;then
   sed -i \
     -e 's|libsystemd-daemon|libsystemd|g' \
     -e 's|libsystemd-journal|libsystemd|g' \
-    config-scripts/cups-systemd.m4 || exit 1
+    config-scripts/cups-startup.m4 || exit 1
 fi
 
 # Rebuild configure script for --enable-avahi.
@@ -151,6 +151,7 @@ CXXFLAGS="${SLKCFLAGS}" \
   --enable-openssl=yes \
   --enable-gnutls=no \
   --enable-cdsassl=no \
+  --enable-webif \
   ${SB_KRB5OPTS} \
   --docdir=/usr/doc \
   --without-php \

cups/cups.SlackBuild

@@ -44,7 +44,7 @@ fi
 NAME=cups
 PKG=${PKG:-${TMP}/package-${NAME}}
 
-VERSION=${VERSION:-1.7.5}
+VERSION=${VERSION:-2.0.0}
 if [ "${SB_NATIVE}" = "YES" ] ;then
   ARCH=${ARCH:-$(uname -m)}
 else
@@ -148,7 +148,7 @@ if [ "${SB_SYSTEMD}" = "YES" ] ;then
   sed -i \
     -e 's|libsystemd-daemon|libsystemd|g' \
     -e 's|libsystemd-journal|libsystemd|g' \
-    config-scripts/cups-systemd.m4 || exit 1
+    config-scripts/cups-startup.m4 || exit 1
 fi
 
 # Rebuild configure script for --enable-avahi.
@@ -177,6 +177,7 @@ CXXFLAGS="${SLKCFLAGS}" \
   --enable-openssl=yes \
   --enable-gnutls=no \
   --enable-cdsassl=no \
+  --enable-webif \
   ${SB_KRB5OPTS} \
   --docdir=/usr/doc \
   --without-php \
@@ -216,6 +217,10 @@ rm -rf ${PKG}/etc/init.d ${PKG}/etc/rc{0,2,3,5}.d
 mkdir -p ${PKG}/lib/systemd/system
 install -pm0644 ${CWD}/systemd/*.{service,socket} ${PKG}/lib/systemd/system/ || exit 1
 
+for i in path service socket ;do
+  mv ${PKG}/lib/systemd/system/org.cups.cupsd.${i} ${PKG}/lib/systemd/system/cups.${i} || exit 1
+done
+
 # install /usr/lib/tmpfiles.d/cups.conf (bug #656566)
 mkdir -p ${PKG}/usr/lib/tmpfiles.d
 cat > ${PKG}/usr/lib/tmpfiles.d/cups.conf <<EOF

cups/patches/cups-avahi-address.patch

@@ -1,7 +1,7 @@
-diff -up cups-1.6.2/cups/http-support.c.avahi-address cups-1.6.2/cups/http-support.c
---- cups-1.6.2/cups/http-support.c.avahi-address	2013-03-11 18:44:36.000000000 +0000
-+++ cups-1.6.2/cups/http-support.c	2013-06-28 13:42:15.834715511 +0100
-@@ -2121,7 +2121,7 @@ http_resolve_cb(
+diff -up cups-2.0rc1/cups/http-support.c.avahi-address cups-2.0rc1/cups/http-support.c
+--- cups-2.0rc1/cups/http-support.c.avahi-address	2014-08-28 17:37:22.000000000 +0200
++++ cups-2.0rc1/cups/http-support.c	2014-09-12 15:31:45.062950696 +0200
+@@ -2342,7 +2342,7 @@ http_resolve_cb(
      const char             *type,	/* I - Registration type */
      const char             *domain,	/* I - Domain (unused) */
      const char             *hostTarget,	/* I - Hostname */
@@ -10,7 +10,7 @@ diff -up cups-1.6.2/cups/http-support.c.avahi-address cups-1.6.2/cups/http-suppo
      uint16_t               port,	/* I - Port number */
      AvahiStringList        *txt,	/* I - TXT record */
      AvahiLookupResultFlags flags,	/* I - Lookup flags (unused) */
-@@ -2248,41 +2248,59 @@ http_resolve_cb(
+@@ -2495,39 +2495,62 @@ http_resolve_cb(
      * getting the IP address of the .local name and then do reverse-lookups...
      */
 
@@ -49,28 +49,28 @@ diff -up cups-1.6.2/cups/http-support.c.avahi-address cups-1.6.2/cups/http-suppo
 +
 +      if (!error)
        {
--        int error = getnameinfo(&(addr->addr.addr),
--	                        httpAddrLength(&(addr->addr)),
--			        fqdn, sizeof(fqdn), NULL, 0, NI_NAMEREQD);
+-        int error = getnameinfo(&(addr->addr.addr), (socklen_t)httpAddrLength(&(addr->addr)), fqdn, sizeof(fqdn), NULL, 0, NI_NAMEREQD);
 +	DEBUG_printf(("8http_resolve_cb: Found \"%s\".", fqdn));
 
 -        if (!error)
+-	{
+-	  DEBUG_printf(("8http_resolve_cb: Found \"%s\".", fqdn));
 +	if ((hostptr = fqdn + strlen(fqdn) - 6) <= fqdn ||
 +	    _cups_strcasecmp(hostptr, ".local"))
- 	{
--	  DEBUG_printf(("8http_resolve_cb: Found \"%s\".", fqdn));
--
+
 -	  if ((hostptr = fqdn + strlen(fqdn) - 6) <= fqdn ||
 -	      _cups_strcasecmp(hostptr, ".local"))
 -	  {
 -	    hostTarget = fqdn;
 -	    break;
 -	  }
++	{
 +	  hostTarget = fqdn;
  	}
 +      } else {
 +	avahi_address_snprint (fqdn, sizeof (fqdn), address);
 +	hostTarget = fqdn;
++
  #ifdef DEBUG
 -	else
 -	  DEBUG_printf(("8http_resolve_cb: \"%s\" did not resolve: %d",
@@ -80,7 +80,7 @@ diff -up cups-1.6.2/cups/http-support.c.avahi-address cups-1.6.2/cups/http-suppo
 +		      fqdn, error));
  #endif /* DEBUG */
        }
--
+ 
 -      httpAddrFreeList(addrlist);
      }
 +  } else {