[arch-commits] Commit in gnutls/repos (12 files)

andyrtr at archlinux.org andyrtr at archlinux.org
Mon Feb 20 05:15:53 EST 2012


    Date: Monday, February 20, 2012 @ 05:15:52
  Author: andyrtr
Revision: 150689

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  gnutls/repos/extra-i686/PKGBUILD
    (from rev 150688, gnutls/trunk/PKGBUILD)
  gnutls/repos/extra-i686/buildfix.diff
    (from rev 150688, gnutls/trunk/buildfix.diff)
  gnutls/repos/extra-i686/gnutls.install
    (from rev 150688, gnutls/trunk/gnutls.install)
  gnutls/repos/extra-x86_64/PKGBUILD
    (from rev 150688, gnutls/trunk/PKGBUILD)
  gnutls/repos/extra-x86_64/buildfix.diff
    (from rev 150688, gnutls/trunk/buildfix.diff)
  gnutls/repos/extra-x86_64/gnutls.install
    (from rev 150688, gnutls/trunk/gnutls.install)
Deleted:
  gnutls/repos/extra-i686/PKGBUILD
  gnutls/repos/extra-i686/buildfix.diff
  gnutls/repos/extra-i686/gnutls.install
  gnutls/repos/extra-x86_64/PKGBUILD
  gnutls/repos/extra-x86_64/buildfix.diff
  gnutls/repos/extra-x86_64/gnutls.install

-----------------------------+
 extra-i686/PKGBUILD         |   90 +++++++++++++++++++++---------------------
 extra-i686/buildfix.diff    |   41 +++++++++++++------
 extra-i686/gnutls.install   |   40 +++++++++---------
 extra-x86_64/PKGBUILD       |   90 +++++++++++++++++++++---------------------
 extra-x86_64/buildfix.diff  |   41 +++++++++++++------
 extra-x86_64/gnutls.install |   40 +++++++++---------
 6 files changed, 186 insertions(+), 156 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-02-20 10:15:07 UTC (rev 150688)
+++ extra-i686/PKGBUILD	2012-02-20 10:15:52 UTC (rev 150689)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=gnutls
-pkgver=3.0.13
-pkgrel=1
-pkgdesc="A library which provides a secure layer over a reliable transport layer"
-arch=('i686' 'x86_64')
-license=('GPL3' 'LGPL')
-url="http://www.gnu.org/software/gnutls/"
-install=gnutls.install
-options=('!libtool' '!zipman')
-depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.11')
-makedepends=('valgrind' 'strace')
-source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig}
-        buildfix.diff)
-md5sums=('ec549be557f31ea8c1738cb441ef23ec'
-         'a6a9a1d148abd6377e7634eb03bdaf7c'
-         'b6284815621293cb4a2f0ad25bcc985d')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  # fix hanging make check - http://git.savannah.gnu.org/gitweb/?p=gnutls.git;a=commit;h=642e6b5ca996325dc0ca6401a3b87039408b2585
-  patch -Np1 -i ${srcdir}/buildfix.diff
-  ./configure --prefix=/usr \
-	--with-zlib \
-	--disable-static \
-	--disable-guile \
-	--enable-valgrind-tests
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make check # passes all  || /bin/true
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  # lots of .png files are put into infodir and are gzipped by makepkg! this may need to be fixed by using !zipman
-  # gzip -9 all files in infodir and manpages manually
-  find "$pkgdir/usr/share/info" -name '*.info*' -exec gzip -9 {} \;
-  find "$pkgdir/usr/share/man" -exec gzip -9 {} \;
-}

Copied: gnutls/repos/extra-i686/PKGBUILD (from rev 150688, gnutls/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-02-20 10:15:52 UTC (rev 150689)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=gnutls
+pkgver=3.0.13
+pkgrel=2
+pkgdesc="A library which provides a secure layer over a reliable transport layer"
+arch=('i686' 'x86_64')
+license=('GPL3' 'LGPL')
+url="http://www.gnu.org/software/gnutls/"
+install=gnutls.install
+options=('!libtool' '!zipman')
+depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.11')
+makedepends=('valgrind' 'strace')
+source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig}
+        buildfix.diff)
+md5sums=('ec549be557f31ea8c1738cb441ef23ec'
+         'a6a9a1d148abd6377e7634eb03bdaf7c'
+         '9b2a32b41391d95aeb8ddae3756fa191')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  # fix hanging make check - http://git.savannah.gnu.org/gitweb/?p=gnutls.git;a=commit;h=642e6b5ca996325dc0ca6401a3b87039408b2585
+  patch -Np1 -i ${srcdir}/buildfix.diff
+  ./configure --prefix=/usr \
+	--with-zlib \
+	--disable-static \
+	--disable-guile \
+	--enable-valgrind-tests
+  make
+}
+
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check # passes all  || /bin/true
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  # lots of .png files are put into infodir and are gzipped by makepkg! this may need to be fixed by using !zipman
+  # gzip -9 all files in infodir and manpages manually
+  find "$pkgdir/usr/share/info" -name '*.info*' -exec gzip -9 {} \;
+  find "$pkgdir/usr/share/man" -exec gzip -9 {} \;
+}

