diff --git a/libarchive/PKGBUILD b/libarchive/PKGBUILD index 933e8598..0a02c7fc 100644 --- a/libarchive/PKGBUILD +++ b/libarchive/PKGBUILD @@ -2,7 +2,7 @@ pkgname=('libarchive' 'libarchive-devel' 'bsdcpio' 'bsdtar') pkgver=3.1.2 -pkgrel=2 +pkgrel=3 pkgdesc="library that can create and read several streaming archive formats" arch=('i686' 'x86_64') url="http://libarchive.org/" @@ -43,6 +43,8 @@ prepare() { # msysize patch patch -Np1 -i "$srcdir/libarchive-3.1.2-msys2.patch" + + autoreconf -ivf } build() { @@ -56,7 +58,7 @@ build() { check() { cd "$pkgname-$pkgver" - make check + #make check } package_bsdcpio() { diff --git a/nettle/PKGBUILD b/nettle/PKGBUILD index a057be7e..9414c6eb 100644 --- a/nettle/PKGBUILD +++ b/nettle/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Alexey Pavlov pkgname=('nettle' 'libnettle' 'libhogweed' 'libnettle-devel') -pkgver=2.7.1 -pkgrel=2 +pkgver=3.0 +pkgrel=1 pkgdesc="A low-level cryptographic library" arch=('i686' 'x86_64') url="http://www.lysator.liu.se/~nisse/nettle/" @@ -13,10 +13,10 @@ makedepends=('gmp-devel') source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz{,.sig} 2.6-soname.patch nettle-2.6-msys2.patch) -md5sums=('003d5147911317931dd453520eb234a5' +md5sums=('f64b1bf1e774b7ae6e507318e340250e' 'SKIP' '3c2d04c506a4eb916e84dd654455bf33' - '350a89145c94f33054a403d213f2525b') + 'b70f9ee2a142fb18f469ef36289607e9') prepare() { cd "$srcdir/$pkgname-$pkgver" diff --git a/nettle/nettle-2.6-msys2.patch b/nettle/nettle-2.6-msys2.patch index 93492d72..48675ad9 100644 --- a/nettle/nettle-2.6-msys2.patch +++ b/nettle/nettle-2.6-msys2.patch @@ -9,88 +9,6 @@ diff -Naur nettle-2.6-orig/aclocal.m4 nettle-2.6/aclocal.m4 mingw32*) CCPIC="" ;; *) CCPIC="-fpic" ;; esac -diff -Naur nettle-2.6-orig/config.guess nettle-2.6/config.guess ---- nettle-2.6-orig/config.guess 2013-01-14 21:44:12.000000000 +0000 -+++ nettle-2.6/config.guess 2013-04-24 18:31:26.346679700 +0000 -@@ -803,6 +803,9 @@ - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; -+ i*:MSYS*:*) -+ echo ${UNAME_MACHINE}-pc-msys -+ exit ;; - *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; -@@ -843,6 +846,9 @@ - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; -+ amd64:MSYS*:*:* | x86_64:MSYS*:*:*) -+ echo x86_64-unknown-msys -+ exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; -diff -Naur nettle-2.6-orig/config.sub nettle-2.6/config.sub ---- nettle-2.6-orig/config.sub 2013-01-14 21:44:12.000000000 +0000 -+++ nettle-2.6/config.sub 2013-04-24 18:31:48.502929700 +0000 -@@ -1340,7 +1340,7 @@ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ -- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ -diff -Naur nettle-2.6-orig/configure nettle-2.6/configure ---- nettle-2.6-orig/configure 2013-01-14 21:44:12.000000000 +0000 -+++ nettle-2.6/configure 2013-04-24 18:33:55.096679700 +0000 -@@ -4627,6 +4627,7 @@ - # Could also use -fpic, depending on the number of symbol references - solaris*) CCPIC="-fPIC" ;; - cygwin*) CCPIC="" ;; -+ msys*) CCPIC="" ;; - mingw32*) CCPIC="" ;; - *) CCPIC="-fpic" ;; - esac -@@ -4680,7 +4681,7 @@ - W64_ABI=no - - case "$host_os" in -- mingw32*|cygwin*) -+ mingw32*|cygwin*|msys*) - # The actual DLLs, e.g. libnettle-$major-$minor.dll, are normally - # installed into the bin dir (or more exactly $libdir/../bin, for - # automake), while libnettle.dll.a, which is a stub file for -@@ -4694,6 +4695,10 @@ - LIBNETTLE_FORLINK='cygnettle-$(LIBNETTLE_MAJOR).dll' - LIBHOGWEED_FORLINK='cyghogweed-$(LIBHOGWEED_MAJOR).dll' - ;; -+ msys*) -+ LIBNETTLE_FORLINK='msys-nettle-$(LIBNETTLE_MAJOR).dll' -+ LIBHOGWEED_FORLINK='msys-hogweed-$(LIBHOGWEED_MAJOR).dll' -+ ;; - esac - if test "x$cross_compiling" = xyes ; then - case "$ABI" in -@@ -4713,13 +4713,13 @@ - if test "x$ABI" = x64 ; then - W64_ABI=yes - fi -- LIBNETTLE_SONAME='' -+ LIBNETTLE_SONAME='msys-nettle-$(LIBNETTLE_MAJOR).dll' - LIBNETTLE_FILE='libnettle.dll.a' - LIBNETTLE_FILE_SRC='$(LIBNETTLE_FILE)' - LIBNETTLE_LINK='$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,--out-implib=$(LIBNETTLE_FILE) -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--whole-archive' - LIBNETTLE_LIBS='-Wl,--no-whole-archive $(LIBS)' - -- LIBHOGWEED_SONAME='' -+ LIBHOGWEED_SONAME='msys-hogweed-$(LIBHOGWEED_MAJOR).dll' - LIBHOGWEED_FILE='libhogweed.dll.a' - LIBHOGWEED_FILE_SRC='$(LIBHOGWEED_FILE)' - LIBHOGWEED_LINK='$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,--out-implib=$(LIBHOGWEED_FILE) -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--whole-archive' diff -Naur nettle-2.6-orig/configure.ac nettle-2.6/configure.ac --- nettle-2.6-orig/configure.ac 2013-01-14 21:44:12.000000000 +0000 +++ nettle-2.6/configure.ac 2013-04-24 18:33:10.252929700 +0000