Merge branch 'master' of git://projects.parabolagnulinux.org/abslibre

4 files changed, 38 insertions, 38 deletions

diff --git a/kernels/linux-libre-grsec/PKGBUILD b/kernels/linux-libre-grsec/PKGBUILD
index e17657146..8f83b01e3 100644
--- a/kernels/linux-libre-grsec/PKGBUILD
+++ b/kernels/linux-libre-grsec/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 206177 2014-02-20 22:43:41Z thomas $
+# $Id: PKGBUILD 206252 2014-02-22 22:54:25Z thomas $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -10,12 +10,12 @@
 pkgbase=linux-libre-grsec   # Build stock -LIBRE-GRSEC kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.13
-_sublevel=4
+_sublevel=5
 _grsecver=3.0
-_timestamp=201402221308
+_timestamp=201402241943
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.3 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.5 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -46,8 +46,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'known-exploit-detection.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz")
 md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1'
-         '3659d30b1d06dd5b7874ae04c946863b'
-         '0022d89a923e5e871ba53db1f969e46e'
+         '6e59a1e4b891ca5fa8b03d488fa64e04'
+         '810f3caa18b89eda5b41a2cff5821a4a'
          '21da34d98cc007a78a11660863537c0d'
          'd4b95575b9cc32b7ba4ad8624972ddf9'
          '5f66bed97a5c37e48eb2f71b2d354b9a'
@@ -67,7 +67,7 @@ md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1'
          'f93ef6157fbb23820bd5ae08fd3f451e'
          '0db7629711f4ed76bd1f9da9f97bc4ea'
          'cb789bf97bc65fd4cf240d99df9c24c0'
-         'ac92b702b8497d2be14f96e077a7f48f')
+         '5fcb6203b54aaf7dcbdf6e2c6f159b14')
 if [ "$CARCH" != "mips64el" ]; then
     # don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index 02863ff53..4a6b2c0ec 100644
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -9,12 +9,12 @@
 pkgbase=linux-libre-rt      # Build stock -LIBRE-RT kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.12
-_releasever=11
-_rtpatchver=rt17
+_releasever=12
+_rtpatchver=rt19
 _pkgver=${_basekernel}.${_releasever}
 pkgver=${_basekernel}.${_releasever}_${_rtpatchver}
 pkgrel=1
-_lxopkgver=${_basekernel}.11 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.12 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -40,8 +40,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('254f59707b6676b59ce5ca5c3c698319'
-         '8d78b7fe81e226b022b331e8a1da74b7'
-         '5c46965799741357e7a48c2c32735929'
+         'e2ec796847356b785cb06d0563f3f7d5'
+         '97e5652f6039a48544897129c8adaf98'
          'e40789b1e59136235827a3b3bf40c121'
          'bf542c4038d3e7d0da4c92bac0466198'
          '82496e68851d1960543a07ba51cdb44a'
@@ -56,7 +56,7 @@ md5sums=('254f59707b6676b59ce5ca5c3c698319'
          'cec0bb8981936eab2943b2009b7a6fff'
          '88d9cddf9e0050a76ec4674f264fb2a1'
          'cb9016630212ef07b168892fbcfd4e5d'
-         '5a595801584a112426ccc0fe3753aa06')
+         'a9a0ee57377ed6e55957f9671eead03a')
 if [ "$CARCH" != "mips64el" ]; then
     # don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 5535d43b8..cd2b63bc8 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -13,7 +13,7 @@ _basekernel=3.13
 _sublevel=5
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.5 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -59,7 +59,7 @@ md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1'
          '1ae4ec847f41fa1b6d488f956e94c893'
          'e6fa278c092ad83780e2dd0568e24ca6'
          '93dbf73af819b77f03453a9c6de2bb47'
-         '0dba32ae551acd285da1c1dcfee5b966')
+         '5fcb6203b54aaf7dcbdf6e2c6f159b14')
 if [ "$CARCH" != "mips64el" ]; then
     # don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
diff --git a/libre/webmin/PKGBUILD b/libre/webmin/PKGBUILD
index 824c7da2b..2e40800bd 100644
--- a/libre/webmin/PKGBUILD
+++ b/libre/webmin/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195997 2013-10-07 10:38:56Z tpowa $
+# $Id: PKGBUILD 206573 2014-03-01 18:15:00Z bpiotrowski $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=webmin
-pkgver=1.660
-pkgrel=1.1
+pkgver=1.670
+pkgrel=1
 pkgdesc="a web-based interface for system administration (Parabola rebranded)"
 arch=(i686 x86_64 mips64el)
 license=('custom:webmin')
@@ -83,17 +83,17 @@ backup=('etc/webmin/miniserv.conf' 'etc/webmin/miniserv.users' 'etc/webmin/confi
 'etc/webmin/pserver/config' \
 'etc/webmin/dnsadmin/config' )
 install=webmin.install
