Tue May 31 22:46:59 UTC 2011

6 files changed, 144 insertions, 14 deletions

diff --git a/libre/crosstool-ng/PKGBUILD b/libre/crosstool-ng/PKGBUILD
new file mode 100644
index 000000000..f7036e8ba
--- /dev/null
+++ b/libre/crosstool-ng/PKGBUILD
@@ -0,0 +1,29 @@
+# Contributor: jwwolf <jwwolf+arch@gmail.com>
+# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
+
+pkgname=crosstool-ng
+pkgver=1.11.3
+pkgrel=2
+pkgdesc="A versatile cross toolchain generator (eglibc addons patch)"
+arch=('i686' 'x86_64')
+url="http://crosstool-ng.org/"
+license=(GPL2)
+depends=('cvs')
+optdepends=('subversion: for retrieving eglibc sources')
+source=(http://crosstool-ng.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+        libc_ports_short_name.patch)
+md5sums=('3830cbdcc7e1a60c93caeaf98f718187'
+         '0a95af7e6ba35e02e38c71a3121b4448')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  patch -Np1 -i $srcdir/libc_ports_short_name.patch
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+}
diff --git a/libre/crosstool-ng/libc_ports_short_name.patch b/libre/crosstool-ng/libc_ports_short_name.patch
new file mode 100644
index 000000000..b511fa183
--- /dev/null
+++ b/libre/crosstool-ng/libc_ports_short_name.patch
@@ -0,0 +1,102 @@
+comparing with http://ymorin.is-a-geek.org/hg/crosstool-ng
+real URL is http://crosstool-ng.org/hg/crosstool-ng
+searching for changes
+changeset:   2482:a15a7b4ba12a
+tag:         libc_ports_short_name
+tag:         qbase
+tag:         qtip
+tag:         tip
+user:        "Nicolás Reynolds" <fauno@kiwwwi.com.ar>
+date:        Fri May 27 22:02:30 2011 -0300
+files:       scripts/build/libc/eglibc.sh scripts/build/libc/glibc.sh
+description:
+Fixes the issue with {e,}libc addons having short and long names (such as
+eglibc-ports-2_13 and ports), which caused configure scripts to run
+through them twice and thus configuring incorrectly.
+
+For instance, the mips64el-n32-linux-gnu toolchain would be recognized
+correctly first, but then the second pass would change it to mips32,
+building a mixed MIPS-III N32 and MIPS-I libc.
+
+
+diff -r 30644208c955 -r a15a7b4ba12a scripts/build/libc/eglibc.sh
+--- a/scripts/build/libc/eglibc.sh	Thu May 26 22:51:03 2011 +0200
++++ b/scripts/build/libc/eglibc.sh	Fri May 27 22:02:30 2011 -0300
+@@ -103,25 +103,36 @@
+     CT_Extract "eglibc-${CT_LIBC_VERSION}"
+     CT_Patch "eglibc" "${CT_LIBC_VERSION}"
+ 
+-    # C library addons
++    # C library addons 
+     for addon in $(do_libc_add_ons_list " "); do
+         # NPTL addon is not to be extracted, in any case
+         [ "${addon}" = "nptl" ] && continue || true
+         CT_Pushd "${CT_SRC_DIR}/eglibc-${CT_LIBC_VERSION}"
+         CT_Extract nochdir "eglibc-${addon}-${CT_LIBC_VERSION}"
++
++        CT_TestAndAbort "Error in add-on '${addon}': both short and long names in tarball" \ 
++            -d "${addon}" -a -d "eglibc-${addon}-${CT_LIBC_VERSION}"
++
+         # Some addons have the 'long' name, while others have the
+         # 'short' name, but patches are non-uniformly built with
+         # either the 'long' or 'short' name, whatever the addons name
+-        # so we have to make symlinks from the existing to the missing
+-        # Fortunately for us, [ -d foo ], when foo is a symlink to a
+-        # directory, returns true!
+-        [ -d "${addon}" ] || ln -s "eglibc-${addon}-${CT_LIBC_VERSION}" "${addon}"
+-        [ -d "eglibc-${addon}-${CT_LIBC_VERSION}" ] || ln -s "${addon}" "eglibc-${addon}-${CT_LIBC_VERSION}"
++        # but we prefer the 'short' name and avoid duplicates.
++        if [ -d "eglibc-${addon}-${CT_LIBC_VERSION}" ]; then
++            mv "eglibc-${addon}-${CT_LIBC_VERSION}" "${addon}"
++        fi
++
++        ln -s "${addon}" "eglibc-${addon}-${CT_LIBC_VERSION}"
++
+         CT_Patch nochdir "eglibc" "${addon}-${CT_LIBC_VERSION}"
++
++        # Remove the long name since it can confuse configure scripts to run
++        # the same source twice.
++        rm "eglibc-${addon}-${CT_LIBC_VERSION}"
++
+         CT_Popd
+     done
+ 
+-    # The configure files may be older than the configure.in files
++    # The configure files may be older than the configure.in files 
+     # if using a snapshot (or even some tarballs). Fake them being
+     # up to date.
+     find "${CT_SRC_DIR}/eglibc-${CT_LIBC_VERSION}" -type f -name configure -exec touch {} \; 2>&1 |CT_DoLog ALL
+diff -r 30644208c955 -r a15a7b4ba12a scripts/build/libc/glibc.sh
+--- a/scripts/build/libc/glibc.sh	Thu May 26 22:51:03 2011 +0200
++++ b/scripts/build/libc/glibc.sh	Fri May 27 22:02:30 2011 -0300
+@@ -54,15 +54,24 @@
+         [ "${addon}" = "nptl" ] && continue || true
+         CT_Extract nochdir "glibc-${addon}-${CT_LIBC_VERSION}"
+ 
++        CT_TestAndAbort "Error in add-on '${addon}': both short and long names in tarball" \ 
++            -d "${addon}" -a -d "glibc-${addon}-${CT_LIBC_VERSION}"
++
+         # Some addons have the 'long' name, while others have the
+         # 'short' name, but patches are non-uniformly built with
+         # either the 'long' or 'short' name, whatever the addons name
+-        # so we have to make symlinks from the existing to the missing
+-        # Fortunately for us, [ -d foo ], when foo is a symlink to a
+-        # directory, returns true!
+-        [ -d "${addon}" ] || CT_DoExecLog ALL ln -s "glibc-${addon}-${CT_LIBC_VERSION}" "${addon}"
+-        [ -d "glibc-${addon}-${CT_LIBC_VERSION}" ] || CT_DoExecLog ALL ln -s "${addon}" "glibc-${addon}-${CT_LIBC_VERSION}"
++        # but we prefer the 'short' name and avoid duplicates.
++        if [ -d "glibc-${addon}-${CT_LIBC_VERSION}" ]; then
++            mv "glibc-${addon}-${CT_LIBC_VERSION}" "${addon}"
++        fi
++
++        ln -s "${addon}" "glibc-${addon}-${CT_LIBC_VERSION}"
++
+         CT_Patch nochdir "glibc" "${addon}-${CT_LIBC_VERSION}"
++
++        # Remove the long name since it can confuse configure scripts to run
++        # the same source twice.
++        rm "glibc-${addon}-${CT_LIBC_VERSION}"
+     done
+ 
+     # The configure files may be older than the configure.in files
+
diff --git a/libre/kernel26-libre-lts/PKGBUILD b/libre/kernel26-libre-lts/PKGBUILD
index f3588dc77..63d0d83da 100644
--- a/libre/kernel26-libre-lts/PKGBUILD
+++ b/libre/kernel26-libre-lts/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=('kernel26-libre-lts' 'kernel26-libre-lts-headers') # Build stock -lts k
 _kernelname=${pkgname#kernel26-libre}
 _basekernel=2.6.32
 _preset=kernel26-lts.preset
-pkgver=${_basekernel}.40
+pkgver=${_basekernel}.41
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -211,8 +211,8 @@ package_kernel26-libre-lts-headers() {
   # remove unneeded architectures
   rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa}
 }
