Merge branch '2.2' into 2.3

bftpd/.md5sum

@@ -1,4 +1,4 @@
-e1376d3d7827aae9f1383ec870d8fdd1  bftpd-1.5-config.patch
+e1376d3d7827aae9f1383ec870d8fdd1  bftpd-1.6-config.patch
-45e7fb165aa729eb8ff401e847c07cde  bftpd-1.5-destdir.patch
+45e7fb165aa729eb8ff401e847c07cde  bftpd-1.6-destdir.patch
-52930d87091ea68184bf575ba37f11b1  bftpd-1.5.tar.gz
+203ebbe285857a4b001d4a9872cffce4  bftpd-1.6.tar.gz
 594cb67d469eedb55b268c9922a0dfcd  ftpd

bftpd/Pkgfile

@@ -3,7 +3,7 @@
 # Maintainer:  Simone Rota, sip at crux dot nu
 
 name=bftpd
-version=1.5
+version=1.6
 release=1
 source=(http://bftpd.sourceforge.net/downloads/src/bftpd-$version.tar.gz \
 	bftpd-$version-config.patch bftpd-$version-destdir.patch ftpd)

gnupg/.footprint

@@ -1,21 +1,44 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
--rwsr-xr-x	root/root	usr/bin/gpg
+lrwxrwxrwx	root/root	usr/bin/gpg -> /usr/bin/gpg2
--rwxr-xr-x	root/root	usr/bin/gpg-zip
+-rwxr-xr-x	root/root	usr/bin/gpg-agent
--rwxr-xr-x	root/root	usr/bin/gpgsplit
+-rwxr-xr-x	root/root	usr/bin/gpg-connect-agent
--rwxr-xr-x	root/root	usr/bin/gpgv
+-rwsr-xr-x	root/root	usr/bin/gpg2
+-rwxr-xr-x	root/root	usr/bin/gpgconf
+-rwxr-xr-x	root/root	usr/bin/gpgkey2ssh
+-rwxr-xr-x	root/root	usr/bin/gpgparsemail
+-rwxr-xr-x	root/root	usr/bin/gpgsm
+-rwxr-xr-x	root/root	usr/bin/gpgsm-gencert.sh
+-rwxr-xr-x	root/root	usr/bin/gpgv2
+-rwxr-xr-x	root/root	usr/bin/kbxutil
+-rwxr-xr-x	root/root	usr/bin/scdaemon
+-rwxr-xr-x	root/root	usr/bin/watchgnupg
 drwxr-xr-x	root/root	usr/lib/
-drwxr-xr-x	root/root	usr/lib/gnupg/
+-rwxr-xr-x	root/root	usr/lib/gnupg-pcsc-wrapper
--rwxr-xr-x	root/root	usr/lib/gnupg/gpgkeys_curl
+-rwxr-xr-x	root/root	usr/lib/gpg-preset-passphrase
--rwxr-xr-x	root/root	usr/lib/gnupg/gpgkeys_finger
+-rwxr-xr-x	root/root	usr/lib/gpg-protect-tool
--rwxr-xr-x	root/root	usr/lib/gnupg/gpgkeys_hkp
+-rwxr-xr-x	root/root	usr/lib/gpg2keys_curl
--rwxr-xr-x	root/root	usr/lib/gnupg/gpgkeys_mailto
+-rwxr-xr-x	root/root	usr/lib/gpg2keys_finger
+-rwxr-xr-x	root/root	usr/lib/gpg2keys_hkp
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man1/
--rw-r--r--	root/root	usr/man/man1/gpg.1.gz
+-rw-r--r--	root/root	usr/man/man1/gpg-agent.1.gz
--rw-r--r--	root/root	usr/man/man1/gpgv.1.gz
+-rw-r--r--	root/root	usr/man/man1/gpg-connect-agent.1.gz
-drwxr-xr-x	root/root	usr/man/man7/
+-rw-r--r--	root/root	usr/man/man1/gpg-preset-passphrase.1.gz
--rw-r--r--	root/root	usr/man/man7/gnupg.7.gz
+-rw-r--r--	root/root	usr/man/man1/gpg2.1.gz
+-rw-r--r--	root/root	usr/man/man1/gpgconf.1.gz
+-rw-r--r--	root/root	usr/man/man1/gpgparsemail.1.gz
+-rw-r--r--	root/root	usr/man/man1/gpgsm-gencert.sh.1.gz
+-rw-r--r--	root/root	usr/man/man1/gpgsm.1.gz
+-rw-r--r--	root/root	usr/man/man1/gpgv2.1.gz
+-rw-r--r--	root/root	usr/man/man1/scdaemon.1.gz
+-rw-r--r--	root/root	usr/man/man1/symcryptrun.1.gz
+-rw-r--r--	root/root	usr/man/man1/watchgnupg.1.gz
+drwxr-xr-x	root/root	usr/man/man8/
+-rw-r--r--	root/root	usr/man/man8/addgnupghome.8.gz
+drwxr-xr-x	root/root	usr/sbin/
+-rwxr-xr-x	root/root	usr/sbin/addgnupghome
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/gnupg/
--rw-r--r--	root/root	usr/share/gnupg/options.skel
+-rw-r--r--	root/root	usr/share/gnupg/com-certs.pem
+-rw-r--r--	root/root	usr/share/gnupg/gpg-conf.skel

