Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	extra/xorg-server/PKGBUILD
	libre/cdrkit-libre/PKGBUILD

11 files changed, 26 insertions, 244 deletions

diff --git a/community/acpid/0001-Fix-format-of-video-tabletmode-event-string.patch b/community/acpid/0001-Fix-format-of-video-tabletmode-event-string.patch
deleted file mode 100644
index d111214d3..000000000
--- a/community/acpid/0001-Fix-format-of-video-tabletmode-event-string.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From ddf5be1f8fc35c38dc241ca935bf4d408f2ff61d Mon Sep 17 00:00:00 2001
-From: Ted Felix <ted@tedfelix.com>
-Date: Thu, 17 Jan 2013 20:03:54 -0500
-Subject: [PATCH] Fix format of video/tabletmode event string
-
-The previous format caused Xorg's xserver to crash in
-lnxACPIGetEventFromOs() because it doesn't check for NULL
-returns from strtok().
----
- input_layer.c | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/input_layer.c b/input_layer.c
-index 591ad64..db410c0 100644
---- a/input_layer.c
-+++ b/input_layer.c
-@@ -56,6 +56,14 @@ struct evtab_entry {
-    evtest.c, acpi_genl, or kacpimon to find new events to add to this
-    table. */
- 
-+/*
-+ * The two numbers (e.g. "00000080 00000000") in each string is a format
-+ * that Xorg and maybe others expect.
-+ *
-+ * See hw/xfree86/os-support/linux/lnx_acpi.c in xserver and specifically
-+ * lnxACPIGetEventFromOs().
-+ */
-+
- static struct evtab_entry evtab[] = {
- 
- 	/*** COMMON EVENTS ***/
-@@ -66,8 +74,8 @@ static struct evtab_entry evtab[] = {
- 	{{{0,0}, EV_KEY, KEY_SLEEP, 1}, "button/sleep SBTN 00000080 00000000"},
- 	{{{0,0}, EV_SW, SW_LID, 1}, "button/lid LID close"},
- 	{{{0,0}, EV_SW, SW_LID, 0}, "button/lid LID open"},
--	{{{0,0}, EV_SW, SW_TABLET_MODE, 0}, "video/tabletmode TBLT off"},
--	{{{0,0}, EV_SW, SW_TABLET_MODE, 1}, "video/tabletmode TBLT on"},
-+	{{{0,0}, EV_SW, SW_TABLET_MODE, 0}, "video/tabletmode TBLT 0000008A 00000000"},
-+	{{{0,0}, EV_SW, SW_TABLET_MODE, 1}, "video/tabletmode TBLT 0000008A 00000001"},
- 
- 
- 	/*** VIDEO ***/
--- 
-1.8.1.1
-
diff --git a/community/acpid/PKGBUILD b/community/acpid/PKGBUILD
index 355f848fb..b7763dec5 100644
--- a/community/acpid/PKGBUILD
+++ b/community/acpid/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 82787 2013-01-24 12:57:51Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# $Id: PKGBUILD 84713 2013-02-23 09:11:56Z seblu $
+# Maintainer: Sébastien Luttringer
 # Contributor: xduugu
 # Contributor: Manolis Tzanidakis
 # Contributor: Jonathan Schmidt <j.schmidt@archlinux.us
 
 pkgname=acpid
-pkgver=2.0.17
-pkgrel=4
+pkgver=2.0.18
+pkgrel=1
 pkgdesc='A daemon for delivering ACPI power management events with netlink support'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://tedfelix.com/linux/acpid-netlink.html'
@@ -15,22 +15,19 @@ depends=('bash')
 optdepends=('perl: use perl based examples')
 replaces=('acpid2')
 backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything')
-source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.xz"
+source=("http://downloads.sourceforge.net/sourceforge/acpid2/$pkgname-$pkgver.tar.xz"
         'acpid.socket'
         'acpid.service'
         'anything'
-        'handler.sh'
-        '0001-Fix-format-of-video-tabletmode-event-string.patch')
-md5sums=('d858729b7d984c5e3a0c7558e9de1584'
+        'handler.sh')
+md5sums=('7c4ff315ae960c54eea303c71c49f152'
          'ee6cb99e50e580c50331a73045412ae9'
          '10290f69491206cd104654e5b900b661'
          '2d37b98d6e74bab815604b8b48c6cfd4'
-         '47f44ff5f02685dce8bcdab8568f0c38'
-         'a813e00553104f2129f64cae95a7983f')
+         '47f44ff5f02685dce8bcdab8568f0c38')
 
 build() {
   cd $pkgname-$pkgver
-  patch -p1 -i "$srcdir/0001-Fix-format-of-video-tabletmode-event-string.patch"
   ./configure --prefix=/usr
   make
 }
diff --git a/community/cdrtools/PKGBUILD b/community/cdrtools/PKGBUILD
deleted file mode 100644
index 040b156bc..000000000
--- a/community/cdrtools/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 84509 2013-02-19 13:38:15Z stativ $
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-pkgname=cdrtools
-pkgver=3.01a12
-pkgrel=1
-pkgdesc="Original cdrtools supporting CD, DVD and BluRay burning"
-arch=('i686' 'x86_64')
-url="http://cdrecord.berlios.de/private/cdrecord.html"
-license=('CDDL')
-depends=('acl')
-conflicts=('cdrkit')
-provides=('cdrkit')
-options=(!makeflags)
-backup=('etc/default/cdrecord' 'etc/default/rscsi')
-install=cdrtools.install
-source=(http://ftp.berlios.de/pub/cdrecord/alpha/cdrtools-$pkgver.tar.bz2)
-md5sums=('563d80a7102175bea3e41fbfc269b914')
-
-build() {
-  cd "$srcdir"/cdrtools-${pkgver%%a*}
-  sed -i 's|/opt/schily|/usr|g' DEFAULTS/Defaults.linux
-  sed -i 's|DEFINSGRP=.*|DEFINSGRP=root|' DEFAULTS/Defaults.linux
-  
-  export GMAKE_NOWARN=true
-  make INS_BASE=/usr INS_RBASE=/
-}
-
-package() {
-  cd "$srcdir"/cdrtools-${pkgver%%a*}
-
-  export GMAKE_NOWARN=true
-  make INS_BASE=/usr INS_RBASE=/ DESTDIR="$pkgdir" install
-  rm -rf "$pkgdir"/usr/include
-  rm -rf "$pkgdir"/usr/lib/{*.a,profiled}
-
-  # autoload 'sg' module needed by cdrecord
-  install -d -m755 "$pkgdir"/usr/lib/modules-load.d/
-  echo sg > "$pkgdir"/usr/lib/modules-load.d/cdrecord.conf
-
-  # create symlinks for cdrkit compatibility
-  cd "$pkgdir"/usr/bin
-  ln -s cdrecord wodim
-  ln -s readcd readom
-  ln -s mkisofs genisoimage
-  ln -s cdda2wav icedax
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/cdrtools/cdrtools.install b/community/cdrtools/cdrtools.install
deleted file mode 100644
index 3f49eb1bb..000000000
--- a/community/cdrtools/cdrtools.install
+++ /dev/null
@@ -1,14 +0,0 @@
-
-post_install() {
-  echo "To allow other users than root execute rscsi add an entry"
-  echo "to /etc/default/rscsi or use an \"rscsi\" user"
-  echo ""
-  post_upgrade
-}
-
-post_upgrade() {
-  echo "The manual loading (or loading using rc.conf)"
-  echo "of the 'sg' module is no longer necessary."
-  echo "It is automatically loaded during boot by systemd-tools (udev 185)."
-}
-
diff --git a/community/ipset/PKGBUILD b/community/ipset/PKGBUILD
index 93dfedb16..d7f96b934 100644
--- a/community/ipset/PKGBUILD
+++ b/community/ipset/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 82785 2013-01-24 12:55:11Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# $Id: PKGBUILD 84727 2013-02-23 17:46:16Z seblu $
+# Maintainer: Sébastien Luttringer
 
 pkgname=ipset
-pkgver=6.16.1
-pkgrel=2
+pkgver=6.17
+pkgrel=1
 pkgdesc='Administration tool for IP sets'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://ipset.netfilter.org'
@@ -14,7 +14,7 @@ options=('!libtool')
 source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2"
         "$pkgname.systemd"
         "$pkgname.service")
-md5sums=('9fd70c825f052db7dc9d5ba0562b7083'
+md5sums=('9d439e279e02076f29fe7c9c059a5cae'
          '7daa4f163eef9db216cb4c428e0342a3'
          'b032241b96b5802975fe4321cc511c6b')
 
diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD
index 15f2a549b..c901f766e 100644
--- a/community/nginx/PKGBUILD
+++ b/community/nginx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 84707 2013-02-22 20:47:11Z bpiotrowski $
+# $Id: PKGBUILD 84730 2013-02-23 20:47:41Z bpiotrowski $
 # Maintainer:  Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl>
@@ -8,7 +8,7 @@ _tmpdir=/var/lib/nginx
 
 pkgname=nginx
 pkgver=1.2.7
-pkgrel=2
+pkgrel=3
 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
 arch=('i686' 'x86_64' 'mips64el')
 depends=('pcre' 'zlib' 'openssl' 'geoip')
@@ -31,7 +31,7 @@ source=(http://nginx.org/download/nginx-$pkgver.tar.gz
 		logrotate)
 sha256sums=('2457a878943fb409ec4fcb46b43af222d06a584f93228e17a4f02b0e7bfc9de3'
             '77da8ce4d8378048606a25e09270ee187d6b226ee750b6cb4313af5549f5156a'
-            'b0ef6c00e0e94926588242ed910b387922e513d5152fcdb651dc06e2b84e7d85')
+            'a21b564eaf83b4b4ce3a436e895bd37e000677fb314b89818f89f30caca6e6d9')
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
diff --git a/community/nginx/logrotate b/community/nginx/logrotate
index 8773578b5..1a5bd6441 100644
--- a/community/nginx/logrotate
+++ b/community/nginx/logrotate
@@ -1,6 +1,6 @@
 /var/log/nginx/*log {
 	missingok
-	create 750 root log
+	create 640 root log
 	sharedscripts
 	compress
 	postrotate
diff --git a/community/nginx/nginx.install b/community/nginx/nginx.install
index 00a7b9cac..242766abd 100644
--- a/community/nginx/nginx.install
+++ b/community/nginx/nginx.install
@@ -1,12 +1,12 @@
 post_install() {
     if [[ -e var/log/nginx ]]; then
-        chmod 750 var/log/nginx
+        chmod 640 var/log/nginx
         chown root:log var/log/nginx
     fi
 }
 
 post_upgrade() {
-    [[ $(vercmp $2 1.2.7-1) -le 0 ]] && post_install
+    [[ $(vercmp $2 1.2.7-2) -le 0 ]] && post_install
     if [[ $(vercmp $2 1.2.1-2) -le 0 ]]; then
         echo " >>> Since 1.2.1-2 several changes has been made in package:"
         echo "      - *.conf files have been moved to /etc/nginx"
diff --git a/community/quagga/0001-isisd-fix-typo-in-topology-generator-BZ-731.patch b/community/quagga/0001-isisd-fix-typo-in-topology-generator-BZ-731.patch
deleted file mode 100644
index dda3c48c4..000000000
--- a/community/quagga/0001-isisd-fix-typo-in-topology-generator-BZ-731.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From a47c5838e9f445ab887ad927706b11ccbb181364 Mon Sep 17 00:00:00 2001
-From: David Lamparter <equinox@opensourcerouting.org>
-Date: Thu, 21 Jun 2012 09:55:38 +0200
-Subject: [PATCH] isisd: fix typo in topology generator (BZ#731)
-
-There was a "lsp->" missing before "level" in line 2416.
-(introduced by git commit e38e0df)
-
-Reported-by: Seblu <seblu@seblu.net>
-Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
----
- isisd/isis_lsp.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c
-index 5c1e993..082e9dc 100644
---- a/isisd/isis_lsp.c
-+++ b/isisd/isis_lsp.c
-@@ -2413,7 +2413,7 @@ top_lsp_refresh (struct thread *thread)
-   isis_dynhn_insert (lsp->lsp_header->lsp_id, lsp->tlv_data.hostname,
- 		     IS_LEVEL_1);
- 
--  lsp->lsp_header->lsp_bits = lsp_bits_generate (level,
-+  lsp->lsp_header->lsp_bits = lsp_bits_generate (lsp->level,
-                                                  lsp->area->overload_bit);
-   rem_lifetime = lsp_rem_lifetime (lsp->area, IS_LEVEL_1);
-   lsp->lsp_header->rem_lifetime = htons (rem_lifetime);
--- 
-1.7.11
-
diff --git a/community/quagga/0002-CVE-2012-1820.patch b/community/quagga/0002-CVE-2012-1820.patch
deleted file mode 100644
index aae2d7b18..000000000
--- a/community/quagga/0002-CVE-2012-1820.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-@@ -, +, @@ 
-    bgpd: CVE-2012-1820, DoS in bgp_capability_orf()
-    
-    An ORF (code 3) capability TLV is defined to contain exactly one
-    AFI/SAFI block. Function bgp_capability_orf(), which parses ORF
-    capability TLV, uses do-while cycle to call its helper function
-    bgp_capability_orf_entry(), which actually processes the AFI/SAFI data
-    block. The call is made at least once and repeated as long as the input
-    buffer has enough data for the next call.
-    
-    The helper function, bgp_capability_orf_entry(), uses "Number of ORFs"
-    field of the provided AFI/SAFI block to verify, if it fits the input
-    buffer. However, the check is made based on the total length of the ORF
-    TLV regardless of the data already consumed by the previous helper
-    function call(s). This way, the check condition is only valid for the
-    first AFI/SAFI block inside an ORF capability TLV.
-    
-    For the subsequent calls of the helper function, if any are made, the
-    check condition may erroneously tell, that the current "Number of ORFs"
-    field fits the buffer boundary, where in fact it does not. This makes it
-    possible to trigger an assertion by feeding an OPEN message with a
-    specially-crafted malformed ORF capability TLV.
-    
-    This commit fixes the vulnerability by making the implementation follow
-    the spec.
---- a/bgpd/bgp_open.c	
-+++ a/bgpd/bgp_open.c	
-@@ -231,7 +231,7 @@ bgp_capability_orf_entry (struct peer *peer, struct capability_header *hdr)
-     }
-   
-   /* validate number field */
--  if (sizeof (struct capability_orf_entry) + (entry.num * 2) > hdr->length)
-+  if (sizeof (struct capability_orf_entry) + (entry.num * 2) != hdr->length)
-     {
-       zlog_info ("%s ORF Capability entry length error,"
-                  " Cap length %u, num %u",
-@@ -335,28 +335,6 @@ bgp_capability_orf_entry (struct peer *peer, struct capability_header *hdr)
- }
- 
- static int
--bgp_capability_orf (struct peer *peer, struct capability_header *hdr)
--{
--  struct stream *s = BGP_INPUT (peer);
--  size_t end = stream_get_getp (s) + hdr->length;
--  
--  assert (stream_get_getp(s) + sizeof(struct capability_orf_entry) <= end);
--  
--  /* We must have at least one ORF entry, as the caller has already done
--   * minimum length validation for the capability code - for ORF there must
--   * at least one ORF entry (header and unknown number of pairs of bytes).
--   */
--  do
--    {
--      if (bgp_capability_orf_entry (peer, hdr) == -1)
--        return -1;
--    } 
--  while (stream_get_getp(s) + sizeof(struct capability_orf_entry) < end);
--  
--  return 0;
--}
--
--static int
- bgp_capability_restart (struct peer *peer, struct capability_header *caphdr)
- {
-   struct stream *s = BGP_INPUT (peer);
-@@ -573,7 +551,7 @@ bgp_capability_parse (struct peer *peer, size_t length, int *mp_capability,
-             break;
-           case CAPABILITY_CODE_ORF:
-           case CAPABILITY_CODE_ORF_OLD:
--            if (bgp_capability_orf (peer, &caphdr))
-+            if (bgp_capability_orf_entry (peer, &caphdr))
-               return -1;
-             break;
-           case CAPABILITY_CODE_RESTART:
diff --git a/community/quagga/PKGBUILD b/community/quagga/PKGBUILD
index 84f921a81..b976cc754 100644
--- a/community/quagga/PKGBUILD
+++ b/community/quagga/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 83621 2013-02-04 00:43:11Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
+# $Id: PKGBUILD 84732 2013-02-23 20:56:41Z seblu $
+# Maintainer: Sébastien Luttringer
 
 pkgname=quagga
-pkgver=0.99.21
-pkgrel=3
+pkgver=0.99.22
+pkgrel=1
 pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.quagga.net'
@@ -19,10 +19,8 @@ source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar
         'ospfd.service'
         'ripd.service'
         'ripngd.service'
-        'zebra.service'
-        '0001-isisd-fix-typo-in-topology-generator-BZ-731.patch'
-        '0002-CVE-2012-1820.patch')
-md5sums=('99840adbe57047c90dfba6b6ed9aec7f'
+        'zebra.service')
+md5sums=('3057bf3a91116a1017dd0df7e5e8ef93'
          '45d8bf56a426b0e7ebe429547be8a27a'
          'ab31ed8dafd7a92137f4f00ad0937b4f'
          '4c05d0105cd0db23a2583bd75a1bde4d'
@@ -30,9 +28,7 @@ md5sums=('99840adbe57047c90dfba6b6ed9aec7f'
          'c5f8a729685cebf8fc5b1a1552d37b6d'
          'e721b334bb0b31983642b307033c63d0'
          'effeb26ff78ffcafe7808596ddc5d3fc'
-         'f0c0b99346b2c373a74158e45f04cf91'
-         'c80174f7bdd32cd84550d52451e8f495'
-         '44f39016d81f3b13b2744f7dcd93289d')
+         'f0c0b99346b2c373a74158e45f04cf91')
 
 build() {
   cd $pkgname-$pkgver