Deleted: extra-i686/buildfix.diff
===================================================================
--- extra-i686/buildfix.diff	2012-02-20 10:15:07 UTC (rev 150688)
+++ extra-i686/buildfix.diff	2012-02-20 10:15:52 UTC (rev 150689)
@@ -1,13 +0,0 @@
-index 17f6d3f..cc01dcd 100644 (file)
-
-
---- a/tests/mini-loss-time.c
-+++ b/tests/mini-loss-time.c
-@@ -267,6 +267,7 @@ static void start (int server_packet, int client_packet)
-     {
-       /* parent */
-       server (fd[0], server_packet);
-+      kill(child, SIGTERM);
-     }
-   else 
-     {

Copied: gnutls/repos/extra-i686/buildfix.diff (from rev 150688, gnutls/trunk/buildfix.diff)
===================================================================
--- extra-i686/buildfix.diff	                        (rev 0)
+++ extra-i686/buildfix.diff	2012-02-20 10:15:52 UTC (rev 150689)
@@ -0,0 +1,28 @@
+index 17f6d3f..cc01dcd 100644 (file)
+
+
+--- a/tests/mini-loss-time.c
++++ b/tests/mini-loss-time.c
+@@ -267,6 +267,7 @@ static void start (int server_packet, int client_packet)
+     {
+       /* parent */
+       server (fd[0], server_packet);
++      kill(child, SIGTERM);
+     }
+   else 
+     {
+--- a/src/libopts/m4/libopts.m4
++++ b/src/libopts/m4/libopts.m4
+@@ -487,9 +487,9 @@ AC_DEFUN([LIBOPTS_CHECK_COMMON],[
+     fi])
+ 
+   AC_ARG_ENABLE([libopts-install],
+-    AC_HELP_STRING([--disable-libopts-install],
+-       [Do not install libopts with client installation]))
+-  AM_CONDITIONAL([INSTALL_LIBOPTS],[test "X${enable_libopts_install}" != Xno])
++    AC_HELP_STRING([--enable-libopts-install],
++       [Install libopts with client installation]))
++  AM_CONDITIONAL([INSTALL_LIBOPTS],[test "X${enable_libopts_install}" = Xyes])
+ 
+   [if test -z "${NEED_LIBOPTS_DIR}" ; then]
+      AC_MSG_CHECKING([whether autoopts-config can be found])

Deleted: extra-i686/gnutls.install
===================================================================
--- extra-i686/gnutls.install	2012-02-20 10:15:07 UTC (rev 150688)
+++ extra-i686/gnutls.install	2012-02-20 10:15:52 UTC (rev 150689)
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gnutls.info-1.gz gnutls.info-2.gz gnutls.info-3.gz gnutls.info.gz)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-}

Copied: gnutls/repos/extra-i686/gnutls.install (from rev 150688, gnutls/trunk/gnutls.install)
===================================================================
--- extra-i686/gnutls.install	                        (rev 0)
+++ extra-i686/gnutls.install	2012-02-20 10:15:52 UTC (rev 150689)
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(gnutls.info-1.gz gnutls.info-2.gz gnutls.info-3.gz gnutls.info.gz)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-02-20 10:15:07 UTC (rev 150688)
+++ extra-x86_64/PKGBUILD	2012-02-20 10:15:52 UTC (rev 150689)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=gnutls
-pkgver=3.0.13
-pkgrel=1
-pkgdesc="A library which provides a secure layer over a reliable transport layer"
-arch=('i686' 'x86_64')
-license=('GPL3' 'LGPL')
-url="http://www.gnu.org/software/gnutls/"
-install=gnutls.install
-options=('!libtool' '!zipman')
-depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.11')
-makedepends=('valgrind' 'strace')
-source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig}
-        buildfix.diff)
-md5sums=('ec549be557f31ea8c1738cb441ef23ec'
-         'a6a9a1d148abd6377e7634eb03bdaf7c'
-         'b6284815621293cb4a2f0ad25bcc985d')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  # fix hanging make check - http://git.savannah.gnu.org/gitweb/?p=gnutls.git;a=commit;h=642e6b5ca996325dc0ca6401a3b87039408b2585
-  patch -Np1 -i ${srcdir}/buildfix.diff
-  ./configure --prefix=/usr \
-	--with-zlib \
-	--disable-static \
-	--disable-guile \
-	--enable-valgrind-tests
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make check # passes all  || /bin/true
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  # lots of .png files are put into infodir and are gzipped by makepkg! this may need to be fixed by using !zipman
-  # gzip -9 all files in infodir and manpages manually
-  find "$pkgdir/usr/share/info" -name '*.info*' -exec gzip -9 {} \;
-  find "$pkgdir/usr/share/man" -exec gzip -9 {} \;
-}