gnupg/.md5sum

@@ -1,2 +1 @@
-811525965b4c0987e6418a7729a6444d  gnupg-1.4.5.tar.bz2
+eb24e258db73f4cb53a3ce18375efa21  gnupg-2.0.1.tar.bz2
-9dc3bc086824a8c7a331f35e09a3e57f  idea.c.gz

gnupg/Pkgfile

@@ -2,33 +2,31 @@
 # URL: http://www.gnupg.org
 # Maintainer: Simon Gloßner, viper at hometux dot de
 # Packager: Daniel Mueller, daniel at danm dot de
+# Depends on: libgcrypt, libassuan, libksba
 
 name=gnupg
-version=1.4.5
+version=2.0.1
 release=1
-source=(ftp://ftp.gnupg.org/gcrypt/gnupg/$name-$version.tar.bz2 \
+source=(ftp://ftp.gnupg.org/gcrypt/$name/$name-$version.tar.bz2)
-	ftp://ftp.gnupg.dk/pub/contrib-dk/idea.c.gz)
 
 build () {
     cd $name-$version
 
-    zcat ../idea.c.gz > cipher/idea.c
-
     ./configure \
 	--prefix=/usr \
 	--libexecdir=/usr/lib \
+	--mandir=/usr/man \
 	--enable-static-rnd=linux \
-        --enable-dev-random \
+	--enable-dev-random \
         --disable-nls \
-        --disable-ldap \
+        --disable-ldap 
-	--enable-mailto
 
     make
     make DESTDIR=$PKG install
 
-    chmod u+s $PKG/usr/bin/gpg
+    chmod u+s $PKG/usr/bin/gpg2
+    ln -s /usr/bin/gpg2 $PKG/usr/bin/gpg
 
-    rm -rf $PKG/usr/info
+    rm -rf $PKG/usr/share/info
-    rm -f $PKG/usr/share/gnupg/{FAQ,faq.html}
+    rm -f $PKG/usr/share/gnupg/{FAQ,faq.html,qualified.txt}
-    rm -f $PKG/usr/man/man?/gpg.ru.*
 }

libassuan/.footprint

@@ -0,0 +1,11 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/libassuan-config
+drwxr-xr-x	root/root	usr/include/
+-rw-r--r--	root/root	usr/include/assuan.h
+drwxr-xr-x	root/root	usr/lib/
+-rw-r--r--	root/root	usr/lib/libassuan-pth.a
+-rw-r--r--	root/root	usr/lib/libassuan.a
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/aclocal/
+-rw-r--r--	root/root	usr/share/aclocal/libassuan.m4

libassuan/.md5sum

@@ -0,0 +1 @@
+6109ea5c8c34ee5591afbd4618dd5ab4  libassuan-1.0.1.tar.bz2

libassuan/Pkgfile

@@ -0,0 +1,20 @@
+# Description: IPC library for the GnuPG components
+# URL: http://www.gnupg.org/
+# Maintainer: Simon Gloßner, viper at hometux dot de
+# Packager: Simon Gloßner, viper at hometux dot de
+# Depends on: libpth
+
+name=libassuan
+version=1.0.1
+release=1
+source=(ftp://ftp.gnupg.org/gcrypt/$name/$name-$version.tar.bz2)
+
+build() {
+    cd $name-$version
+
+    ./configure --prefix=/usr
+    make
+    make DESTDIR=$PKG install
+
+    rm -r $PKG/usr/share/info
+}

libgcrypt/.footprint

@@ -7,9 +7,9 @@ drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libgcrypt.a
 -rwxr-xr-x	root/root	usr/lib/libgcrypt.la
-lrwxrwxrwx	root/root	usr/lib/libgcrypt.so -> libgcrypt.so.11.2.1
+lrwxrwxrwx	root/root	usr/lib/libgcrypt.so -> libgcrypt.so.11.2.2
-lrwxrwxrwx	root/root	usr/lib/libgcrypt.so.11 -> libgcrypt.so.11.2.1
+lrwxrwxrwx	root/root	usr/lib/libgcrypt.so.11 -> libgcrypt.so.11.2.2
--rwxr-xr-x	root/root	usr/lib/libgcrypt.so.11.2.1
+-rwxr-xr-x	root/root	usr/lib/libgcrypt.so.11.2.2
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/aclocal/
 -rw-r--r--	root/root	usr/share/aclocal/libgcrypt.m4

libgcrypt/.md5sum

@@ -1 +1 @@
-1a4f886e4c1eb9b6908d39831c6f75b3  libgcrypt-1.2.2.tar.gz
+64304da2d9e21239246c66f1d449b2c6  libgcrypt-1.2.3.tar.gz

libgcrypt/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on: libgpg-error
 
 name=libgcrypt
-version=1.2.2
+version=1.2.3
 release=1
 source=(http://mirrors.rootmode.com/ftp.gnupg.org/$name/$name-$version.tar.gz)
 

libgpg-error/.footprint

@@ -7,9 +7,16 @@ drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libgpg-error.a
 -rwxr-xr-x	root/root	usr/lib/libgpg-error.la
-lrwxrwxrwx	root/root	usr/lib/libgpg-error.so -> libgpg-error.so.0.1.4
+lrwxrwxrwx	root/root	usr/lib/libgpg-error.so -> libgpg-error.so.0.3.0
-lrwxrwxrwx	root/root	usr/lib/libgpg-error.so.0 -> libgpg-error.so.0.1.4
+lrwxrwxrwx	root/root	usr/lib/libgpg-error.so.0 -> libgpg-error.so.0.3.0
--rwxr-xr-x	root/root	usr/lib/libgpg-error.so.0.1.4
+-rwxr-xr-x	root/root	usr/lib/libgpg-error.so.0.3.0
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/aclocal/
 -rw-r--r--	root/root	usr/share/aclocal/gpg-error.m4
+drwxr-xr-x	root/root	usr/share/common-lisp/
+drwxr-xr-x	root/root	usr/share/common-lisp/source/
+drwxr-xr-x	root/root	usr/share/common-lisp/source/gpg-error/
+-rw-r--r--	root/root	usr/share/common-lisp/source/gpg-error/gpg-error-codes.lisp
+-rw-r--r--	root/root	usr/share/common-lisp/source/gpg-error/gpg-error-package.lisp
+-rw-r--r--	root/root	usr/share/common-lisp/source/gpg-error/gpg-error.asd
+-rw-r--r--	root/root	usr/share/common-lisp/source/gpg-error/gpg-error.lisp

libgpg-error/.md5sum

@@ -1 +1 @@
-ee23cdd5fbbb1483676647a8e091ff8e  libgpg-error-1.1.tar.gz
+86e60e9a03205fb706e99be101a2387e  libgpg-error-1.4.tar.gz

libgpg-error/Pkgfile

@@ -3,7 +3,7 @@
 # Maintainer: Matt Housh, jaeger at morpheus dot net
 
 name=libgpg-error
-version=1.1
+version=1.4
 release=1
 source=(http://mirrors.rootmode.com/ftp.gnupg.org/$name/$name-$version.tar.gz)
 

libksba/.footprint

@@ -0,0 +1,14 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/ksba-config
+drwxr-xr-x	root/root	usr/include/
+-rw-r--r--	root/root	usr/include/ksba.h
+drwxr-xr-x	root/root	usr/lib/
+-rw-r--r--	root/root	usr/lib/libksba.a
+-rwxr-xr-x	root/root	usr/lib/libksba.la
+lrwxrwxrwx	root/root	usr/lib/libksba.so -> libksba.so.8.9.0
+lrwxrwxrwx	root/root	usr/lib/libksba.so.8 -> libksba.so.8.9.0
+-rwxr-xr-x	root/root	usr/lib/libksba.so.8.9.0
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/aclocal/
+-rw-r--r--	root/root	usr/share/aclocal/ksba.m4

libksba/.md5sum

@@ -0,0 +1 @@
+9b20be3fa55d7e4271344cce92bfa4ca  libksba-1.0.0.tar.bz2

libksba/Pkgfile

@@ -0,0 +1,20 @@
+# Description: X.509 and CMS support library
+# URL: http://www.gnupg.org
+# Maintainer: Simon Gloßner, viper at hometux dot de
+# Packager: Simon Gloßner, viper at hometux dot de
+# Depends on: libgpg-error
+
+name=libksba
+version=1.0.0
+release=1
+source=(ftp://ftp.gnupg.org/gcrypt/$name/$name-$version.tar.bz2)
+
+build() {
+    cd $name-$version
+
+    ./configure --prefix=/usr
+    make
+    make DESTDIR=$PKG install
+
+    rm -r $PKG/usr/info
+}

libpng/.footprint

@@ -12,13 +12,13 @@ drwxr-xr-x	root/root	usr/lib/
 lrwxrwxrwx	root/root	usr/lib/libpng.a -> libpng12.a
 lrwxrwxrwx	root/root	usr/lib/libpng.la -> libpng12.la
 lrwxrwxrwx	root/root	usr/lib/libpng.so -> libpng12.so
-lrwxrwxrwx	root/root	usr/lib/libpng.so.3 -> libpng.so.3.13.0
+lrwxrwxrwx	root/root	usr/lib/libpng.so.3 -> libpng.so.3.14.0
--rwxr-xr-x	root/root	usr/lib/libpng.so.3.13.0
+-rwxr-xr-x	root/root	usr/lib/libpng.so.3.14.0
 -rw-r--r--	root/root	usr/lib/libpng12.a
 -rwxr-xr-x	root/root	usr/lib/libpng12.la
-lrwxrwxrwx	root/root	usr/lib/libpng12.so -> libpng12.so.0.13.0
+lrwxrwxrwx	root/root	usr/lib/libpng12.so -> libpng12.so.0.14.0
-lrwxrwxrwx	root/root	usr/lib/libpng12.so.0 -> libpng12.so.0.13.0
+lrwxrwxrwx	root/root	usr/lib/libpng12.so.0 -> libpng12.so.0.14.0
--rwxr-xr-x	root/root	usr/lib/libpng12.so.0.13.0
+-rwxr-xr-x	root/root	usr/lib/libpng12.so.0.14.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 lrwxrwxrwx	root/root	usr/lib/pkgconfig/libpng.pc -> libpng12.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libpng12.pc

libpng/.md5sum

@@ -1 +1 @@
-e9ed9879008fa978d4c07cf4afd2bfcf  libpng-1.2.13.tar.bz2
+2ec1e1beb2e6376b09d090f74d259160  libpng-1.2.14.tar.bz2

libpng/Pkgfile

@@ -4,14 +4,14 @@
 # Depends on:  zlib
 
 name=libpng
-version=1.2.13
+version=1.2.14
 release=1
 source=(ftp://ftp.simplesystems.org/pub/$name/png/src/$name-$version.tar.bz2)
 
 build() {
     cd $name-$version
 
-    ./configure --prefix=/usr
+    ./configure --prefix=/usr --mandir=/usr/man
 
     make
     make DESTDIR=$PKG install

libpth/.footprint

@@ -0,0 +1,19 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/pth-config
+drwxr-xr-x	root/root	usr/include/
+-rw-r--r--	root/root	usr/include/pth.h
+drwxr-xr-x	root/root	usr/lib/
+-rw-r--r--	root/root	usr/lib/libpth.a
+-rwxr-xr-x	root/root	usr/lib/libpth.la
+lrwxrwxrwx	root/root	usr/lib/libpth.so -> libpth.so.20.0.27
+lrwxrwxrwx	root/root	usr/lib/libpth.so.20 -> libpth.so.20.0.27
+-rwxr-xr-x	root/root	usr/lib/libpth.so.20.0.27
+drwxr-xr-x	root/root	usr/man/
+drwxr-xr-x	root/root	usr/man/man1/
+-rw-r--r--	root/root	usr/man/man1/pth-config.1.gz
+drwxr-xr-x	root/root	usr/man/man3/
+-rw-r--r--	root/root	usr/man/man3/pth.3.gz
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/aclocal/
+-rw-r--r--	root/root	usr/share/aclocal/pth.m4

libpth/.md5sum

@@ -0,0 +1 @@
+9cb4a25331a4c4db866a31cbe507c793  pth-2.0.7.tar.gz

libpth/Pkgfile

@@ -0,0 +1,17 @@
+# Description: The GNU Portable Threads library
+# URL: http://www.gnu.org/software/pth/
+# Maintainer: Simon Gloßner, viper at hometux dot de
+# Packager: Simon Gloßner, viper at hometux dot de
+
+name=libpth
+version=2.0.7
+release=1
+source=(ftp://ftp.gnu.org/gnu/pth/pth-$version.tar.gz)
+
+build() {
+    cd pth-$version
+
+    ./configure --prefix=/usr
+    make
+    make DESTDIR=$PKG install
+}

ngrep/.md5sum

@@ -1 +1 @@
-8a142d74043609b09ed57d3baadb2fd6  ngrep-1.44.tar.bz2
+bc8150331601f3b869549c94866b4f1c  ngrep-1.45.tar.bz2

ngrep/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on:  libpcap
 
 name=ngrep
-version=1.44
+version=1.45
 release=1
 source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2)
 

postfix/Pkgfile

@@ -20,7 +20,7 @@ build() {
     make makefiles DEBUG="" OPT="$CFLAGS" CCARGS="$_CCARGS" AUXLIBS="$_AUXLIBS"
     make           DEBUG="" OPT="$CFLAGS" CCARGS="$_CCARGS" AUXLIBS="$_AUXLIBS"
     
-    sh ./postfix-install -non-interactive install_root=$PKG \
+    make non-interactive-package install_root=$PKG \
 	mail_owner=mail \
 	setgid_group=postdrop \
 	config_directory=/etc/postfix \

sane/README

@@ -3,8 +3,9 @@ README for sane 1.0.x
 REQUIREMENTS
 
 PRE-INSTALL
-  1. If you're using an USB scanner, create the group 'scanner' and 
+  1. Create the group 'scanner' and add all users which need access to your device.
-     add all users which need access to your device.
+ 
+     # groupadd scanner
 
 POST-INSTALL
   1. To find the vendor/product id of your scanner, run the command: