summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/allegro4/PKGBUILD6
-rw-r--r--extra/fetchmail/PKGBUILD20
-rw-r--r--extra/fetchmail/fetchmail.install6
-rw-r--r--extra/fetchmail/fetchmail.rc6
-rw-r--r--extra/fetchmail/fetchmail.service12
-rw-r--r--extra/fetchmail/fetchmail.tmpfiles1
-rw-r--r--extra/gcc4.6/PKGBUILD95
-rw-r--r--extra/gcc4.6/gcc-4.6.2-cloog-0.17.patch36
-rw-r--r--extra/gcc4.6/gcc-hash-style-both.patch122
-rw-r--r--extra/gcc4.6/gcc_pure64.patch26
-rw-r--r--extra/git/PKGBUILD8
-rw-r--r--extra/icu/PKGBUILD16
-rw-r--r--extra/maxima/PKGBUILD6
-rw-r--r--extra/rsync/PKGBUILD37
-rw-r--r--extra/rsync/rsyncd10
-rw-r--r--extra/rsync/rsyncd.conf10
-rw-r--r--extra/rsync/rsyncd.service10
-rw-r--r--extra/sbcl/PKGBUILD9
-rw-r--r--extra/scummvm/PKGBUILD20
19 files changed, 370 insertions, 86 deletions
diff --git a/extra/allegro4/PKGBUILD b/extra/allegro4/PKGBUILD
index eae85013f..203d0b3a5 100644
--- a/extra/allegro4/PKGBUILD
+++ b/extra/allegro4/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 140690 2011-10-18 03:46:10Z eric $
+# $Id: PKGBUILD 161080 2012-06-08 01:31:13Z ibiru $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
# Contributor: arjan <arjan@archlinux.org>
pkgname=allegro4
pkgver=4.4.2
-pkgrel=1
+pkgrel=2
pkgdesc="Portable library mainly aimed at video game and multimedia programming (legacy version)"
arch=('i686' 'x86_64')
url="http://alleg.sourceforge.net/"
license=('custom')
depends=('sh' 'jack' 'libxpm' 'libxxf86vm' 'libxxf86dga' 'libxcursor')
-makedepends=('cmake' 'libpng')
+makedepends=('cmake' 'libpng' 'mesa')
source=(http://downloads.sourceforge.net/alleg/allegro-${pkgver}.tar.gz
LICENSE)
md5sums=('4db71b0460fc99926ae91d223199c2e6'
diff --git a/extra/fetchmail/PKGBUILD b/extra/fetchmail/PKGBUILD
index 7dcccc1c7..84c734b5b 100644
--- a/extra/fetchmail/PKGBUILD
+++ b/extra/fetchmail/PKGBUILD
@@ -1,9 +1,8 @@
-# $Id: PKGBUILD 153691 2012-03-18 02:01:54Z eric $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
+# $Id: PKGBUILD 160935 2012-06-07 06:29:24Z pierre $
pkgname=fetchmail
pkgver=6.3.21
-pkgrel=3
+pkgrel=4
pkgdesc="A remote-mail retrieval utility"
arch=('i686' 'x86_64')
url="http://fetchmail.berlios.de/"
@@ -14,13 +13,16 @@ optdepends=('tk: for using fetchmailconf'
'python2: for using fetchmailconf')
backup=('etc/conf.d/fetchmail')
options=('!makeflags')
-install=fetchmail.install
-source=(http://downloads.sourceforge.net/$pkgname.berlios/${pkgname}-${pkgver}.tar.xz{,.asc}
- fetchmail.rc fetchmail.conf)
+install='fetchmail.install'
+source=("http://downloads.sourceforge.net/$pkgname.berlios/${pkgname}-${pkgver}.tar.xz"
+ "http://downloads.sourceforge.net/$pkgname.berlios/${pkgname}-${pkgver}.tar.xz.asc"
+ 'fetchmail.rc' 'fetchmail.conf' 'fetchmail.tmpfiles' 'fetchmail.service')
sha1sums=('4f1e5f2e1a616d4007da1de9c976c2c1fb5dcb81'
'bc8c68ec0d71b97d3168981cbaa4b04ab8e56059'
- '910ec21ad0a619db67e4665189dc46d2a0634ea5'
- '30401729386d6f774c6c36ab8530842166de54a8')
+ 'fc25180f1add26df0a3bdaac03fd9d2e3473ff88'
+ '30401729386d6f774c6c36ab8530842166de54a8'
+ '199ba749c829f22286c34aabcf8b7dd5bbd7c0e6'
+ '11ff81fc8363a54099880da18634b0d1ecf9fa82')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -35,4 +37,6 @@ package() {
install -Dm755 "${srcdir}/fetchmail.rc" "${pkgdir}/etc/rc.d/fetchmail"
install -Dm644 "${srcdir}/fetchmail.conf" "${pkgdir}/etc/conf.d/fetchmail"
install -d -o 90 -g nobody "${pkgdir}/var/lib/fetchmail"
+ install -D -m644 ${srcdir}/fetchmail.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/fetchmail.conf
+ install -D -m644 ${srcdir}/fetchmail.service ${pkgdir}/usr/lib/systemd/system/fetchmail.service
}
diff --git a/extra/fetchmail/fetchmail.install b/extra/fetchmail/fetchmail.install
index 0b1cc6ae3..81b374c57 100644
--- a/extra/fetchmail/fetchmail.install
+++ b/extra/fetchmail/fetchmail.install
@@ -4,6 +4,9 @@ post_install() {
echo "then 'chown fetchmail /etc/fetchmailrc'"
getent passwd fetchmail >/dev/null || usr/sbin/useradd -u 90 -g nobody \
-d '/var/lib/fetchmail' -c 'Fetchmail daemon' -s /bin/false fetchmail
+ if [[ ! -d run/fetchmail ]]; then
+ usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/fetchmail.conf
+ fi
}
post_upgrade() {
@@ -13,6 +16,9 @@ post_upgrade() {
if [ "$(vercmp $2 6.3.19-3)" -lt 0 ] ; then
usermod -d '/var/lib/fetchmail' -s /bin/false fetchmail
fi
+ if [[ ! -d run/fetchmail ]]; then
+ usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/fetchmail.conf
+ fi
}
pre_remove() {
diff --git a/extra/fetchmail/fetchmail.rc b/extra/fetchmail/fetchmail.rc
index 6d453a223..4d8b98d40 100644
--- a/extra/fetchmail/fetchmail.rc
+++ b/extra/fetchmail/fetchmail.rc
@@ -2,15 +2,14 @@
. /etc/rc.conf
. /etc/rc.d/functions
-[ -f /etc/conf.d/fetchmail ] && . /etc/conf.d/fetchmail
+. /etc/conf.d/fetchmail
PID=`pidof -o %PPID /usr/bin/fetchmail`
case "$1" in
start)
stat_busy "Starting fetchmail"
- [ ! -d /var/run/fetchmail ] && install -d -o fetchmail -g nobody -m700 /var/run/fetchmail
[ -z "$PID" ] &&
- su -c "/usr/bin/fetchmail -d $INTERVAL -f $CONFIG" -s /bin/sh fetchmail
+ su -c "/usr/bin/fetchmail -d $INTERVAL -f $CONFIG" -s /bin/sh fetchmail
if [ $? -gt 0 ]; then
stat_fail
else
@@ -24,7 +23,6 @@ case "$1" in
if [ $? -gt 0 ]; then
stat_fail
else
- rm -f /var/run/fetchmail.pid
rm_daemon fetchmail
stat_done
fi
diff --git a/extra/fetchmail/fetchmail.service b/extra/fetchmail/fetchmail.service
new file mode 100644
index 000000000..3e7da7545
--- /dev/null
+++ b/extra/fetchmail/fetchmail.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=A remote-mail retrieval utility
+After=network.target
+
+[Service]
+User=fetchmail
+EnvironmentFile=/etc/conf.d/fetchmail
+ExecStart=/usr/bin/fetchmail -d ${INTERVAL} -f ${CONFIG}
+RestartSec=1
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/fetchmail/fetchmail.tmpfiles b/extra/fetchmail/fetchmail.tmpfiles
new file mode 100644
index 000000000..07945f876
--- /dev/null
+++ b/extra/fetchmail/fetchmail.tmpfiles
@@ -0,0 +1 @@
+d /run/fetchmail 700 fetchmail nobody
diff --git a/extra/gcc4.6/PKGBUILD b/extra/gcc4.6/PKGBUILD
new file mode 100644
index 000000000..81e8f4670
--- /dev/null
+++ b/extra/gcc4.6/PKGBUILD
@@ -0,0 +1,95 @@
+# $Id: PKGBUILD 161082 2012-06-08 01:43:52Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Allan McRae <allan@archlinux.org>
+
+pkgname=gcc4.6
+pkgver=4.6.3
+_ver=${pkgver:0:3}
+pkgrel=1
+pkgdesc="The GNU Compiler Collection ($_ver; C and C++)"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL' 'custom')
+url="http://gcc.gnu.org"
+depends=('glibc' 'binutils' 'gmp' 'mpfr' 'libmpc' 'ppl' 'isl' 'cloog')
+makedepends=('flex' 'bison')
+checkdepends=('dejagnu')
+options=('!libtool' '!emptydirs')
+source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
+ gcc_pure64.patch
+ gcc-hash-style-both.patch
+ gcc-4.6.2-cloog-0.17.patch)
+md5sums=('773092fe5194353b02bb0110052a972e'
+ '4030ee1c08dd1e843c0225b772360e76'
+ '4df25b623799b148a0703eaeec8fdf3f'
+ '6d9939a2e667376031679ac9f9c49263')
+
+build() {
+ cd gcc-$pkgver
+
+ # Do not install libiberty
+ sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
+
+ # Do not run fixincludes
+ sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
+
+ if [ "${CARCH}" = "x86_64" ]; then
+ patch -p1 -i ${srcdir}/gcc_pure64.patch
+ fi
+ patch -p0 -i ${srcdir}/gcc-hash-style-both.patch
+
+ # compatibility with latest cloog
+ patch -p1 -i ${srcdir}/gcc-4.6.2-cloog-0.17.patch
+
+ echo ${pkgver} > gcc/BASE-VER
+
+ cd ..
+ mkdir gcc-build
+ cd gcc-build
+
+ ../gcc-$pkgver/configure --prefix=/usr \
+ --libdir=/usr/lib --libexecdir=/usr/lib \
+ --mandir=/usr/share/man --infodir=/usr/share/info \
+ --datadir=/usr/share/gcc-$_ver \
+ --with-bugurl=https://bugs.archlinux.org/ \
+ --enable-languages=c,c++,lto \
+ --enable-shared --enable-threads=posix \
+ --with-system-zlib --enable-__cxa_atexit \
+ --disable-libunwind-exceptions --enable-clocale=gnu \
+ --disable-libstdcxx-pch --enable-libstdcxx-time \
+ --enable-gnu-unique-object --enable-linker-build-id \
+ --with-ppl --enable-cloog-backend=isl \
+ --enable-lto --enable-gold --enable-ld=default \
+ --enable-plugin --with-plugin-ld=ld.gold \
+ --disable-multilib --disable-libssp \
+ --enable-checking=release \
+ --program-suffix=-$_ver \
+ --enable-version-specific-runtime-libs
+
+ make
+}
+
+check() {
+ # increase stack size to prevent test failures
+ # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827
+ ulimit -s 32768
+
+ # do not abort on error as some are "expected"
+ make -C gcc-build -k check || true
+ gcc-$pkgver/contrib/test_summary
+}
+
+package()
+{
+ make -j1 -C gcc-build DESTDIR=${pkgdir} install
+
+ # Install Runtime Library Exception
+ install -Dm644 gcc-$pkgver/COPYING.RUNTIME \
+ $pkgdir/usr/share/licenses/$pkgname/RUNTIME.LIBRARY.EXCEPTION
+
+ # deal with conflicting man and info pages
+ cd $pkgdir
+ rm usr/share/man/man7/{fsf-funding,gfdl,gpl}.7
+ for i in usr/share/info/*; do
+ mv $i ${i%.info}-$_ver.info
+ done
+}
diff --git a/extra/gcc4.6/gcc-4.6.2-cloog-0.17.patch b/extra/gcc4.6/gcc-4.6.2-cloog-0.17.patch
new file mode 100644
index 000000000..0503a05ed
--- /dev/null
+++ b/extra/gcc4.6/gcc-4.6.2-cloog-0.17.patch
@@ -0,0 +1,36 @@
+diff -Naur gcc-4.6-20120120-orig/configure gcc-4.6-20120120/configure
+--- gcc-4.6-20120120-orig/configure 2011-12-18 20:03:44.000000000 +1000
++++ gcc-4.6-20120120/configure 2012-02-03 17:55:14.885990135 +1000
+@@ -6049,8 +6049,8 @@
+ LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}"
+
+ if test "${cloog_org}" = yes ; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5
+-$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17 of CLooG" >&5
++$as_echo_n "checking for version 0.17 of CLooG... " >&6; }
+ if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+@@ -6061,8 +6061,7 @@
+ main ()
+ {
+ #if CLOOG_VERSION_MAJOR != 0 \
+- || CLOOG_VERSION_MINOR != 16 \
+- || CLOOG_VERSION_REVISION < 1
++ || CLOOG_VERSION_MINOR != 17
+ choke me
+ #endif
+ ;
+diff -Naur gcc-4.6-20120120-orig/gcc/graphite-clast-to-gimple.c gcc-4.6-20120120/gcc/graphite-clast-to-gimple.c
+--- gcc-4.6-20120120-orig/gcc/graphite-clast-to-gimple.c 2011-03-13 08:05:38.000000000 +1000
++++ gcc-4.6-20120120/gcc/graphite-clast-to-gimple.c 2012-02-03 17:51:47.943463879 +1000
+@@ -1367,7 +1367,7 @@
+ /* Change cloog output language to C. If we do use FORTRAN instead, cloog
+ will stop e.g. with "ERROR: unbounded loops not allowed in FORTRAN.", if
+ we pass an incomplete program to cloog. */
+- options->language = LANGUAGE_C;
++ options->language = CLOOG_LANGUAGE_C;
+
+ /* Enable complex equality spreading: removes dummy statements
+ (assignments) in the generated code which repeats the
diff --git a/extra/gcc4.6/gcc-hash-style-both.patch b/extra/gcc4.6/gcc-hash-style-both.patch
new file mode 100644
index 000000000..8b59f4535
--- /dev/null
+++ b/extra/gcc4.6/gcc-hash-style-both.patch
@@ -0,0 +1,122 @@
+--- gcc/config/alpha/linux-elf.h.orig 2010-12-09 23:27:07.000000000 +1000
++++ gcc/config/alpha/linux-elf.h 2011-03-11 10:01:47.770000457 +1000
+@@ -41,7 +41,7 @@
+
+ #define ELF_DYNAMIC_LINKER LINUX_DYNAMIC_LINKER
+
+-#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \
++#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax} \
+ %{O*:-O3} %{!O*:-O1} \
+ %{shared:-shared} \
+ %{!shared: \
+--- gcc/config/i386/linux64.h.orig 2011-03-03 08:35:36.000000000 +1000
++++ gcc/config/i386/linux64.h 2011-03-11 10:01:47.770000457 +1000
+@@ -78,7 +78,7 @@
+ %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}"
+
+ #undef LINK_SPEC
+-#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \
++#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \
+ %{shared:-shared} \
+ %{!shared: \
+ %{!static: \
+--- gcc/config/i386/linux.h.orig 2011-01-15 04:45:06.000000000 +1000
++++ gcc/config/i386/linux.h 2011-03-11 10:01:47.770000457 +1000
+@@ -104,7 +104,7 @@
+ { "dynamic_linker", LINUX_DYNAMIC_LINKER }
+
+ #undef LINK_SPEC
+-#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
++#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \
+ %{!shared: \
+ %{!static: \
+ %{rdynamic:-export-dynamic} \
+--- gcc/config/ia64/linux.h.orig 2010-12-09 23:27:07.000000000 +1000
++++ gcc/config/ia64/linux.h 2011-03-11 10:01:47.770000457 +1000
+@@ -64,7 +64,7 @@
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
+
+ #undef LINK_SPEC
+-#define LINK_SPEC "\
++#define LINK_SPEC "--hash-style=both \
+ %{shared:-shared} \
+ %{!shared: \
+ %{!static: \
+--- gcc/config/rs6000/linux64.h.orig 2011-02-11 03:30:10.000000000 +1000
++++ gcc/config/rs6000/linux64.h 2011-03-11 10:03:34.280000457 +1000
+@@ -389,11 +389,11 @@
+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
+
+
+-#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
++#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
+ %{rdynamic:-export-dynamic} \
+ -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}"
+
+-#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
++#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \
+ %{rdynamic:-export-dynamic} \
+ -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}"
+
+--- gcc/config/rs6000/sysv4.h.orig 2011-01-28 04:36:03.000000000 +1000
++++ gcc/config/rs6000/sysv4.h 2011-03-11 10:01:47.773333792 +1000
+@@ -830,7 +830,7 @@
+ #define LINUX_DYNAMIC_LINKER \
+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
+
+-#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
++#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
+ %{rdynamic:-export-dynamic} \
+ -dynamic-linker " LINUX_DYNAMIC_LINKER "}}"
+
+--- gcc/config/s390/linux.h.orig 2010-12-09 23:27:07.000000000 +1000
++++ gcc/config/s390/linux.h 2011-03-11 10:01:47.770000457 +1000
+@@ -77,7 +77,7 @@
+
+ #undef LINK_SPEC
+ #define LINK_SPEC \
+- "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
++ "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \
+ %{shared:-shared} \
+ %{!shared: \
+ %{static:-static} \
+--- gcc/config/sparc/linux64.h.orig 2011-02-17 23:57:21.000000000 +1000
++++ gcc/config/sparc/linux64.h 2011-03-11 10:01:47.770000457 +1000
+@@ -113,7 +113,7 @@
+ { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \
+ { "link_arch", LINK_ARCH_SPEC },
+
+-#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
++#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \
+ %{!shared: \
+ %{!static: \
+ %{rdynamic:-export-dynamic} \
+@@ -121,7 +121,7 @@
+ %{static:-static}} \
+ "
+
+-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
++#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
+ %{!shared: \
+ %{!static: \
+ %{rdynamic:-export-dynamic} \
+@@ -193,7 +193,7 @@
+ #else /* !SPARC_BI_ARCH */
+
+ #undef LINK_SPEC
+-#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
++#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
+ %{!shared: \
+ %{!static: \
+ %{rdynamic:-export-dynamic} \
+--- gcc/config/sparc/linux.h.orig 2011-01-27 06:30:12.000000000 +1000
++++ gcc/config/sparc/linux.h 2011-03-11 10:01:47.770000457 +1000
+@@ -74,7 +74,7 @@
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+
+ #undef LINK_SPEC
+-#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
++#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \
+ %{!mno-relax:%{!r:-relax}} \
+ %{!shared: \
+ %{!static: \
diff --git a/extra/gcc4.6/gcc_pure64.patch b/extra/gcc4.6/gcc_pure64.patch
new file mode 100644
index 000000000..8c0baf8e2
--- /dev/null
+++ b/extra/gcc4.6/gcc_pure64.patch
@@ -0,0 +1,26 @@
+diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h
+--- gcc-4.2.0.orig/gcc/config/i386/linux64.h 2007-05-16 19:21:19.000000000 -0400
++++ gcc-4.2.0/gcc/config/i386/linux64.h 2007-05-18 17:04:05.000000000 -0400
+@@ -49,8 +49,8 @@
+ When the -shared link option is used a final link is not being
+ done. */
+
+-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
++#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
+
+ #undef LINK_SPEC
+ #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
+diff -Naur gcc-4.2.0.orig/gcc/config/i386/t-linux64 gcc-4.2.0/gcc/config/i386/t-linux64
+--- gcc-4.2.0.orig/gcc/config/i386/t-linux64 2007-05-16 19:21:19.000000000 -0400
++++ gcc-4.2.0/gcc/config/i386/t-linux64 2007-05-18 17:04:36.000000000 -0400
+@@ -6,7 +6,7 @@
+
+ MULTILIB_OPTIONS = m64/m32
+ MULTILIB_DIRNAMES = 64 32
+-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
++MULTILIB_OSDIRNAMES = ../lib ../lib32
+
+ LIBGCC = stmp-multilib
+ INSTALL_LIBGCC = install-multilib
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index c5e0f1725..9935cff89 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 160199 2012-05-30 18:30:33Z dan $
+# $Id: PKGBUILD 160963 2012-06-07 14:20:24Z dan $
# Maintainer: Dan McGee <dan@archlinux.org>
pkgname=git
-pkgver=1.7.10.3
+pkgver=1.7.10.4
pkgrel=1
pkgdesc="the fast distributed version control system"
arch=(i686 x86_64)
@@ -99,7 +99,7 @@ package() {
install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf
}
-sha1sums=('172c6ad5a55276213c5e40b83a4c270f6f931b3e'
- '4ae4f9f0f0dc42ad5cb2de309049c953841bc413'
+sha1sums=('ddc305ab520246790faa72bbaab4b9bf5bcf23fa'
+ '0769f6ff48d89df908cfe2af85fb4072b4178746'
'f2b41828bd912b72e2cb3e14677739c4f370de66'
'149e2da1ecb48872ddb31c0945afeaad1f9653d7')
diff --git a/extra/icu/PKGBUILD b/extra/icu/PKGBUILD
index 7e166f46a..95b0fabaa 100644
--- a/extra/icu/PKGBUILD
+++ b/extra/icu/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 159211 2012-05-18 09:16:01Z andyrtr $
+# $Id: PKGBUILD 160960 2012-06-07 13:35:03Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Art Gramlich <art@gramlich-net.com>
pkgname=icu
-pkgver=49.1.1
-pkgrel=2
+pkgver=49.1.2
+pkgrel=1
pkgdesc="International Components for Unicode library"
arch=(i686 x86_64)
url="http://www.icu-project.org/"
@@ -12,18 +12,14 @@ license=('custom:"icu"')
depends=('gcc-libs' 'sh')
source=(#http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver/./_}-src.tgz
http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz
- icu.8198.revert.icu5431.patch
- fix_broken_regex.diff)
-md5sums=('7c53f83e0327343f4060c0eb83842daf'
- 'ebd5470fc969c75e52baf4af94a9ee82'
- '5bbcd600fdf9b35cbd89a06cab522f3f')
+ icu.8198.revert.icu5431.patch)
+md5sums=('bbc609fe5237202d7abf016141012a45'
+ 'ebd5470fc969c75e52baf4af94a9ee82')
build() {
cd ${srcdir}/icu/source
# fix Malayalam encoding https://bugzilla.redhat.com/show_bug.cgi?id=654200
patch -Rp3 -i ${srcdir}/icu.8198.revert.icu5431.patch
- # patch broken regex - https://bugs.archlinux.org/task/29700 / http://bugs.icu-project.org/trac/ticket/9276
- patch -Np0 -i ${srcdir}/fix_broken_regex.diff
./configure --prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man
diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD
index 68d84bce6..8a51ba1b6 100644
--- a/extra/maxima/PKGBUILD
+++ b/extra/maxima/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 159253 2012-05-19 18:59:08Z ronald $
+# $Id: PKGBUILD 160970 2012-06-07 18:26:20Z juergen $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Damir Perisa <damir@archlinux.org>
pkgname=maxima
pkgver=5.27.0
-pkgrel=1
+pkgrel=2
pkgdesc="Maxima - a sophisticated computer algebra system"
arch=('i686' 'x86_64')
license=('GPL')
url="http://maxima.sourceforge.net"
-depends=('sbcl=1.0.56' 'texinfo' 'sh')
+depends=('sbcl=1.0.57' 'texinfo' 'sh')
makedepends=('python2')
optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface')
# needs rebuild when bash changes version
diff --git a/extra/rsync/PKGBUILD b/extra/rsync/PKGBUILD
index 852af0156..122453775 100644
--- a/extra/rsync/PKGBUILD
+++ b/extra/rsync/PKGBUILD
@@ -1,42 +1,39 @@
-# $Id: PKGBUILD 149915 2012-02-11 20:09:00Z ibiru $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+# $Id: PKGBUILD 160933 2012-06-07 05:56:33Z pierre $
+
pkgname=rsync
pkgver=3.0.9
-pkgrel=2
+pkgrel=3
pkgdesc="A file transfer program to keep remote files in sync"
arch=('i686' 'x86_64')
url="http://samba.anu.edu.au/rsync/"
license=('GPL3')
-depends=('acl')
+depends=('perl')
backup=('etc/rsyncd.conf' 'etc/xinetd.d/rsync')
-changelog=ChangeLog
-source=(http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz \
- rsyncd.conf rsyncd rsync.xinetd)
+source=("http://rsync.samba.org/ftp/rsync/$pkgname-$pkgver.tar.gz"
+ 'rsyncd.conf' 'rsyncd' 'rsync.xinetd' 'rsyncd.service')
md5sums=('5ee72266fe2c1822333c407e1761b92b'
- '4395c0591638349b1a7aeaaa4da1f03a'
- '7a9ce3b5de97f3aae29b906f93e1d157'
- 'ea3e9277dc908bc51f9eddc0f6b935c1')
-sha1sums=('c64c8341984aea647506eb504496999fd968ddfc'
- '48be09294134dfed888818872fe552a59c29147a'
- 'eda623c31d9def454cf8e3e88dcf63de4ca5c08b'
- 'fdb99785bc87ee13d77aa90dc1804f3f75dd7fc1')
+ 'bce64d122a8e0f86872a4a21a03bc7f3'
+ 'ba413da4ebca05c57860151fda21efbc'
+ 'ea3e9277dc908bc51f9eddc0f6b935c1'
+ 'ec96f9089d71109557cdcaa3f0633ed6')
build() {
cd "$srcdir/$pkgname-$pkgver"
- ./prepare-source
- ./configure --prefix=/usr --with-included-popt \
- --enable-acl-support --enable-xattr-support
+ ./configure --prefix=/usr --with-included-popt
make
}
+check() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make test
+}
+
package() {
cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
install -Dm755 ../rsyncd "$pkgdir/etc/rc.d/rsyncd"
install -Dm644 ../rsyncd.conf "$pkgdir/etc/rsyncd.conf"
install -Dm644 ../rsync.xinetd "$pkgdir/etc/xinetd.d/rsync"
+ install -Dm644 ../rsyncd.service "$pkgdir/usr/lib/systemd/system/rsyncd.service"
install -Dm755 support/rrsync "$pkgdir/usr/lib/rsync/rrsync"
}
diff --git a/extra/rsync/rsyncd b/extra/rsync/rsyncd
index d7a772e8e..27836d5c4 100644
--- a/extra/rsync/rsyncd
+++ b/extra/rsync/rsyncd
@@ -5,26 +5,20 @@
[ -f /etc/conf.d/rsyncd ] && . /etc/conf.d/rsyncd
-function call_rsyncd() {
- /usr/bin/rsync --daemon $RSYNCD_ARGS
-}
-
case "$1" in
start)
stat_busy "Starting rsyncd"
- [ ! -f /var/run/daemons/rsyncd ] && call_rsyncd
+ [ ! -f /run/daemons/rsyncd ] && /usr/bin/rsync --daemon $RSYNCD_ARGS
if [ $? -gt 0 ]; then
stat_fail
else
- #pgrep -of "/usr/bin/rsync --daemon" > /var/run/rsyncd.pid # Removed FS#20942
add_daemon rsyncd
stat_done
fi
;;
-
stop)
stat_busy "Stopping rsyncd"
- [ -f /var/run/rsyncd.pid ] && kill `cat /var/run/rsyncd.pid`
+ [ -f /run/rsyncd.pid ] && kill `cat /run/rsyncd.pid`
if [ $? -gt 0 ]; then
stat_fail
else
diff --git a/extra/rsync/rsyncd.conf b/extra/rsync/rsyncd.conf
index f7161f3f8..152106091 100644
--- a/extra/rsync/rsyncd.conf
+++ b/extra/rsync/rsyncd.conf
@@ -3,14 +3,8 @@ gid = nobody
use chroot = no
max connections = 4
syslog facility = local5
-pid file = /var/run/rsyncd.pid
+pid file = /run/rsyncd.pid
[ftp]
- path = /home/ftp
+ path = /srv/ftp
comment = ftp area
-
-#[cvs]
-# path = /data/cvs
-# comment = CVS repository (requires authentication)
-# auth users = tridge, susan
-# secrets file = /etc/rsyncd.secrets
diff --git a/extra/rsync/rsyncd.service b/extra/rsync/rsyncd.service
new file mode 100644
index 000000000..ea2e32c68
--- /dev/null
+++ b/extra/rsync/rsyncd.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=A file transfer program to keep remote files in sync
+
+[Service]
+EnvironmentFile=-/etc/conf.d/rsyncd
+ExecStart=/usr/bin/rsync --daemon --no-detach ${RSYNCD_ARGS}
+RestartSec=1
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD
index 11f8b1388..28481c93e 100644
--- a/extra/sbcl/PKGBUILD
+++ b/extra/sbcl/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 156088 2012-04-13 11:09:01Z juergen $
+# $Id: PKGBUILD 160967 2012-06-07 17:45:43Z juergen $
# Contributor: John Proctor <jproctor@prium.net>
# Contributor: Daniel White <daniel@whitehouse.id.au>
# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
# Contributor: Leslie Polzer (skypher)
pkgname=sbcl
-pkgver=1.0.56
+pkgver=1.0.57
pkgrel=1
pkgdesc="Steel Bank Common Lisp"
url="http://www.sbcl.org/"
arch=('i686' 'x86_64')
license=('custom')
depends=('glibc')
-provides=('common-lisp' 'cl-asdf')
+provides=('common-lisp' 'cl-asdf' 'zlib')
makedepends=('sbcl' 'texinfo')
install=sbcl.install
source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2"
"arch-fixes.lisp")
-md5sums=('f9ba54b20f057e6eb5857929bb259142'
+md5sums=('bb0e4f5c2dad3491802197525283f6b0'
'7ac0c1936547f4278198b8bf7725204d')
build() {
@@ -36,6 +36,7 @@ build() {
(flet ((enable (x) (pushnew x features))
(disable (x) (setf features (remove x features))))
(enable :sb-thread)
+ (enable :sb-core-compression)
(disable :largefile)))
EOF
diff --git a/extra/scummvm/PKGBUILD b/extra/scummvm/PKGBUILD
index ba4ce0a76..b325b36ad 100644
--- a/extra/scummvm/PKGBUILD
+++ b/extra/scummvm/PKGBUILD
@@ -1,37 +1,29 @@
-# $Id: PKGBUILD 150218 2012-02-15 08:08:05Z juergen $
+# $Id: PKGBUILD 160951 2012-06-07 12:29:27Z juergen $
# Maintainer: juergen <juergen@archlinux.org>
# Contributor: Manolis Tzanidakis, Petter Gundersen
pkgname=scummvm
pkgver=1.4.1
-pkgrel=1
+pkgrel=2
pkgdesc="A 'virtual machine' for several classic graphical point-and-click adventure games."
arch=('i686' 'x86_64')
license=('GPL')
url="http://www.scummvm.org/"
-depends=('libmad' 'sdl' 'fluidsynth')
+depends=('libmad' 'sdl' 'fluidsynth' 'flac' 'faad2' 'libvorbis' 'libmad')
source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
md5sums=('aa094c2224aad22d5340a1d2d919c883')
build() {
cd "${srcdir}"/${pkgname}-${pkgver}
- ./configure --backend=sdl --disable-debug \
- --with-flac-prefix=/usr \
- --with-fluidsynth-prefix=/usr \
- --disable-faad \
+ ./configure --disable-debug \
+ --enable-release \
--prefix=/usr
make
}
package() {
cd "${srcdir}"/${pkgname}-${pkgver}
- install -Dm755 scummvm "${pkgdir}"/usr/bin/scummvm
- install -Dm644 dists/scummvm.6 "${pkgdir}"/usr/share/man/man6/scummvm.6
- # fixes FS#9118
+ make DESTDIR=$startdir/pkg install
install -Dm644 dists/${pkgname}.desktop \
"${pkgdir}"/usr/share/applications/${pkgname}.desktop
- install -Dm644 icons/scummvm.xpm \
- "${pkgdir}"/usr/share/pixmaps/scummvm.xpm
-
- install -Dm644 gui/themes/scummmodern.zip "${pkgdir}"/usr/share/scummvm/scummmodern.zip
}