summaryrefslogtreecommitdiffstats
path: root/abs/extra
diff options
context:
space:
mode:
Diffstat (limited to 'abs/extra')
-rw-r--r--abs/extra/docbook-xsl/__changelog1
-rw-r--r--abs/extra/gd/ChangeLog11
-rw-r--r--abs/extra/gd/PKGBUILD25
-rw-r--r--abs/extra/gd/libpng14.patch12
-rw-r--r--abs/extra/java-sun/PKGBUILD123
-rw-r--r--abs/extra/java-sun/java-control-panel.desktop12
-rw-r--r--abs/extra/java-sun/java-monitoring-and-management-console.desktop9
-rw-r--r--abs/extra/java-sun/java-policy-settings.desktop10
-rw-r--r--abs/extra/java-sun/java-visualvm.desktop11
-rw-r--r--abs/extra/java-sun/java-web-start.desktop13
-rw-r--r--abs/extra/java-sun/jdk.install11
-rw-r--r--abs/extra/java-sun/jdk.profile4
-rw-r--r--abs/extra/java-sun/jre.install22
-rw-r--r--abs/extra/java-sun/jre.profile4
-rw-r--r--abs/extra/libdvdread/DVDFileStat.patch238
-rw-r--r--abs/extra/libdvdread/PKGBUILD36
-rw-r--r--abs/extra/libgksu/PKGBUILD36
-rw-r--r--abs/extra/libgksu/libgksu-2.0.12-revert-forkpty.patch359
-rw-r--r--abs/extra/libgtop/PKGBUILD25
-rw-r--r--abs/extra/opensp/PKGBUILD29
-rw-r--r--abs/extra/perl-dbd-mysql/PKGBUILD30
-rw-r--r--abs/extra/postgresql-libs/PKGBUILD136
-rw-r--r--abs/extra/postgresql-libs/build.patch11
-rwxr-xr-xabs/extra/postgresql-libs/postgresql59
-rw-r--r--abs/extra/postgresql-libs/postgresql.confd5
-rw-r--r--abs/extra/postgresql-libs/postgresql.logrotate4
-rw-r--r--abs/extra/postgresql-libs/postgresql.pam3
-rw-r--r--abs/extra/spidermonkey/PKGBUILD30
-rw-r--r--abs/extra/spidermonkey/header.patch12
-rw-r--r--abs/extra/spidermonkey/spidermonkey-Makefile.patch22
-rw-r--r--abs/extra/startup-notification/PKGBUILD17
31 files changed, 503 insertions, 817 deletions
diff --git a/abs/extra/docbook-xsl/__changelog b/abs/extra/docbook-xsl/__changelog
deleted file mode 100644
index a8b9cb0..0000000
--- a/abs/extra/docbook-xsl/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-update to 1.76.0
diff --git a/abs/extra/gd/ChangeLog b/abs/extra/gd/ChangeLog
new file mode 100644
index 0000000..813a49e
--- /dev/null
+++ b/abs/extra/gd/ChangeLog
@@ -0,0 +1,11 @@
+2010-01-17 Ionut Biru <ionut@archlinux.ro>
+
+ * gd 2.0.36RC1-2
+ * libpng 1.4.0/libjpeg 8 rebuild
+
+2009-10-30 Eric Belanger <eric@archlinux.org>
+
+ * gd 2.0.36RC1-1
+ * Upstream update
+ * Added perl depends
+ * Added ChangeLog
diff --git a/abs/extra/gd/PKGBUILD b/abs/extra/gd/PKGBUILD
index 3df77a1..4580855 100644
--- a/abs/extra/gd/PKGBUILD
+++ b/abs/extra/gd/PKGBUILD
@@ -1,23 +1,26 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
+# $Id: PKGBUILD 64437 2010-01-20 12:10:30Z ibiru $
# Maintainer: Eric Belanger <eric@archlinux.org>
pkgname=gd
-pkgver=2.0.35
-pkgrel=2
+pkgver=2.0.36RC1
+pkgrel=3
pkgdesc="Library for the dynamic creation of images by programmers"
arch=('i686' 'x86_64')
url="http://www.libgd.org/"
license=('custom')
-depends=('libpng>=1.2.16' 'fontconfig>=2.4.2' 'libjpeg')
+depends=('perl' 'libpng>=1.4.0' 'fontconfig' 'libjpeg>=8')
options=('!libtool')
-source=(http://www.libgd.org/releases/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('6c6c3dbb7bf079e0bb5fbbfd3bb8a71c')
-sha1sums=('ccf34a610abff2dbf133a20c4d2a4aa94939018a')
+source=(http://www.libgd.org/releases/${pkgname}-${pkgver}.tar.bz2 libpng14.patch)
+md5sums=('e876979ca3130623a4e7866d9579171a'
+ '7921556f4960e8d66cf4fb67ea7101b5')
build() {
- cd ${startdir}/src/${pkgname}-${pkgver}
- ./configure --prefix=/usr --without-xpm
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ patch -Np1 -i ${srcdir}/libpng14.patch || return 1
+
+ ./configure --prefix=/usr --without-xpm || return 1
make || return 1
- make DESTDIR=${startdir}/pkg install
- install -D -m644 COPYING $startdir/pkg/usr/share/licenses/$pkgname/COPYING
+ make DESTDIR="${pkgdir}" install || return 1
+ install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" || return 1
}
diff --git a/abs/extra/gd/libpng14.patch b/abs/extra/gd/libpng14.patch
new file mode 100644
index 0000000..19a3fda
--- /dev/null
+++ b/abs/extra/gd/libpng14.patch
@@ -0,0 +1,12 @@
+diff -Nur gd-2.0.36RC1.orig/gd_png.c gd-2.0.36RC1/gd_png.c
+--- gd-2.0.36RC1.orig/gd_png.c 2007-11-27 10:30:34.000000000 +0200
++++ gd-2.0.36RC1/gd_png.c 2010-01-17 17:14:11.000000000 +0200
+@@ -151,7 +151,7 @@
+ return NULL;
+ }
+
+- if (!png_check_sig (sig, 8)) { /* bad signature */
++ if (png_sig_cmp (sig, 0, 8)) { /* bad signature */
+ return NULL; /* bad signature */
+ }
+
diff --git a/abs/extra/java-sun/PKGBUILD b/abs/extra/java-sun/PKGBUILD
deleted file mode 100644
index b348f0d..0000000
--- a/abs/extra/java-sun/PKGBUILD
+++ /dev/null
@@ -1,123 +0,0 @@
-# $Id: PKGBUILD 22893 2010-07-31 09:47:07Z ibiru $
-# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
-# Contributor: Jason Chu <jason@archlinux.org>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Guillaume ALAUX <Guillaume at alaux dot net>
-
-pkgname=('jre' 'jdk')
-pkgbase=java-sun
-pkgver=6u21
-pkgrel=1
-pkgdesc="Sun/Oracle's implementation of tha Java 6 specification"
-arch=('i686' 'x86_64')
- [ "$CARCH" = "i686" ] && _arch=i586
- [ "$CARCH" = "x86_64" ] && _arch=amd64
-url="http://java.sun.com"
-license=('custom')
-makedepends=('java-runtime')
-source=(http://download.java.net/dlj/binaries/jdk-${pkgver}-dlj-linux-${_arch}.bin
- https://jdk-distros.dev.java.net/source/browse/*checkout*/jdk-distros/trunk/utils/construct.sh
- jdk.profile
- java-control-panel.desktop
- java-monitoring-and-management-console.desktop
- java-policy-settings.desktop
- java-visualvm.desktop
- java-web-start.desktop
- jre.profile)
-
-[ "$CARCH" = "i686" ] && md5sums=('b3fbbe55bafedb3f8f93e91d4e809390'
- '94065b612df0046d9ae758943f9f6a75'
- '7aaac9ec3e440b92361c6561ac00424a'
- 'e4d814c0f310d77ed6990c731bccd0fb'
- '4bc2b0be93f76ed07b471e3c89eb5a8a'
- '8e3cec7ab641ec449cabd068be583f5c'
- '9ba148ebabce8ed3351b813a9a66b6e5'
- '568451cf45fc8c7adb83a222a61ca2c6'
- '50b4f5ac4129097461d246645d73a622')
-[ "$CARCH" = "x86_64" ] && md5sums=('7961051f95c014a9b94ffe3e95ea66e6'
- '94065b612df0046d9ae758943f9f6a75'
- '7aaac9ec3e440b92361c6561ac00424a'
- 'e4d814c0f310d77ed6990c731bccd0fb'
- '4bc2b0be93f76ed07b471e3c89eb5a8a'
- '8e3cec7ab641ec449cabd068be583f5c'
- '9ba148ebabce8ed3351b813a9a66b6e5'
- '568451cf45fc8c7adb83a222a61ca2c6'
- '50b4f5ac4129097461d246645d73a622')
-
-build() {
- cd ${srcdir}
- mkdir unbundle-jdk
- cd unbundle-jdk
- sh ../jdk-${pkgver}-dlj-linux-$_arch.bin --accept-license
- cd ..
- sh construct.sh unbundle-jdk linux-jdk linux-jre
-}
-
-package_jre() {
- pkgdesc="Sun/Oracle's Java Runtime Environment"
- depends=('glibc' 'libxtst')
- provides=('j2re' 'java-runtime=6')
- conflicts=('j2re' 'java-runtime')
- replaces=('j2re')
- install='jre.install'
-
- cd ${srcdir}
-
- mkdir -p ${pkgdir}/opt/java
- cp -R linux-jdk/jre ${pkgdir}/opt/java
-
- install -Dm755 ${srcdir}/jre.profile ${pkgdir}/etc/profile.d/jre.sh
-
- mkdir -p ${pkgdir}/usr/lib/mozilla/plugins
-
- if [ "$CARCH" = "i686" ]; then
- ln -s /opt/java/jre/lib/i386/libnpjp2.so ${pkgdir}/usr/lib/mozilla/plugins
- else ln -s /opt/java/jre/lib/amd64/libnpjp2.so ${pkgdir}/usr/lib/mozilla/plugins
- fi
-
- mkdir -p ${pkgdir}/usr/share/licenses/jre
- cp ${pkgdir}/opt/java/jre/COPYRIGHT ${pkgdir}/usr/share/licenses/jre
- cp ${pkgdir}/opt/java/jre/LICENSE ${pkgdir}/usr/share/licenses/jre
- cp ${pkgdir}/opt/java/jre/THIRDPARTYLICENSEREADME.txt ${pkgdir}/usr/share/licenses/jre
-
- # Fix system prefs folder (FS#18872)
- install -dm755 ${pkgdir}/etc/.java/.systemPrefs
-}
-
-package_jdk() {
- pkgdesc="Sun/Oracle's Java Development Kit"
- depends=('glibc' 'jre')
- provides=('java-environment=6' 'j2sdk')
- conflicts=('java-environment' 'j2sdk')
- replaces=('j2sdk')
- install='jdk.install'
-
- cd ${srcdir}
-
- #copy icon
- install -Dm644 ${srcdir}/linux-jdk/jre/lib/desktop/icons/hicolor/48x48/apps/sun-java.png \
- ${pkgdir}/usr/share/pixmaps/java.png
-
- rm -rf linux-jdk/jre
- mkdir -p ${pkgdir}/opt
- mv linux-jdk ${pkgdir}/opt/java
-
- install -D -m755 ${srcdir}/jdk.profile ${pkgdir}/etc/profile.d/jdk.sh
-
- mkdir -p ${pkgdir}/usr/share/licenses/jdk
- cp ${pkgdir}/opt/java/COPYRIGHT ${pkgdir}/usr/share/licenses/jdk
- cp ${pkgdir}/opt/java/LICENSE ${pkgdir}/usr/share/licenses/jdk
- cp ${pkgdir}/opt/java/THIRDPARTYLICENSEREADME.txt ${pkgdir}/usr/share/licenses/jdk
-
- #desktop entries
- install -Dm644 ${srcdir}/java-control-panel.desktop \
- ${pkgdir}/usr/share/applications/java-control-panel.desktop
- install -Dm644 ${srcdir}/java-monitoring-and-management-console.desktop \
- ${pkgdir}/usr/share/applications/java-monitoring-and-management-console.desktop
- install -Dm644 ${srcdir}/java-policy-settings.desktop \
- ${pkgdir}/usr/share/applications/java-policy-settings.desktop
- install -Dm644 ${srcdir}/java-visualvm.desktop \
- ${pkgdir}/usr/share/applications/java-visualvm.desktop
- install -Dm644 ${srcdir}/java-web-start.desktop \
- ${pkgdir}/usr/share/applications/java-web-start.desktop
-}
diff --git a/abs/extra/java-sun/java-control-panel.desktop b/abs/extra/java-sun/java-control-panel.desktop
deleted file mode 100644
index 476e04a..0000000
--- a/abs/extra/java-sun/java-control-panel.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Exec=/opt/java/bin/jcontrol
-GenericName[cs]=Nastavení prostředí Java
-GenericName=Java Environment Settings
-Icon=java
-Name[cs]=Nastavení Javy
-Name=Java Control Panel
-Path=
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Settings;Java;
diff --git a/abs/extra/java-sun/java-monitoring-and-management-console.desktop b/abs/extra/java-sun/java-monitoring-and-management-console.desktop
deleted file mode 100644
index c0e1e59..0000000
--- a/abs/extra/java-sun/java-monitoring-and-management-console.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Exec=/opt/java/bin/jconsole
-Icon=java
-Name[cs]=Konzole monitorování a správy prostředí Java
-Name=Java Monitoring and Management Console
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Development;Java;
diff --git a/abs/extra/java-sun/java-policy-settings.desktop b/abs/extra/java-sun/java-policy-settings.desktop
deleted file mode 100644
index 1009301..0000000
--- a/abs/extra/java-sun/java-policy-settings.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Exec=/opt/java/bin/policytool
-Icon=java
-Name[cs]=Nastavení politiky Java aplikací
-Name=Java Policy Settings
-Path=
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Settings;Java;
diff --git a/abs/extra/java-sun/java-visualvm.desktop b/abs/extra/java-sun/java-visualvm.desktop
deleted file mode 100644
index 8aa9527..0000000
--- a/abs/extra/java-sun/java-visualvm.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Exec=/opt/java/bin/jvisualvm
-GenericName[cs]=Nástroj pro monitorování a sledování výkonu Java aplikací
-GenericName=Java Monitoring and Performance Monitoring Tool
-Icon=java
-Name=Java VisualVM
-Path=
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Development;Java;
diff --git a/abs/extra/java-sun/java-web-start.desktop b/abs/extra/java-sun/java-web-start.desktop
deleted file mode 100644
index 573ddc0..0000000
--- a/abs/extra/java-sun/java-web-start.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Exec=/opt/java/bin/javaws -viewer
-GenericName[cs]=Spravovat a spouštět aplikace Java Web Start
-GenericName=Manage and run Java Web Start Applications
-Icon=java
-MimeType=application/x-java-jnlp-file;
-Name[cs]=Java Web Start
-Name=Java Web Start
-Path=
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Network;Java;
diff --git a/abs/extra/java-sun/jdk.install b/abs/extra/java-sun/jdk.install
deleted file mode 100644
index ae439b1..0000000
--- a/abs/extra/java-sun/jdk.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_upgrade() {
- post_install $1
-}
-
-post_install() {
- echo "The jdk package is licensed software."
- echo "You MUST read and agree to the license stored in"
- echo "/opt/java/LICENSE before using it."
-
-}
-
diff --git a/abs/extra/java-sun/jdk.profile b/abs/extra/java-sun/jdk.profile
deleted file mode 100644
index 9bee9a7..0000000
--- a/abs/extra/java-sun/jdk.profile
+++ /dev/null
@@ -1,4 +0,0 @@
-export J2SDKDIR=/opt/java
-export PATH=$PATH:/opt/java/bin
-export JAVA_HOME=/opt/java
-export DERBY_HOME=/opt/java/db
diff --git a/abs/extra/java-sun/jre.install b/abs/extra/java-sun/jre.install
deleted file mode 100644
index 41e698f..0000000
--- a/abs/extra/java-sun/jre.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_upgrade() {
- post_install $1
-}
-
-post_install() {
- echo "The jre package is licensed software."
- echo "You MUST read and agree to the license stored in"
- echo "/opt/java/jre/LICENSE before using it."
- if [ -f /etc/mailcap ] ; then
- sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap
- fi
- echo 'application/x-java-jnlp-file;/opt/java/jre/bin/javaws %s' >>/etc/mailcap
-}
-
-post_remove() {
- mailcap=$(grep -v 'application/x-java-jnlp-file' /etc/mailcap)
- if [ "$mailcap" != "" ] ; then
- sed -e '/application\/x-java-jnlp-file/d' -i /etc/mailcap
- else
- rm /etc/mailcap
- fi
-}
diff --git a/abs/extra/java-sun/jre.profile b/abs/extra/java-sun/jre.profile
deleted file mode 100644
index af3e373..0000000
--- a/abs/extra/java-sun/jre.profile
+++ /dev/null
@@ -1,4 +0,0 @@
-export PATH=$PATH:/opt/java/jre/bin
-if [ ! -f /etc/profile.d/jdk.sh ]; then
- export JAVA_HOME=/opt/java/jre
-fi
diff --git a/abs/extra/libdvdread/DVDFileStat.patch b/abs/extra/libdvdread/DVDFileStat.patch
deleted file mode 100644
index 04d06f7..0000000
--- a/abs/extra/libdvdread/DVDFileStat.patch
+++ /dev/null
@@ -1,238 +0,0 @@
-diff -pruN libdvdread-4.1.3/src/dvd_reader.c libdvdread-4.1.3.new/src/dvd_reader.c
---- libdvdread-4.1.3/src/dvd_reader.c 2008-09-06 23:55:51.000000000 +0200
-+++ libdvdread-4.1.3.new/src/dvd_reader.c 2009-02-28 01:36:20.000000000 +0100
-@@ -889,6 +889,187 @@ void DVDCloseFile( dvd_file_t *dvd_file
- }
- }
-
-+static int DVDFileStatVOBUDF(dvd_reader_t *dvd, int title,
-+ int menu, dvd_stat_t *statbuf)
-+{
-+ char filename[ MAX_UDF_FILE_NAME_LEN ];
-+ uint32_t size;
-+ off_t tot_size;
-+ off_t parts_size[9];
-+ int nr_parts = 0;
-+ int n;
-+
-+ if( title == 0 ) {
-+ sprintf( filename, "/VIDEO_TS/VIDEO_TS.VOB" );
-+ } else {
-+ sprintf( filename, "/VIDEO_TS/VTS_%02d_%d.VOB", title, menu ? 0 : 1 );
-+ }
-+ if(!UDFFindFile( dvd, filename, &size )) {
-+ return -1;
-+ }
-+ tot_size = size;
-+ nr_parts = 1;
-+ parts_size[0] = size;
-+
-+ if( !menu ) {
-+ int cur;
-+
-+ for( cur = 2; cur < 10; cur++ ) {
-+ sprintf( filename, "/VIDEO_TS/VTS_%02d_%d.VOB", title, cur );
-+ if( !UDFFindFile( dvd, filename, &size ) ) {
-+ break;
-+ }
-+ parts_size[nr_parts] = size;
-+ tot_size += size;
-+ nr_parts++;
-+ }
-+ }
-+
-+ statbuf->size = tot_size;
-+ statbuf->nr_parts = nr_parts;
-+ for(n = 0; n < nr_parts; n++) {
-+ statbuf->parts_size[n] = parts_size[n];
-+ }
-+ return 0;
-+}
-+
-+
-+static int DVDFileStatVOBPath( dvd_reader_t *dvd, int title,
-+ int menu, dvd_stat_t *statbuf )
-+{
-+ char filename[ MAX_UDF_FILE_NAME_LEN ];
-+ char full_path[ PATH_MAX + 1 ];
-+ struct stat fileinfo;
-+ off_t tot_size;
-+ off_t parts_size[9];
-+ int nr_parts = 0;
-+ int n;
-+
-+
-+
-+ if( title == 0 ) {
-+ sprintf( filename, "VIDEO_TS.VOB" );
-+ } else {
-+ sprintf( filename, "VTS_%02d_%d.VOB", title, menu ? 0 : 1 );
-+ }
-+ if( !findDVDFile( dvd, filename, full_path ) ) {
-+ return -1;
-+ }
-+
-+ if( stat( full_path, &fileinfo ) < 0 ) {
-+ fprintf( stderr, "libdvdread: Can't stat() %s.\n", filename );
-+ return -1;
-+ }
-+
-+
-+ tot_size = fileinfo.st_size;
-+ nr_parts = 1;
-+ parts_size[0] = fileinfo.st_size;
-+
-+ if( !menu ) {
-+ int cur;
-+
-+ for( cur = 2; cur < 10; cur++ ) {
-+
-+ sprintf( filename, "VTS_%02d_%d.VOB", title, cur );
-+ if( !findDVDFile( dvd, filename, full_path ) ) {
-+ break;
-+ }
-+
-+ if( stat( full_path, &fileinfo ) < 0 ) {
-+ fprintf( stderr, "libdvdread: Can't stat() %s.\n", filename );
-+ break;
-+ }
-+
-+ parts_size[nr_parts] = fileinfo.st_size;
-+ tot_size += parts_size[nr_parts];
-+ nr_parts++;
-+ }
-+ }
-+
-+ statbuf->size = tot_size;
-+ statbuf->nr_parts = nr_parts;
-+ for(n = 0; n < nr_parts; n++) {
-+ statbuf->parts_size[n] = parts_size[n];
-+ }
-+ return 0;
-+}
-+
-+
-+int DVDFileStat(dvd_reader_t *dvd, int titlenum,
-+ dvd_read_domain_t domain, dvd_stat_t *statbuf)
-+{
-+ char filename[ MAX_UDF_FILE_NAME_LEN ];
-+ char full_path[ PATH_MAX + 1 ];
-+ struct stat fileinfo;
-+ uint32_t size;
-+
-+ /* Check arguments. */
-+ if( dvd == NULL || titlenum < 0 ) {
-+ errno = EINVAL;
-+ return -1;
-+ }
-+
-+ switch( domain ) {
-+ case DVD_READ_INFO_FILE:
-+ if( titlenum == 0 ) {
-+ sprintf( filename, "/VIDEO_TS/VIDEO_TS.IFO" );
-+ } else {
-+ sprintf( filename, "/VIDEO_TS/VTS_%02i_0.IFO", titlenum );
-+ }
-+ break;
-+ case DVD_READ_INFO_BACKUP_FILE:
-+ if( titlenum == 0 ) {
-+ sprintf( filename, "/VIDEO_TS/VIDEO_TS.BUP" );
-+ } else {
-+ sprintf( filename, "/VIDEO_TS/VTS_%02i_0.BUP", titlenum );
-+ }
-+ break;
-+ case DVD_READ_MENU_VOBS:
-+ if( dvd->isImageFile ) {
-+ return DVDFileStatVOBUDF( dvd, titlenum, 1, statbuf );
-+ } else {
-+ return DVDFileStatVOBPath( dvd, titlenum, 1, statbuf );
-+ }
-+ break;
-+ case DVD_READ_TITLE_VOBS:
-+ if( titlenum == 0 ) {
-+ return -1;
-+ }
-+ if( dvd->isImageFile ) {
-+ return DVDFileStatVOBUDF( dvd, titlenum, 0, statbuf );
-+ } else {
-+ return DVDFileStatVOBPath( dvd, titlenum, 0, statbuf );
-+ }
-+ break;
-+ default:
-+ fprintf( stderr, "libdvdread: Invalid domain for file stat.\n" );
-+ errno = EINVAL;
-+ return -1;
-+ }
-+
-+ if( dvd->isImageFile ) {
-+ if( UDFFindFile( dvd, filename, &size ) ) {
-+ statbuf->size = size;
-+ statbuf->nr_parts = 1;
-+ statbuf->parts_size[0] = size;
-+ return 0;
-+ }
-+ } else {
-+ if( findDVDFile( dvd, filename, full_path ) ) {
-+ if( stat( full_path, &fileinfo ) < 0 ) {
-+ fprintf( stderr, "libdvdread: Can't stat() %s.\n", filename );
-+ } else {
-+ statbuf->size = fileinfo.st_size;
-+ statbuf->nr_parts = 1;
-+ statbuf->parts_size[0] = statbuf->size;
-+ return 0;
-+ }
-+ }
-+ }
-+ return -1;
-+}
-+
- /* Internal, but used from dvd_udf.c */
- int UDFReadBlocksRaw( dvd_reader_t *device, uint32_t lb_number,
- size_t block_count, unsigned char *data,
-diff -pruN libdvdread-4.1.3/src/dvd_reader.h libdvdread-4.1.3.new/src/dvd_reader.h
---- libdvdread-4.1.3/src/dvd_reader.h 2008-09-06 23:55:51.000000000 +0200
-+++ libdvdread-4.1.3.new/src/dvd_reader.h 2009-02-28 01:36:49.000000000 +0100
-@@ -115,6 +115,42 @@ typedef enum {
- } dvd_read_domain_t;
-
- /**
-+ *
-+ */
-+typedef struct {
-+ off_t size; /**< Total size of file in bytes */
-+ int nr_parts; /**< Number of file parts */
-+ off_t parts_size[9]; /**< Size of each part in bytes */
-+} dvd_stat_t;
-+
-+/**
-+ * Stats a file on the DVD given the title number and domain.
-+ * The information about the file is stored in a dvd_stat_t
-+ * which contains information about the size of the file and
-+ * the number of parts in case of a multipart file and the respective
-+ * sizes of the parts.
-+ * A multipart file is for instance VTS_02_1.VOB, VTS_02_2.VOB, VTS_02_3.VOB
-+ * The size of VTS_02_1.VOB will be stored in stat->parts_size[0],
-+ * VTS_02_2.VOB in stat->parts_size[1], ...
-+ * The total size (sum of all parts) is stored in stat->size and
-+ * stat->nr_parts will hold the number of parts.
-+ * Only DVD_READ_TITLE_VOBS (VTS_??_[1-9].VOB) can be multipart files.
-+ *
-+ * This function is only of use if you want to get the size of each file
-+ * in the filesystem. These sizes are not needed to use any other
-+ * functions in libdvdread.
-+ *
-+ * @param dvd A dvd read handle.
-+ * @param titlenum Which Video Title Set should be used, VIDEO_TS is 0.
-+ * @param domain Which domain.
-+ * @param stat Pointer to where the result is stored.
-+ * @return If successful 0, otherwise -1.
-+ *
-+ * int DVDFileStat(dvd, titlenum, domain, stat);
-+ */
-+int DVDFileStat(dvd_reader_t *, int, dvd_read_domain_t, dvd_stat_t *);
-+
-+/**
- * Opens a file on the DVD given the title number and domain.
- *
- * If the title number is 0, the video manager information is opened
-
diff --git a/abs/extra/libdvdread/PKGBUILD b/abs/extra/libdvdread/PKGBUILD
deleted file mode 100644
index edbdaa4..0000000
--- a/abs/extra/libdvdread/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 80196 2010-05-13 15:59:09Z andrea $
-# Maintainer:
-# Contributor: Thomas Baechler <thomas@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=libdvdread
-pkgver=4.1.3
-pkgrel=2
-pkgdesc="Provides a simple foundation for reading DVD video disks"
-arch=(i686 x86_64)
-url="http://www.mplayerhq.hu/MPlayer/releases/dvdnav/"
-license=('GPL')
-depends=('glibc')
-makedepends=('libdvdcss')
-optdepends=('libdvdcss: for decoding encrypted DVDs')
-options=('!libtool')
-source=("http://www.mplayerhq.hu/MPlayer/releases/dvdnav/${pkgname}-${pkgver}.tar.bz2"
- 'DVDFileStat.patch')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- # http://lists.mplayerhq.hu/pipermail/dvdnav-discuss/2009-February/000986.html (FS#19324)
- patch -Np1 -i ${srcdir}/DVDFileStat.patch || return 1
-
- ./autogen.sh --prefix=/usr || return 1
- make || return 1
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install || return 1
-}
-
-md5sums=('6dc068d442c85a3cdd5ad3da75f6c6e8'
- '140d02afbf66bfbf034549157ed4f7ad')
diff --git a/abs/extra/libgksu/PKGBUILD b/abs/extra/libgksu/PKGBUILD
index 5f18266..b4414d5 100644
--- a/abs/extra/libgksu/PKGBUILD
+++ b/abs/extra/libgksu/PKGBUILD
@@ -1,29 +1,31 @@
-# $Id: PKGBUILD 5570 2008-07-18 21:03:14Z jgc $
+# $Id: PKGBUILD 90625 2010-09-14 09:37:47Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=libgksu
-pkgver=2.0.7
-pkgrel=1
+pkgver=2.0.12
+pkgrel=3
pkgdesc="gksu authorization library"
arch=(i686 x86_64)
url="http://www.nongnu.org/gksu/index.html"
license=(GPL)
-depends=('gnome-keyring>=2.22.3' 'libgtop>=2.22.3'
- 'libglade>=2.6.2' 'startup-notification>=0.9')
-makedepends=('gtk-doc' 'pkgconfig')
-options=('!libtool')
+depends=('libgnome-keyring>=2.30.1' 'libgtop>=2.28.1' 'startup-notification>=0.10' 'gconf>=2.28.1')
+makedepends=('gtk-doc' 'pkgconfig' 'intltool')
+options=('!libtool' '!emptydirs')
install=libgksu.install
-source=(http://people.debian.org/~kov/gksu/${pkgname}-${pkgver}.tar.gz)
-md5sums=('2f2c6a21281370942ea2855553d3ad89')
+source=(http://people.debian.org/~kov/gksu/${pkgname}-${pkgver}.tar.gz
+ libgksu-2.0.12-revert-forkpty.patch)
+md5sums=('c7154c8806f791c10e7626ff123049d3'
+ 'aebbe57e5286c654e27cf714cf3b704a')
build() {
- cd ${startdir}/src/${pkgname}-${pkgver}
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i "${srcdir}/libgksu-2.0.12-revert-forkpty.patch"
./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static || return 1
- make || return 1
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || return 1
- rm -f ${startdir}/pkg/usr/lib/*.a
- install -m755 -d ${startdir}/pkg/usr/share/gconf/schemas
- gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas || return 1
- rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
+ --localstatedir=/var --disable-static
+ make
+ make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+ rm -f ${pkgdir}/usr/lib/*.a
+ install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
+ gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain libgksu ${pkgdir}/etc/gconf/schemas/*.schemas
+ rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
}
diff --git a/abs/extra/libgksu/libgksu-2.0.12-revert-forkpty.patch b/abs/extra/libgksu/libgksu-2.0.12-revert-forkpty.patch
new file mode 100644
index 0000000..2c3a8cc
--- /dev/null
+++ b/abs/extra/libgksu/libgksu-2.0.12-revert-forkpty.patch
@@ -0,0 +1,359 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN libgksu-2.0.12.orig/libgksu/libgksu.c libgksu-2.0.12/libgksu/libgksu.c
+--- libgksu-2.0.12.orig/libgksu/libgksu.c 2009-06-29 13:48:24.000000000 -0400
++++ libgksu-2.0.12/libgksu/libgksu.c 2010-01-12 07:32:10.450657456 -0500
+@@ -1,7 +1,6 @@
+ /*
+ * Gksu -- a library providing access to su functionality
+ * Copyright (C) 2004-2009 Gustavo Noronha Silva
+- * Portions Copyright (C) 2009 VMware, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+@@ -56,9 +55,6 @@
+ static void
+ gksu_context_launch_complete (GksuContext *context);
+
+-static void
+-read_line (int fd, gchar *buffer, int n);
+-
+ GType
+ gksu_error_get_type (void)
+ {
+@@ -2009,8 +2005,6 @@ gksu_su_fuller (GksuContext *context,
+ for (i = 0 ; cmd[i] != NULL ; i++)
+ g_free (cmd[i]);
+ g_free(cmd);
+-
+- _exit(1);
+ }
+ else if (pid == -1)
+ {
+@@ -2125,10 +2119,10 @@ gksu_su_fuller (GksuContext *context,
+ /* drop the \n echoed on password entry if su did request
+ a password */
+ if (password_needed)
+- read_line (fdpty, buf, 255);
++ read (fdpty, buf, 255);
+ if (context->debug)
+ fprintf (stderr, "DEBUG (run:post-after-pass) buf: -%s-\n", buf);
+- read_line (fdpty, buf, 255);
++ read (fdpty, buf, 255);
+ if (context->debug)
+ fprintf (stderr, "DEBUG (run:post-after-pass) buf: -%s-\n", buf);
+ }
+@@ -2142,9 +2136,7 @@ gksu_su_fuller (GksuContext *context,
+ {
+ int retval = 0;
+
+- /* Red Hat's su shows the full path to su in its error messages. */
+- if (!strncmp (buf, "su:", 3) ||
+- !strncmp (buf, "/bin/su:", 7))
++ if (!strncmp (buf, "su", 2))
+ {
+ gchar **strings;
+
+@@ -2155,11 +2147,7 @@ gksu_su_fuller (GksuContext *context,
+ }
+
+ strings = g_strsplit (buf, ":", 2);
+-
+- /* Red Hat and Fedora use 'incorrect password'. */
+- if (strings[1] &&
+- (g_str_has_prefix(strings[1], " Authentication failure") ||
+- g_str_has_prefix(strings[1], " incorrect password")))
++ if (strings[1] && !strncmp (strings[1], " Authentication failure", 23))
+ {
+ if (used_gnome_keyring)
+ g_set_error (error, gksu_quark,
+@@ -2473,12 +2461,6 @@ gksu_sudo_fuller (GksuContext *context,
+ {
+ char **cmd;
+ char buffer[256] = {0};
+- char *child_stderr = NULL;
+- /* This command is used to gain a token */
+- char *const verifycmd[] =
+- {
+- "/usr/bin/sudo", "-p", "GNOME_SUDO_PASS", "-v", NULL
+- };
+ int argcount = 8;
+ int i, j;
+
+@@ -2489,8 +2471,9 @@ gksu_sudo_fuller (GksuContext *context,
+
+ pid_t pid;
+ int status;
+- FILE *fdfile = NULL;
+- int fdpty = -1;
++ FILE *infile, *outfile;
++ int parent_pipe[2]; /* For talking to the parent */
++ int child_pipe[2]; /* For talking to the child */
+
+ context->sudo_mode = TRUE;
+
+@@ -2565,10 +2548,6 @@ gksu_sudo_fuller (GksuContext *context,
+ cmd[argcount] = g_strdup("-S");
+ argcount++;
+
+- /* Make sudo noninteractive (we should already have a token) */
+- cmd[argcount] = g_strdup("-n");
+- argcount++;
+-
+ /* Make sudo use next arg as prompt */
+ cmd[argcount] = g_strdup("-p");
+ argcount++;
+@@ -2647,21 +2626,26 @@ gksu_sudo_fuller (GksuContext *context,
+ fprintf (stderr, "cmd[%d]: %s\n", i, cmd[i]);
+ }
+
+- pid = forkpty(&fdpty, NULL, NULL, NULL);
+- if (pid == 0)
++ if ((pipe(parent_pipe)) == -1)
+ {
+- // Child
+- setsid(); // make us session leader
+-
+- execv(verifycmd[0], verifycmd);
++ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
++ _("Error creating pipe: %s"),
++ strerror(errno));
++ sudo_reset_xauth (context, xauth, xauth_env);
++ return FALSE;
++ }
+
+- g_set_error (error, gksu_quark, GKSU_ERROR_EXEC,
+- _("Failed to exec new process: %s"),
++ if ((pipe(child_pipe)) == -1)
++ {
++ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
++ _("Error creating pipe: %s"),
+ strerror(errno));
+ sudo_reset_xauth (context, xauth, xauth_env);
+ return FALSE;
+ }
+- else if (pid == -1)
++
++ pid = fork();
++ if (pid == -1)
+ {
+ g_set_error (error, gksu_quark, GKSU_ERROR_FORK,
+ _("Failed to fork new process: %s"),
+@@ -2669,26 +2653,56 @@ gksu_sudo_fuller (GksuContext *context,
+ sudo_reset_xauth (context, xauth, xauth_env);
+ return FALSE;
+ }
++ else if (pid == 0)
++ {
++ // Child
++ setsid(); // make us session leader
++ close(child_pipe[1]);
++ dup2(child_pipe[0], STDIN_FILENO);
++ dup2(parent_pipe[1], STDERR_FILENO);
+
++ execv(cmd[0], cmd);
++
++ g_set_error (error, gksu_quark, GKSU_ERROR_EXEC,
++ _("Failed to exec new process: %s"),
++ strerror(errno));
++ sudo_reset_xauth (context, xauth, xauth_env);
++ return FALSE;
++ }
+ else
+ {
+ gint counter = 0;
+ gchar *cmdline = NULL;
+- struct termios tio;
+
+ // Parent
+- fdfile = fdopen(fdpty, "w+");
++ close(parent_pipe[1]);
+
+- /* make sure we notice that ECHO is turned off, if it gets
+- turned off */
+- tcgetattr (fdpty, &tio);
+- for (counter = 0; (tio.c_lflag & ECHO) && counter < 15; counter++)
+- {
+- usleep (1000);
+- tcgetattr (fdpty, &tio);
+- }
++ infile = fdopen(parent_pipe[0], "r");
++ if (!infile)
++ {
++ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
++ _("Error opening pipe: %s"),
++ strerror(errno));
++ sudo_reset_xauth (context, xauth, xauth_env);
++ return FALSE;
++ }
+
+- fcntl (fdpty, F_SETFL, O_NONBLOCK);
++ outfile = fdopen(child_pipe[1], "w");
++ if (!outfile)
++ {
++ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
++ _("Error opening pipe: %s"),
++ strerror(errno));
++ sudo_reset_xauth (context, xauth, xauth_env);
++ return FALSE;
++ }
++
++ /*
++ we are expecting to receive a GNOME_SUDO_PASS
++ if we don't there are two possibilities: an error
++ or a password is not needed
++ */
++ fcntl (parent_pipe[0], F_SETFL, O_NONBLOCK);
+
+ { /* no matter if we can read, since we're using
+ O_NONBLOCK; this is just to avoid the prompt
+@@ -2697,11 +2711,11 @@ gksu_sudo_fuller (GksuContext *context,
+ struct timeval tv;
+
+ FD_ZERO(&rfds);
+- FD_SET(fdpty, &rfds);
++ FD_SET(parent_pipe[0], &rfds);
+ tv.tv_sec = 1;
+ tv.tv_usec = 0;
+
+- select (fdpty + 1, &rfds, NULL, NULL, &tv);
++ select (parent_pipe[0] + 1, &rfds, NULL, NULL, &tv);
+ }
+
+ /* Try hard to find the prompt; it may happen that we're
+@@ -2713,7 +2727,7 @@ gksu_sudo_fuller (GksuContext *context,
+ if (strncmp (buffer, "GNOME_SUDO_PASS", 15) == 0)
+ break;
+
+- read_line (fdpty, buffer, 256);
++ read_line (parent_pipe[0], buffer, 256);
+
+ if (context->debug)
+ fprintf (stderr, "buffer: -%s-\n", buffer);
+@@ -2747,17 +2761,18 @@ gksu_sudo_fuller (GksuContext *context,
+
+ usleep (1000);
+
+- write (fdpty, password, strlen(password) + 1);
+- write (fdpty, "\n", 1);
++ fprintf (outfile, "%s\n", password);
++ fclose (outfile);
+
+ nullify_password (password);
+
+- fcntl(fdpty, F_SETFL, fcntl(fdpty, F_GETFL) & ~O_NONBLOCK);
++ /* turn NONBLOCK off */
++ fcntl(parent_pipe[0], F_SETFL, fcntl(parent_pipe[0], F_GETFL) & ~O_NONBLOCK);
+ /* ignore the first newline that comes right after sudo receives
+ the password */
+- fgets (buffer, 255, fdfile);
+- /* this is the status we are interested in */
+- fgets (buffer, 255, fdfile);
++ fgets (buffer, 255, infile);
++ /* this is the status we are interessted in */
++ fgets (buffer, 255, infile);
+ }
+ else
+ {
+@@ -2766,7 +2781,7 @@ gksu_sudo_fuller (GksuContext *context,
+ fprintf (stderr, "No password prompt found; we'll assume we don't need a password.\n");
+
+ /* turn NONBLOCK off, also if have no prompt */
+- fcntl(fdpty, F_SETFL, fcntl(fdpty, F_GETFL) & ~O_NONBLOCK);
++ fcntl(parent_pipe[0], F_SETFL, fcntl(parent_pipe[0], F_GETFL) & ~O_NONBLOCK);
+
+ should_display = gconf_client_get_bool (context->gconf_client,
+ BASE_PATH "display-no-pass-info", NULL);
+@@ -2785,9 +2800,14 @@ gksu_sudo_fuller (GksuContext *context,
+ fprintf (stderr, "%s", buffer);
+ }
+
+- if (g_str_has_prefix (buffer, "Sorry, try again."))
++ if (!strcmp (buffer, "Sorry, try again.\n"))
+ g_set_error (error, gksu_quark, GKSU_ERROR_WRONGPASS,
+ _("Wrong password."));
++ else if (!strncmp (buffer, "Sorry, user ", 12))
++ g_set_error (error, gksu_quark, GKSU_ERROR_NOT_ALLOWED,
++ _("The underlying authorization mechanism (sudo) "
++ "does not allow you to run this program. Contact "
++ "the system administrator."));
+ else
+ {
+ gchar *haystack = buffer;
+@@ -2805,10 +2825,6 @@ gksu_sudo_fuller (GksuContext *context,
+ }
+ }
+
+- /* If we have an error, let's just stop sudo right there. */
+- if (error)
+- close(fdpty);
+-
+ cmdline = g_strdup("sudo");
+ /* wait for the child process to end or become something other
+ than sudo */
+@@ -2825,23 +2841,17 @@ gksu_sudo_fuller (GksuContext *context,
+ if (context->sn_context)
+ gksu_context_launch_complete (context);
+
++ while (read (parent_pipe[0], buffer, 255) > 0)
++ {
++ fprintf (stderr, "%s", buffer);
++ bzero(buffer, 256);
++ }
++
+ /* if the process is still active waitpid() on it */
+ if (pid_exited != pid)
+ waitpid(pid, &status, 0);
+ sudo_reset_xauth (context, xauth, xauth_env);
+
+- /*
+- * Did token acquisition succeed? If so, spawn sudo in
+- * non-interactive mode. It should either succeed or die
+- * immediately if you're not allowed to run the command.
+- */
+- if (WEXITSTATUS(status) == 0)
+- {
+- g_spawn_sync(NULL, cmd, NULL, 0, NULL, NULL,
+- NULL, &child_stderr, &status,
+- error);
+- }
+-
+ if (exit_status)
+ {
+ if (WIFEXITED(status)) {
+@@ -2853,13 +2863,6 @@ gksu_sudo_fuller (GksuContext *context,
+
+ if (WEXITSTATUS(status))
+ {
+- if (g_str_has_prefix(child_stderr, "Sorry, user "))
+- {
+- g_set_error (error, gksu_quark, GKSU_ERROR_NOT_ALLOWED,
+- _("The underlying authorization mechanism (sudo) "
+- "does not allow you to run this program. Contact "
+- "the system administrator."));
+- }
+ if(cmdline)
+ {
+ /* sudo already exec()ed something else, don't report
+@@ -2868,7 +2871,6 @@ gksu_sudo_fuller (GksuContext *context,
+ if (!g_str_has_suffix (cmdline, "sudo"))
+ {
+ g_free (cmdline);
+- g_free (child_stderr);
+ return FALSE;
+ }
+ g_free (cmdline);
+@@ -2881,11 +2883,11 @@ gksu_sudo_fuller (GksuContext *context,
+ }
+ }
+
+- fprintf(stderr, child_stderr);
+- g_free(child_stderr);
+-
+ /* if error is set we have found an error condition */
+- return (error == NULL);
++ if (error)
++ return FALSE;
++
++ return TRUE;
+ }
+
+ /**
diff --git a/abs/extra/libgtop/PKGBUILD b/abs/extra/libgtop/PKGBUILD
index da34a59..a602fbe 100644
--- a/abs/extra/libgtop/PKGBUILD
+++ b/abs/extra/libgtop/PKGBUILD
@@ -1,28 +1,25 @@
-# $Id: PKGBUILD 35522 2009-04-13 20:24:53Z jgc $
+# $Id: PKGBUILD 91991 2010-09-28 16:33:41Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=libgtop
-pkgver=2.26.1
+pkgver=2.28.2
pkgrel=1
pkgdesc="A library that read information about processes and the running system"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
license=('LGPL')
-depends=('glib2>=2.20.1' 'libxau' 'texinfo')
+depends=('glib2>=2.26' 'libxau' 'texinfo')
+makedepends=('intltool')
install=libgtop.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2)
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.bz2)
options=('!libtool')
url="http://www.gnome.org/"
-md5sums=('49fe5c91a6bbc103a0a05c6854a6cc11')
+sha256sums=('49958d7da1f76b257bfd0d557d8ed2b218a5ab0d31b59fed1c32ddf2a1529f5d')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static \
- --with-libgtop-smp --with-libgtop-inodedb \
- --with-linux-table || return 1
- make || return 1
- make DESTDIR="${pkgdir}" install || return 1
-
- rm -f "${pkgdir}/usr/share/info/dir"
- gzip -9nf ${pkgdir}/usr/share/info/*
+ --localstatedir=/var --disable-static \
+ --with-libgtop-smp
+ make
+ make DESTDIR="${pkgdir}" install
}
diff --git a/abs/extra/opensp/PKGBUILD b/abs/extra/opensp/PKGBUILD
new file mode 100644
index 0000000..1f79263
--- /dev/null
+++ b/abs/extra/opensp/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 27689 2009-02-24 21:08:28Z eric $
+# Maintainer: dorphell <dorphell@archlinux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+
+pkgname=opensp
+pkgver=1.5.2
+pkgrel=1
+pkgdesc="A library and a set of tools for validating, parsing and manipulating SGML and XML documents."
+arch=('i686' 'x86_64')
+url="http://openjade.sourceforge.net/"
+license=('BSD')
+depends=('gcc-libs')
+makedepends=('xmlto' 'docbook-xsl')
+options=('!libtool')
+source=(http://download.sourceforge.net/openjade/OpenSP-$pkgver.tar.gz)
+md5sums=('670b223c5d12cee40c9137be86b6c39b')
+
+build() {
+ cd $srcdir/OpenSP-$pkgver
+ ./configure --prefix=/usr --mandir=/usr/share/man \
+ --disable-nls \
+ --enable-http \
+ --enable-default-catalog=/etc/sgml/catalog:/etc/xml/catalog \
+ --enable-default-search-path=/usr/share/sgml:/usr/share/xml \
+ --enable-xml-messages || return 1
+ make || return 1
+ make DESTDIR=$pkgdir install || return 1
+ install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+}
diff --git a/abs/extra/perl-dbd-mysql/PKGBUILD b/abs/extra/perl-dbd-mysql/PKGBUILD
deleted file mode 100644
index c53aac7..0000000
--- a/abs/extra/perl-dbd-mysql/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 82506 2010-06-12 19:27:47Z kevin $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-# Contributor: Eric Johnson <eric@coding-zone.com>
-
-pkgname=perl-dbd-mysql
-_realname=DBD-mysql
-pkgver=4.018
-pkgrel=1
-pkgdesc="Perl/CPAN DBD::mysql module for interacting with MySQL via DBD"
-arch=(i686 x86_64)
-license=('GPL' 'PerlArtistic')
-url="http://search.cpan.org/dist/${_realname}/"
-depends=('libmysqlclient' 'perl-dbi' 'perl>=5.10.0')
-makedepends=('mysql')
-options=(!emptydirs)
-source=(http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/${_realname}-${pkgver}.tar.gz)
-
-build() {
- cd ${srcdir}/${_realname}-${pkgver}
-
- # install module in vendor directories.
- perl Makefile.PL INSTALLDIRS=vendor || return 1
- make || return 1
- make install DESTDIR=${pkgdir} || return 1
-
- # remove perllocal.pod and .packlist
- find ${pkgdir} -name perllocal.pod -delete
- find ${pkgdir} -name .packlist -delete
-}
-md5sums=('d1d4ee2f20910d6491d1b6216471b2f1')
diff --git a/abs/extra/postgresql-libs/PKGBUILD b/abs/extra/postgresql-libs/PKGBUILD
deleted file mode 100644
index 14ba9f8..0000000
--- a/abs/extra/postgresql-libs/PKGBUILD
+++ /dev/null
@@ -1,136 +0,0 @@
-# $Id: PKGBUILD 98184 2010-11-04 14:55:39Z dan $
-# Maintainer: Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgbase=postgresql
-pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
-pkgver=9.0.1
-pkgrel=2.1
-arch=('i686' 'x86_64')
-url="http://www.postgresql.org"
-license=('BSD')
-makedepends=('libxml2' 'python2' 'perl')
-source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 \
- postgresql postgresql.confd build.patch postgresql.pam postgresql.logrotate)
-
-build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- # patch to remove regress/test make target (won't build with it present)
- patch -Np1 -i ../build.patch
-
- # configure
- ./configure --prefix=/usr --mandir=/usr/share/man --with-libxml \
- --with-openssl --with-perl \
- --with-python PYTHON=/usr/bin/python2 --with-pam \
- --with-system-tzdata=/usr/share/zoneinfo --enable-nls \
- --datadir=/usr/share/postgresql --enable-thread-safety
-
- sed -i -e '/interfaces/d' src/Makefile
-
- # build
- make world
-
- # build libs
- for dir in src/interfaces src/bin/pg_config; do
- pushd ${dir}
- make
- popd
- done
-}
-
-package_postgresql-libs() {
- pkgdesc="Libraries for use with PostgreSQL"
- depends=('openssl>=1.0.0')
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- # install license
- install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
- # install libs
- for dir in src/interfaces src/bin/pg_config; do
- pushd ${dir}
- make DESTDIR="${pkgdir}" install
- popd
- done
-
- install -D -m644 doc/src/sgml/man1/pg_config.1 "${pkgdir}/usr/share/man/man1/pg_config.1"
-
- cd src/include
-
- mkdir -p "${pkgdir}"/usr/include/{libpq,postgresql/internal/libpq}
-
- # these headers are needed by the public headers of the interfaces
- install -m644 pg_config.h "${pkgdir}/usr/include/"
- install -m644 pg_config_os.h "${pkgdir}/usr/include/"
- install -m644 postgres_ext.h "${pkgdir}/usr/include/"
- install -m644 libpq/libpq-fs.h "${pkgdir}/usr/include/libpq/"
- install -m644 pg_config_manual.h "${pkgdir}/usr/include/"
-
- # these headers are needed by the not-so-public headers of the interfaces
- install -m644 c.h "${pkgdir}/usr/include/postgresql/internal/"
- install -m644 port.h "${pkgdir}/usr/include/postgresql/internal/"
- install -m644 postgres_fe.h "${pkgdir}/usr/include/postgresql/internal/"
- install -m644 libpq/pqcomm.h "${pkgdir}/usr/include/postgresql/internal/libpq/"
-}
-
-package_postgresql-docs() {
- pkgdesc="HTML documentation for PostgreSQL"
- options=(docs)
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- # install license
- install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
- make -C doc/src/sgml DESTDIR="${pkgdir}" install-html
- chown -R root:root "${pkgdir}/usr/share/doc/postgresql/html/"
-}
-
-package_postgresql() {
- pkgdesc="A sophisticated object-relational DBMS"
- backup=('etc/conf.d/postgresql' 'etc/pam.d/postgresql' 'etc/logrotate.d/postgresql')
- depends=("postgresql-libs>=${pkgver}" 'libxml2' 'readline>=6.0')
- optdepends=('python2: for PL/Python support'
- 'perl: for PL/Perl support')
- provides=('postgresql-client')
- conflicts=('postgresql-client')
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- # install
- make DESTDIR="${pkgdir}" install
- make -C contrib DESTDIR="${pkgdir}" install
- make -C doc/src/sgml DESTDIR="${pkgdir}" install-man
- # we don't want this, it is in the -libs package
- make -C src/bin/pg_config DESTDIR="${pkgdir}" uninstall
- rm "${pkgdir}/usr/share/man/man1/pg_config.1"
-
- # install license
- install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE"
-
- # clean up unneeded installed items
- rm -rf "${pkgdir}/usr/include/postgresql/internal"
- rm -rf "${pkgdir}/usr/include/libpq"
- find "${pkgdir}/usr/include" -maxdepth 1 -type f -execdir rm {} +
-
- # install launch script
- install -D -m755 "${srcdir}/postgresql" "${pkgdir}/etc/rc.d/postgresql"
-
- # install conf file
- install -D -m644 ${srcdir}/postgresql.confd \
- "${pkgdir}/etc/conf.d/postgresql"
-
- install -D -m644 ${srcdir}/postgresql.pam \
- "${pkgdir}/etc/pam.d/postgresql"
-
- install -D -m644 ${srcdir}/postgresql.logrotate \
- "${pkgdir}/etc/logrotate.d/postgresql"
-}
-
-md5sums=('57ba57e43cfe29e16dacbf5789be98d1'
- '4153ac0ef4a77e709385b0a13e1c0fad'
- 'd63a05943cf0a2726aa2070f3033c569'
- '4d74f4227dc5e12bf95b3490758d86c9'
- '96f82c38f3f540b53f3e5144900acf17'
- 'd28e443f9f65a5712c52018b84e27137')
diff --git a/abs/extra/postgresql-libs/build.patch b/abs/extra/postgresql-libs/build.patch
deleted file mode 100644
index c8f665d..0000000
--- a/abs/extra/postgresql-libs/build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur postgresql-8.2.3-orig/src/Makefile postgresql-8.2.3/src/Makefile
---- postgresql-8.2.3-orig/src/Makefile 2006-06-22 16:50:35.000000000 -0700
-+++ postgresql-8.2.3/src/Makefile 2007-03-05 10:46:24.000000000 -0800
-@@ -23,7 +23,6 @@
- $(MAKE) -C bin $@
- $(MAKE) -C pl $@
- $(MAKE) -C makefiles $@
-- $(MAKE) -C test/regress $@
-
- install: install-local
-
diff --git a/abs/extra/postgresql-libs/postgresql b/abs/extra/postgresql-libs/postgresql
deleted file mode 100755
index b00289e..0000000
--- a/abs/extra/postgresql-libs/postgresql
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/postgresql
-
-case "$1" in
- start)
- stat_busy "Starting PostgreSQL"
- # initialization
- if [ ! `egrep '^postgres:' /etc/group` ]; then
- stat_busy "Adding postgres group"
- groupadd -g 88 postgres
- stat_done
- fi
- if [ ! `egrep '^postgres:' /etc/passwd` ]; then
- stat_busy "Adding postgres user"
- useradd -u 88 -g postgres -d $PGROOT -s /bin/bash postgres
- [ -d $PGROOT ] && chown -R postgres.postgres $PGROOT
- stat_done
- fi
- if [ ! -d $PGROOT ]; then
- mkdir -p $PGROOT/data && chown -R postgres.postgres $PGROOT
- su - postgres -c "/usr/bin/initdb $INITOPTS -D $PGROOT/data"
- fi
- if [ ! -e /var/log/postgresql.log ]; then
- touch /var/log/postgresql.log
- chown postgres /var/log/postgresql.log
- fi
- # start the process
- su - postgres -c \
- "/usr/bin/pg_ctl -D $PGROOT/data -l /var/log/postgresql.log -W start"
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon postgresql
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping PostgreSQL"
- su - postgres -c \
- "/usr/bin/pg_ctl -D $PGROOT/data -l /var/log/postgresql.log -w stop"
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon postgresql
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 3
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/abs/extra/postgresql-libs/postgresql.confd b/abs/extra/postgresql-libs/postgresql.confd
deleted file mode 100644
index 5f8fa03..0000000
--- a/abs/extra/postgresql-libs/postgresql.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Parameters to be passed to postgresql
-#
-PGROOT="/var/lib/postgres"
-INITOPTS="--locale $LANG"
diff --git a/abs/extra/postgresql-libs/postgresql.logrotate b/abs/extra/postgresql-libs/postgresql.logrotate
deleted file mode 100644
index 9c36918..0000000
--- a/abs/extra/postgresql-libs/postgresql.logrotate
+++ /dev/null
@@ -1,4 +0,0 @@
-/var/log/postgresql.log {
- copytruncate
- missingok
-}
diff --git a/abs/extra/postgresql-libs/postgresql.pam b/abs/extra/postgresql-libs/postgresql.pam
deleted file mode 100644
index 53724d1..0000000
--- a/abs/extra/postgresql-libs/postgresql.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-auth required pam_unix.so
-account required pam_unix.so
-session required pam_unix.so
diff --git a/abs/extra/spidermonkey/PKGBUILD b/abs/extra/spidermonkey/PKGBUILD
index 3a44af3..e923cbe 100644
--- a/abs/extra/spidermonkey/PKGBUILD
+++ b/abs/extra/spidermonkey/PKGBUILD
@@ -1,27 +1,31 @@
+# $Id: PKGBUILD 55903 2009-10-15 23:18:35Z andrea $
+# Contributor: Aaron Griffin <aaron@archlinux.org>
+
pkgname=spidermonkey
pkgver=1.7.0
-pkgrel=2
+pkgrel=3
pkgdesc="Mozilla's C implementation of JavaScript."
arch=("i686" "x86_64")
url="http://www.mozilla.org/js/spidermonkey/"
license=('MPL' 'GPL' 'LGPL')
depends=('nspr')
-options=('!makeflags' 'force')
+options=('!makeflags')
source=("http://ftp.mozilla.org/pub/mozilla.org/js/js-$pkgver.tar.gz" \
- "spidermonkey-1.7-threadsafe.patch" "header.patch")
-md5sums=('5571134c3863686b623ebe4e6b1f6fe6' 'b2ef9be017b6aa1857354b5223975a4f')
+ "spidermonkey-1.7-threadsafe.patch" "spidermonkey-Makefile.patch")
+md5sums=('5571134c3863686b623ebe4e6b1f6fe6'
+ 'b2ef9be017b6aa1857354b5223975a4f'
+ '161d4c0f2c604d15cba29dab60b1f7a7')
-build()
-{
- cd $startdir/src/js/src
+build() {
+ cd "$srcdir/js/src"
+ patch -p0 < "$srcdir/spidermonkey-Makefile.patch" || return 1
+ sed -i 's|include|include/js|' rules.mk || return 1
# fix for the lib location
[ "$CARCH" = "x86_64" ] && (sed -i -e "s:lib64:lib:g" config.mk || return 1)
# patch Makefile for threadsafe support with native nspr
- patch -p2 -i $startdir/src/spidermonkey-1.7-threadsafe.patch || return 1
- patch -p2 -i $startdir/src/header.patch || return 1
+ patch -p2 -i "$srcdir/spidermonkey-1.7-threadsafe.patch" || return 1
+ # FS#16673
+ export CFLAGS="${CFLAGS} -DJS_C_STRINGS_ARE_UTF8"
# build - threadsafe
- make -f Makefile.ref BUILD_OPT=1 JS_THREADSAFE=1 DIST=$startdir/pkg/usr all export || return 1
- # install
- mkdir -p $startdir/pkg/usr/include/js
- mv $startdir/pkg/usr/include/*.h $startdir/pkg/usr/include/js/
+ make -f Makefile.ref BUILD_OPT=1 JS_THREADSAFE=1 DIST="$pkgdir/usr" all export || return 1
}
diff --git a/abs/extra/spidermonkey/header.patch b/abs/extra/spidermonkey/header.patch
deleted file mode 100644
index b69caae..0000000
--- a/abs/extra/spidermonkey/header.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur js.orig/src/Makefile.ref js/src/Makefile.ref
---- js.orig/src/Makefile.ref 2008-07-18 21:05:37.154351682 +0800
-+++ js/src/Makefile.ref 2008-07-18 21:06:39.291061725 +0800
-@@ -188,6 +188,8 @@
- jsstr.h \
- jsxdrapi.h \
- jsxml.h \
-+ jsutil.h \
-+ jsprf.h \
- $(NULL)
-
- API_HFILES = \
diff --git a/abs/extra/spidermonkey/spidermonkey-Makefile.patch b/abs/extra/spidermonkey/spidermonkey-Makefile.patch
new file mode 100644
index 0000000..abf1f31
--- /dev/null
+++ b/abs/extra/spidermonkey/spidermonkey-Makefile.patch
@@ -0,0 +1,22 @@
+*** Makefile.ref.orig 2009-02-16 09:56:29.000000000 -0600
+--- Makefile.ref 2009-02-16 09:58:59.000000000 -0600
+***************
+*** 169,184 ****
+--- 169,185 ----
+ jstypes.h \
+ jsprvtd.h \
+ jspubtd.h \
+ jsregexp.h \
+ jsscan.h \
+ jsscope.h \
+ jsscript.h \
+ jsstr.h \
++ jsutil.h \
+ jsxdrapi.h \
+ jsxml.h \
+ $(NULL)
+
+ API_HFILES = \
+ jsapi.h \
+ jsdbgapi.h \
+ $(NULL)
diff --git a/abs/extra/startup-notification/PKGBUILD b/abs/extra/startup-notification/PKGBUILD
index 0d65123..2421bfc 100644
--- a/abs/extra/startup-notification/PKGBUILD
+++ b/abs/extra/startup-notification/PKGBUILD
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD 21429 2008-12-13 03:30:02Z eric $
+# $Id: PKGBUILD 36029 2009-04-19 18:23:54Z jgc $
# Maintainer: dorphell <dorphell@archlinux.org>
pkgname=startup-notification
-pkgver=0.9
+pkgver=0.10
pkgrel=1
pkgdesc="Monitor and display application startup"
arch=(i686 x86_64)
-depends=('libx11' 'libsm')
+license=('LGPL')
+depends=('libx11' 'libsm' 'xcb-util>=0.3.4')
options=('!libtool')
url="http://www.freedesktop.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('624b42f1fac5a12c543a079e2cd3b366')
+source=(http://www.freedesktop.org/software/startup-notification/releases/${pkgname}-${pkgver}.tar.gz)
+md5sums=('bca0ed1c74bc4e483ea2ed12a5717354')
build() {
- cd ${startdir}/src/${pkgname}-${pkgver}
- ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc || return 1
make || return 1
- make DESTDIR=${startdir}/pkg install
+ make DESTDIR="${pkgdir}" install || return 1
}