-source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz 
-	ftp://ftp.archlinux.org/other/webmin/webmin-config.tar.bz2 
-	ftp://ftp.archlinux.org/other/webmin/webmin-pacman.tar.bz2
-	webmin.service) 
+source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz
+        ftp://ftp.archlinux.org/other/webmin/webmin-config.tar.bz2
+        ftp://ftp.archlinux.org/other/webmin/webmin-pacman.tar.bz2
+        webmin.service)
 options=(!strip)
 
 package() {
   # NOTE: USE --asroot build option to avoid fakeroot error!
   cd "$srcdir"/$pkgname-$pkgver
   # add patches from webmin.com
-  #for i in ../*.wbm 
+  #for i in ../*.wbm
   #do tar xvf $i
   #done
   #for i in ../*.wbt
@@ -103,13 +103,13 @@ package() {
   rm -f mount/freebsd-mounts*
   rm -f mount/openbsd-mounts*
   rm -f mount/macos-mounts*
-  
+
   # remove modules we do not support
   rm -rf {bacula-backup,ldap-useradmin,mon,sentry,frox,jabber,majordomo,qmail,sendmail,sarg,wuftpd,webalizer,inetd,ipsec,pap,pptp-client,pptp-server,shorewall,smart-status,vgetty,heartbeat,cfengine,cpan,sgiexports,hpuxexports,qmailadmin,bsdexports,dfsadmin}
-  
+
   #remove config files from other distros
   rm -f $(find . ! -name 'config-generic-linux' ! -name 'config-\*-linux' ! -name 'config-lib.pl' -name 'config-*')
-  
+
   # remove caldera theme
   rm -rf caldera
 
@@ -124,27 +124,27 @@ package() {
   rm -f usermin/{upgrade.cgi,update.cgi,update.pl,edit_upgrade.cgi,install_mod.cgi,delete_mod.cgi,install_theme.cgi}
 
   # remove modules add because we don't want files installed without pacman control
-  rm -f webmin/{install_mod.cgi,delete_mod.cgi}  
+  rm -f webmin/{install_mod.cgi,delete_mod.cgi}
 
   # setting perl path
   (find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl -
-  
+
   # create dirs
   mkdir -p "$pkgdir"/opt/webmin
   mkdir -p "$pkgdir"/var/log/webmin
   mkdir -p "$pkgdir"/etc/webmin
-  
+
   # install pam stuff
   install -D -m 644 webmin-pam "$pkgdir"/etc/pam.d/webmin
-  
+
   # remove other distros and add only Parabola GNU/Linux-libre don't change next line else it will not work!
   rm os_list.txt
   echo 'Parabola GNU/linux-libre			Any version	generic-linux	*	-d "/etc/pacman.d"' >> os_list.txt
-  
+
   # Add rc.conf support to boot and shutdown menu and lock editing of this module
   cd init/
   sed -i -e 's:^local_down=.*:local_down=Parabola GNU/Linux-libre RC.CONF,3,None:g' $(find . ! -name 'config.info.pl' -name 'config.info*')
-  sed -i -e 's:^local_script=.*:local_script=Parabola GNU/Linux-libre RC.LOCAL,3,None:g' $(find . ! -name 'config.info.pl' -name 'config.info*') 
+  sed -i -e 's:^local_script=.*:local_script=Parabola GNU/Linux-libre RC.LOCAL,3,None:g' $(find . ! -name 'config.info.pl' -name 'config.info*')
   sed -i -e 's:^index_downscript=.*:index_downscript=Parabola GNU/Linux-libre RC.CONF:g' lang/*
   sed -i -e 's:^index_script=.*:index_script=Parabola GNU/Linux-libre RC.LOCAL:g' lang/*
   sed -i -e 's:^noconfig=0:noconfig=1:g'  defaultacl
@@ -184,18 +184,18 @@ package() {
   atbootyn=n
   tempdir="$pkgdir"/tmp
   export config_dir var_dir perl autoos port tempdir login crypt ssl nochown autothird nouninstall nostart noperlpath atbootyn
-  
+
   # Fix setup.sh
   sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' "$pkgdir"/opt/webmin/setup.sh
   "$pkgdir"/opt/webmin/setup.sh
-  
+
   # Fixup the config files to use their real locations
   sed -i 's:^pidfile=.*$:pidfile=/var/run/webmin.pid:' "$pkgdir"/etc/webmin/miniserv.conf
-  find "$pkgdir"/etc/webmin -type f -exec sed -i "s:$pkgdir::g" {} \; 
-  
+  find "$pkgdir"/etc/webmin -type f -exec sed -i "s:$pkgdir::g" {} \;
+
   # make it only accessible by localhost
   echo 'allow=127.0.0.1' >> "$pkgdir"/etc/webmin/miniserv.conf
-  
+
   # install pacman menu
   cd "$srcdir"/webmin-pacman/config
   cp -rfp * "$pkgdir"/etc/webmin/pacman
@@ -210,7 +210,7 @@ package() {
   # install license
   install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/webmin/LICENCE
 }
-md5sums=('56a685a665b864470eeb7ce6b97961d8'
+md5sums=('db2edf10ad1eb0cc8d80849a61dafd3a'
          'b0b3e3fb231a12e60165b6b4d604dcfa'
          'c86518037449e0fc0c60fc24537ea038'
          'fc29ecb6a5cd8c278abe054e60381095')