Copied: gnutls/repos/extra-x86_64/PKGBUILD (from rev 150688, gnutls/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-02-20 10:15:52 UTC (rev 150689)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=gnutls
+pkgver=3.0.13
+pkgrel=2
+pkgdesc="A library which provides a secure layer over a reliable transport layer"
+arch=('i686' 'x86_64')
+license=('GPL3' 'LGPL')
+url="http://www.gnu.org/software/gnutls/"
+install=gnutls.install
+options=('!libtool' '!zipman')
+depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.11')
+makedepends=('valgrind' 'strace')
+source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig}
+        buildfix.diff)
+md5sums=('ec549be557f31ea8c1738cb441ef23ec'
+         'a6a9a1d148abd6377e7634eb03bdaf7c'
+         '9b2a32b41391d95aeb8ddae3756fa191')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  # fix hanging make check - http://git.savannah.gnu.org/gitweb/?p=gnutls.git;a=commit;h=642e6b5ca996325dc0ca6401a3b87039408b2585
+  patch -Np1 -i ${srcdir}/buildfix.diff
+  ./configure --prefix=/usr \
+	--with-zlib \
+	--disable-static \
+	--disable-guile \
+	--enable-valgrind-tests
+  make
+}
+
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check # passes all  || /bin/true
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  # lots of .png files are put into infodir and are gzipped by makepkg! this may need to be fixed by using !zipman
+  # gzip -9 all files in infodir and manpages manually
+  find "$pkgdir/usr/share/info" -name '*.info*' -exec gzip -9 {} \;
+  find "$pkgdir/usr/share/man" -exec gzip -9 {} \;
+}

Deleted: extra-x86_64/buildfix.diff
===================================================================
--- extra-x86_64/buildfix.diff	2012-02-20 10:15:07 UTC (rev 150688)
+++ extra-x86_64/buildfix.diff	2012-02-20 10:15:52 UTC (rev 150689)
@@ -1,13 +0,0 @@
-index 17f6d3f..cc01dcd 100644 (file)
-
-
---- a/tests/mini-loss-time.c
-+++ b/tests/mini-loss-time.c
-@@ -267,6 +267,7 @@ static void start (int server_packet, int client_packet)
-     {
-       /* parent */
-       server (fd[0], server_packet);
-+      kill(child, SIGTERM);
-     }
-   else 
-     {

Copied: gnutls/repos/extra-x86_64/buildfix.diff (from rev 150688, gnutls/trunk/buildfix.diff)
===================================================================
--- extra-x86_64/buildfix.diff	                        (rev 0)
+++ extra-x86_64/buildfix.diff	2012-02-20 10:15:52 UTC (rev 150689)
@@ -0,0 +1,28 @@
+index 17f6d3f..cc01dcd 100644 (file)
+
+
+--- a/tests/mini-loss-time.c
++++ b/tests/mini-loss-time.c
+@@ -267,6 +267,7 @@ static void start (int server_packet, int client_packet)
+     {
+       /* parent */
+       server (fd[0], server_packet);
++      kill(child, SIGTERM);
+     }
+   else 
+     {
+--- a/src/libopts/m4/libopts.m4
++++ b/src/libopts/m4/libopts.m4
+@@ -487,9 +487,9 @@ AC_DEFUN([LIBOPTS_CHECK_COMMON],[
+     fi])
+ 
+   AC_ARG_ENABLE([libopts-install],
+-    AC_HELP_STRING([--disable-libopts-install],
+-       [Do not install libopts with client installation]))
+-  AM_CONDITIONAL([INSTALL_LIBOPTS],[test "X${enable_libopts_install}" != Xno])
++    AC_HELP_STRING([--enable-libopts-install],
++       [Install libopts with client installation]))
++  AM_CONDITIONAL([INSTALL_LIBOPTS],[test "X${enable_libopts_install}" = Xyes])
+ 
+   [if test -z "${NEED_LIBOPTS_DIR}" ; then]
+      AC_MSG_CHECKING([whether autoopts-config can be found])

Deleted: extra-x86_64/gnutls.install
===================================================================
--- extra-x86_64/gnutls.install	2012-02-20 10:15:07 UTC (rev 150688)
+++ extra-x86_64/gnutls.install	2012-02-20 10:15:52 UTC (rev 150689)
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gnutls.info-1.gz gnutls.info-2.gz gnutls.info-3.gz gnutls.info.gz)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-}

Copied: gnutls/repos/extra-x86_64/gnutls.install (from rev 150688, gnutls/trunk/gnutls.install)
===================================================================
--- extra-x86_64/gnutls.install	                        (rev 0)
+++ extra-x86_64/gnutls.install	2012-02-20 10:15:52 UTC (rev 150689)
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(gnutls.info-1.gz gnutls.info-2.gz gnutls.info-3.gz gnutls.info.gz)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}



More information about the arch-commits mailing list