commit 50b2ac4344515172bdee6ee65612a4f495c18d4b Author: Danny Rawlins <monster.romster@gmail.com> Date: Wed Feb 15 18:40:46 2017 +1100 Revert "Merge branch '3.2' into 3.3" This reverts commit 9524c9122b2c02208e5aad71da1783673d370fa9, reversing changes made to 95a7404b5b9adba65dcfc075fdf2c37c353358e1. diff --git a/libdrm-32/.md5sum b/libdrm-32/.md5sum index 4b3e706..16a2e24 100644 --- a/libdrm-32/.md5sum +++ b/libdrm-32/.md5sum @@ -1 +1 @@ -57b0589122ec4b8d5dfb9e430a21f0b3 libdrm-2.4.75.tar.bz2 +31964aa15bdea1a40c5941d4ce0962ee libdrm-2.4.74.tar.bz2 diff --git a/libdrm-32/Pkgfile b/libdrm-32/Pkgfile index 1a9986a..933390f 100644 --- a/libdrm-32/Pkgfile +++ b/libdrm-32/Pkgfile @@ -1,15 +1,15 @@ # Description: Userspace interface to kernel DRM services -# URL: https://dri.freedesktop.org/ +# URL: http://dri.freedesktop.org/ # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu # Depends on: libpthread-stubs-32 xorg-libpciaccess-32 libdrm name=libdrm-32 -version=2.4.75 +version=2.4.74 release=1 -source=(https://dri.freedesktop.org/${name%-*}/${name%-*}-$version.tar.bz2) +source=(http://dri.freedesktop.org/libdrm/libdrm-$version.tar.bz2) build() { - cd ${name%-*}-$version + cd libdrm-$version ./configure \ --prefix=/usr \ diff --git a/libgcrypt-32/.footprint b/libgcrypt-32/.footprint index 9145dac..0e2c106 100644 --- a/libgcrypt-32/.footprint +++ b/libgcrypt-32/.footprint @@ -2,6 +2,6 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib32/ -rw-r--r-- root/root usr/lib32/libgcrypt.a -rwxr-xr-x root/root usr/lib32/libgcrypt.la -lrwxrwxrwx root/root usr/lib32/libgcrypt.so -> libgcrypt.so.20.1.6 -lrwxrwxrwx root/root usr/lib32/libgcrypt.so.20 -> libgcrypt.so.20.1.6 --rwxr-xr-x root/root usr/lib32/libgcrypt.so.20.1.6 +lrwxrwxrwx root/root usr/lib32/libgcrypt.so -> libgcrypt.so.20.1.5 +lrwxrwxrwx root/root usr/lib32/libgcrypt.so.20 -> libgcrypt.so.20.1.5 +-rwxr-xr-x root/root usr/lib32/libgcrypt.so.20.1.5 diff --git a/libgcrypt-32/.md5sum b/libgcrypt-32/.md5sum index fdc984d..a93a9e7 100644 --- a/libgcrypt-32/.md5sum +++ b/libgcrypt-32/.md5sum @@ -1 +1 @@ -54e180679a7ae4d090f8689ca32b654c libgcrypt-1.7.6.tar.bz2 +74c8b4b2118946dcbfec5ff1cbf97177 libgcrypt-1.7.5.tar.bz2 diff --git a/libgcrypt-32/Pkgfile b/libgcrypt-32/Pkgfile index 9debadc..1294e49 100644 --- a/libgcrypt-32/Pkgfile +++ b/libgcrypt-32/Pkgfile @@ -1,15 +1,15 @@ # Description: A general purpose cryptographic library based on GnuPG -# URL: https://www.gnupg.org/ +# URL: http://www.gnupg.org/ # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu # Depends on: libgcrypt libgpg-error-32 name=libgcrypt-32 -version=1.7.6 +version=1.7.5 release=1 -source=(https://www.gnupg.org/ftp/gcrypt/${name%-*}/${name%-*}-$version.tar.bz2) +source=(ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$version.tar.bz2) build() { - cd ${name%-*}-$version + cd libgcrypt-$version ./configure \ --prefix=/usr \ diff --git a/sqlite3-32/Pkgfile b/sqlite3-32/Pkgfile index 1f01fdb..6015574 100644 --- a/sqlite3-32/Pkgfile +++ b/sqlite3-32/Pkgfile @@ -5,7 +5,7 @@ name=sqlite3-32 version=3.16.2 -release=2 +release=1 _version=$(printf "%i%.2i%.2i%.2i" ${version//./ }) source=(https://www.sqlite.org/2017/sqlite-autoconf-${_version}.tar.gz) @@ -16,7 +16,7 @@ build() { CONFIG_SHELL=/bin/bash \ CFLAGS="-DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 \ -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 -DSQLITE_ENABLE_DBSTAT_VTAB=1 \ - -DSQLITE_ENABLE_FTS3=1 $CFLAGS" \ + $CFLAGS" \ ./configure --prefix=/usr --libdir=/usr/lib32 --enable-readline make diff --git a/talloc-32/Pkgfile b/talloc-32/Pkgfile index 4d1ada2..e4ae997 100644 --- a/talloc-32/Pkgfile +++ b/talloc-32/Pkgfile @@ -1,12 +1,12 @@ # Description: Hierarchical, reference counted memory pool system with destructors -# URL: https://talloc.samba.org/ +# URL: http://talloc.samba.org/ # Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu # Depends on: python-32 talloc name=talloc-32 version=2.1.8 release=1 -source=(https://samba.org/ftp/talloc/talloc-$version.tar.gz) +source=(http://samba.org/ftp/talloc/talloc-$version.tar.gz) build() { cd talloc-$version