-md5sums=('eabd563bea84785dd74f3f694162ca69'
+md5sums=('759ac16149fea3bca10a2d723c03e53a'
          '3298f542840c52a8b8abc1b3795e455b'
-         'f0fcf2ca389e8997a88963d70153a479'
+         'e9fd751f4e7c4bbce027aa83ea90202d'
          '2cbfeb3e2a18d45f82f613e97fc23355'
          'fbfc7a1af3208c7b729055d91e1c149a')
diff --git a/libre/kernel26-libre-lts/config b/libre/kernel26-libre-lts/config
index fa7600cfb..fcf978f36 100644
--- a/libre/kernel26-libre-lts/config
+++ b/libre/kernel26-libre-lts/config
@@ -4366,11 +4366,11 @@ CONFIG_CIFS=m
 CONFIG_CIFS_STATS=y
 # CONFIG_CIFS_STATS2 is not set
 CONFIG_CIFS_WEAK_PW_HASH=y
-# CONFIG_CIFS_UPCALL is not set
+CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
 # CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_DFS_UPCALL is not set
+CONFIG_CIFS_DFS_UPCALL=y
 # CONFIG_CIFS_EXPERIMENTAL is not set
 CONFIG_NCP_FS=m
 # CONFIG_NCPFS_PACKET_SIGNING is not set
diff --git a/libre/kernel26-libre-lts/config.x86_64 b/libre/kernel26-libre-lts/config.x86_64
index b0aadff4e..2202caeeb 100644
--- a/libre/kernel26-libre-lts/config.x86_64
+++ b/libre/kernel26-libre-lts/config.x86_64
@@ -4179,11 +4179,11 @@ CONFIG_CIFS=m
 CONFIG_CIFS_STATS=y
 # CONFIG_CIFS_STATS2 is not set
 CONFIG_CIFS_WEAK_PW_HASH=y
-# CONFIG_CIFS_UPCALL is not set
+CONFIG_CIFS_UPCALL=y
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
 # CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_DFS_UPCALL is not set
+CONFIG_CIFS_DFS_UPCALL=y
 # CONFIG_CIFS_EXPERIMENTAL is not set
 CONFIG_NCP_FS=m
 # CONFIG_NCPFS_PACKET_SIGNING is not set
diff --git a/libre/unarchiver/PKGBUILD b/libre/unarchiver/PKGBUILD
index dcab9e342..4a5cb737e 100644
--- a/libre/unarchiver/PKGBUILD
+++ b/libre/unarchiver/PKGBUILD
@@ -1,15 +1,14 @@
 # Maintainer: Cedric Girard <girard.cedric@gmail.com>
 pkgname=unarchiver
-pkgver=2.7
-pkgrel=2
+pkgver=2.7.1
+pkgrel=1
 pkgdesc="An Objective-C application for uncompressing archive files"
 arch=('x86_64' 'i686')
 url="http://wakaba.c3.cx/s/apps/unarchiver.html"
-license=('LGPL')
+license=('LGPL2.1')
 depends=('gnustep-base' 'openssl' 'bzip2' 'icu' 'gcc-libs' 'zlib')
 makedepends=('gcc-objc')
 source=(http://theunarchiver.googlecode.com/files/TheUnarchiver"$pkgver"_src.zip)
-md5sums=('c6aed2fcb2b68d86a9d9d4fc39c4ea41')
 replaces=('unrar')
 conflicts=('unrar')
 provides=('unrar')
@@ -18,14 +17,14 @@ build() {
   cd "$srcdir/The Unarchiver/XADMaster"
 
   . /usr/share/GNUstep/Makefiles/GNUstep.sh
-  make -f Makefile.linux unar lsar
+  make -f Makefile.linux
 }
 
 package() {
   cd "$srcdir/The Unarchiver/XADMaster"
   install -d "$pkgdir/usr/bin/"
-  install -m755 unar ${pkgdir}/usr/bin
-  install -m755 lsar ${pkgdir}/usr/bin
+  install -m755 unar lsar "$pkgdir/usr/bin/"
 }
 
 # vim:set ts=2 sw=2 et:
+md5sums=('498ea1c984d5783322e070a71922b422')