[arch-commits] Commit in gnutls/repos (10 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Sat Oct 15 19:34:22 UTC 2011
Date: Saturday, October 15, 2011 @ 15:34:21
Author: andyrtr
Revision: 140493
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
gnutls/repos/extra-i686/PKGBUILD
(from rev 140492, gnutls/trunk/PKGBUILD)
gnutls/repos/extra-i686/addGNU-stack.diff
(from rev 140492, gnutls/trunk/addGNU-stack.diff)
gnutls/repos/extra-i686/gnutls.install
(from rev 140492, gnutls/trunk/gnutls.install)
gnutls/repos/extra-x86_64/PKGBUILD
(from rev 140492, gnutls/trunk/PKGBUILD)
gnutls/repos/extra-x86_64/addGNU-stack.diff
(from rev 140492, gnutls/trunk/addGNU-stack.diff)
gnutls/repos/extra-x86_64/gnutls.install
(from rev 140492, gnutls/trunk/gnutls.install)
Deleted:
gnutls/repos/extra-i686/PKGBUILD
gnutls/repos/extra-i686/gnutls.install
gnutls/repos/extra-x86_64/PKGBUILD
gnutls/repos/extra-x86_64/gnutls.install
--------------------------------+
extra-i686/PKGBUILD | 83 ++++++++++++++++++++-------------------
extra-i686/addGNU-stack.diff | 13 ++++++
extra-i686/gnutls.install | 40 +++++++++---------
extra-x86_64/PKGBUILD | 83 ++++++++++++++++++++-------------------
extra-x86_64/addGNU-stack.diff | 13 ++++++
extra-x86_64/gnutls.install | 40 +++++++++---------
6 files changed, 152 insertions(+), 120 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-10-15 19:33:32 UTC (rev 140492)
+++ extra-i686/PKGBUILD 2011-10-15 19:34:21 UTC (rev 140493)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=gnutls
-pkgver=3.0.4
-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')
-makedepends=('valgrind')
-source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz)
-md5sums=(''748d537027978abcb7dd33ec396dc511'')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr \
- --with-zlib \
- --disable-static \
- --disable-guile \
- --disable-valgrind-tests # breaks make check. errors have been reported upstream
- 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 140492, gnutls/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-10-15 19:34:21 UTC (rev 140493)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=gnutls
+pkgver=3.0.4
+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')
+makedepends=('valgrind')
+source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz
+ addGNU-stack.diff)
+md5sums=('748d537027978abcb7dd33ec396dc511'
+ '19b92429e8d1639cfc4dfad0883298cb')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i ${srcdir}/addGNU-stack.diff
+ ./configure --prefix=/usr \
+ --with-zlib \
+ --disable-static \
+ --disable-guile \
+ --disable-valgrind-tests # breaks make check. errors have been reported upstream
+ 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/addGNU-stack.diff (from rev 140492, gnutls/trunk/addGNU-stack.diff)
===================================================================
--- extra-i686/addGNU-stack.diff (rev 0)
+++ extra-i686/addGNU-stack.diff 2011-10-15 19:34:21 UTC (rev 140493)
@@ -0,0 +1,13 @@
+Description: Prevent executable stack
+Author: Andreas Metzler <ametzler at debian.org>
+
+--- gnutls28-3.0.4.orig/lib/accelerated/x86/asm/padlock-common.s
++++ gnutls28-3.0.4/lib/accelerated/x86/asm/padlock-common.s
+@@ -38,3 +38,7 @@ is_padlock_nano:
+ xorl %eax,%eax
+ ret
+ .size is_padlock_nano,.-is_padlock_nano
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
Deleted: extra-i686/gnutls.install
===================================================================
--- extra-i686/gnutls.install 2011-10-15 19:33:32 UTC (rev 140492)
+++ extra-i686/gnutls.install 2011-10-15 19:34:21 UTC (rev 140493)
@@ -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 140492, gnutls/trunk/gnutls.install)
===================================================================
--- extra-i686/gnutls.install (rev 0)
+++ extra-i686/gnutls.install 2011-10-15 19:34:21 UTC (rev 140493)
@@ -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 2011-10-15 19:33:32 UTC (rev 140492)
+++ extra-x86_64/PKGBUILD 2011-10-15 19:34:21 UTC (rev 140493)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=gnutls
-pkgver=3.0.4
-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')
-makedepends=('valgrind')
-source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz)
-md5sums=(''748d537027978abcb7dd33ec396dc511'')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr \
- --with-zlib \
- --disable-static \
- --disable-guile \
- --disable-valgrind-tests # breaks make check. errors have been reported upstream
- 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 140492, gnutls/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-10-15 19:34:21 UTC (rev 140493)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=gnutls
+pkgver=3.0.4
+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')
+makedepends=('valgrind')
+source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz
+ addGNU-stack.diff)
+md5sums=('748d537027978abcb7dd33ec396dc511'
+ '19b92429e8d1639cfc4dfad0883298cb')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i ${srcdir}/addGNU-stack.diff
+ ./configure --prefix=/usr \
+ --with-zlib \
+ --disable-static \
+ --disable-guile \
+ --disable-valgrind-tests # breaks make check. errors have been reported upstream
+ 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/addGNU-stack.diff (from rev 140492, gnutls/trunk/addGNU-stack.diff)
===================================================================
--- extra-x86_64/addGNU-stack.diff (rev 0)
+++ extra-x86_64/addGNU-stack.diff 2011-10-15 19:34:21 UTC (rev 140493)
@@ -0,0 +1,13 @@
+Description: Prevent executable stack
+Author: Andreas Metzler <ametzler at debian.org>
+
+--- gnutls28-3.0.4.orig/lib/accelerated/x86/asm/padlock-common.s
++++ gnutls28-3.0.4/lib/accelerated/x86/asm/padlock-common.s
+@@ -38,3 +38,7 @@ is_padlock_nano:
+ xorl %eax,%eax
+ ret
+ .size is_padlock_nano,.-is_padlock_nano
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
Deleted: extra-x86_64/gnutls.install
===================================================================
--- extra-x86_64/gnutls.install 2011-10-15 19:33:32 UTC (rev 140492)
+++ extra-x86_64/gnutls.install 2011-10-15 19:34:21 UTC (rev 140493)
@@ -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 140492, gnutls/trunk/gnutls.install)
===================================================================
--- extra-x86_64/gnutls.install (rev 0)
+++ extra-x86_64/gnutls.install 2011-10-15 19:34:21 UTC (rev 140493)
@@ -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