diff options
148 files changed, 1334 insertions, 3493 deletions
diff --git a/community/cross-arm-elf-gcc-base/PKGBUILD b/community/cross-arm-elf-gcc-base/PKGBUILD index c7a20839e..a7140315f 100644 --- a/community/cross-arm-elf-gcc-base/PKGBUILD +++ b/community/cross-arm-elf-gcc-base/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 36540 2011-01-04 13:58:12Z spupykin $ +# $Id: PKGBUILD 46060 2011-05-03 09:42:29Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=cross-arm-elf-gcc-base -pkgver=4.5.2 +pkgver=4.6.0 pkgrel=1 pkgdesc="The GNU Compiler Collection" arch=(i686 x86_64 'mips64el') license=('GPL' 'LGPL') url="http://gcc.gnu.org" -depends=('cross-arm-elf-binutils' 'libmpc' 'libelf' 'cloog-ppl') +depends=('cross-arm-elf-binutils' 'libmpc' 'libelf') options=(!libtool !emptydirs zipman docs !strip) source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-core-${pkgver}.tar.bz2) -md5sums=('aa9e36bec080452372bfba793428ee82') +md5sums=('b1957f3209080b2f55bc3756d3a62b7c') build() { cd $srcdir/gcc-$pkgver @@ -36,6 +36,14 @@ build() { --with-sysroot=/usr/$CHOST/arm-elf make all-gcc all-target-libgcc +} + +package() { + cd $srcdir/gcc-$pkgver/build + + export CFLAGS="-O2 -pipe" + export CXXFLAGS="-O2 -pipe" + make DESTDIR=$pkgdir install-gcc install-target-libgcc rm -f $pkgdir/usr/share/man/man7/fsf-funding.7* diff --git a/community/gimmie/ChangeLog b/community/gimmie/ChangeLog deleted file mode 100644 index 7fd5bbf99..000000000 --- a/community/gimmie/ChangeLog +++ /dev/null @@ -1,2 +0,0 @@ -2007-06-26 tardo <tardo@nagi-fanboi.net> -* Built for x86_64 diff --git a/community/gimmie/PKGBUILD b/community/gimmie/PKGBUILD deleted file mode 100644 index 2aefefda1..000000000 --- a/community/gimmie/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 44484 2011-04-07 20:23:57Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: György Balló <ballogy@freestart.hu> - -pkgname=gimmie -pkgver=0.2.8 -pkgrel=14 -pkgdesc="desktop organizer which allows interaction with applications, contacts, documents, etc" -arch=('i686' 'x86_64' 'mips64el') -url="http://beatniksoftware.com/gimmie/" -license=('LGPL') -depends=('libgnomecups' 'dbus-python' 'python2-gconf' 'python-gnomeapplet' - 'python-gnomedesktop' 'python2-libgnome' 'python-wnck' 'pyxdg' - 'hicolor-icon-theme' 'xdg-utils') -makedepends=('findutils' 'perlxml') -options=(!libtool) -install=$pkgname.install -source=(http://www.beatniksoftware.com/gimmie/releases/$pkgname-$pkgver.tar.gz) -md5sums=('721b8ec80f0247e1281aeb4aa5614c2f') - -build() { - cd "$srcdir/$pkgname-$pkgver" - sed -i 's@^#!.*python$@#!/usr/bin/python2@' gimmie/gimmie_{threads,bar}.py - - export CFLAGS="$CFLAGS `pkg-config --cflags glib-2.0`" - export LDFLAGS="$LDFLAGS `pkg-config --libs glib-2.0`" - - export CFLAGS="$CFLAGS `pkg-config --cflags gtk+-2.0`" - export LDFLAGS="$LDFLAGS `pkg-config --libs gtk+-2.0`" - - export CFLAGS="$CFLAGS `pkg-config --cflags pygtk-2.0`" - export LDFLAGS="$LDFLAGS `pkg-config --libs pygtk-2.0`" - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir="/usr/lib/$pkgname" \ - --disable-static --disable-schemas-install \ - --with-gconf-schema-file-dir=/usr/share/gconf/schemas \ - PYTHON=/usr/bin/python2 - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install -} diff --git a/community/gimmie/gimmie.install b/community/gimmie/gimmie.install deleted file mode 100644 index 015be0a4d..000000000 --- a/community/gimmie/gimmie.install +++ /dev/null @@ -1,22 +0,0 @@ -pkgname=gimmie - -post_install() { - gconfpkg --install $pkgname - xdg-icon-resource forceupdate -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - gconfpkg --uninstall $pkgname -} - -post_remove() { - xdg-icon-resource forceupdate -} diff --git a/community/glipper-old/PKGBUILD b/community/glipper-old/PKGBUILD deleted file mode 100644 index 37e0d0990..000000000 --- a/community/glipper-old/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 8877 2010-01-22 03:13:44Z dgriffiths $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Pbl Gomez <pblgomez@gmail.com> - -pkgname=glipper-old -pkgver=0.95.1 -pkgrel=3 -pkgdesc="Gnome clipboard for nongnome desktop" -arch=('i686' 'x86_64' 'mips64el') -url="http://sourceforge.net/projects/glipper/" -license=("GPL") -depends=(libgnome libglade) -makedepends=(pkgconfig perlxml gnome-doc-utils) -source=(http://downloads.sourceforge.net/sourceforge/glipper/glipper-$pkgver.tar.gz \ - arch.patch) -md5sums=('aa6524f59342d72fee8bed36e6267746' - 'e9e9581330bbc1fe0a28fa349de02bda') - -build() { - cd $startdir/src/glipper-$pkgver - - ln -s -f /usr/share/aclocal/gnome-doc-utils.m4 m4/gnome-doc-utils.m4 - ln -s -f /usr/share/gnome-doc-utils/gnome-doc-utils.make gnome-doc-utils.make - - patch -Np1 <../arch.patch && \ - mv data/glipper.png data/glipper-old.png && \ - mv help/C/glipper.xml help/C/glipper-old.xml && \ - mv data/glipper-properties.glade data/glipper-old-properties.glade && \ - mv data/glipper.desktop.in data/glipper-old.desktop.in || return 1 - - ./configure --prefix=/usr --program-suffix=-old --disable-gnome || return 1 - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 - rm -rf $startdir/pkg/usr/share/gnome -} diff --git a/community/glipper-old/arch.patch b/community/glipper-old/arch.patch deleted file mode 100644 index 6045ad75c..000000000 --- a/community/glipper-old/arch.patch +++ /dev/null @@ -1,266 +0,0 @@ -diff -wbBur glipper-0.95.1/configure glipper-0.95.1.my/configure ---- glipper-0.95.1/configure 2006-11-21 03:42:45.000000000 +0300 -+++ glipper-0.95.1.my/configure 2007-08-09 13:27:44.000000000 +0400 -@@ -557,10 +557,10 @@ - SHELL=${CONFIG_SHELL-/bin/sh} - - # Identity of this package. --PACKAGE_NAME='glipper' --PACKAGE_TARNAME='glipper' -+PACKAGE_NAME='glipper-old' -+PACKAGE_TARNAME='glipper-old' - PACKAGE_VERSION='0.95.1' --PACKAGE_STRING='glipper 0.95.1' -+PACKAGE_STRING='glipper-old 0.95.1' - PACKAGE_BUGREPORT='svenrech@gmx.de' - - ac_unique_file="src/main.c" -@@ -2134,7 +2134,7 @@ - - - # Define the identity of the package. -- PACKAGE='glipper' -+ PACKAGE='glipper-old' - VERSION='0.95.1' - - -@@ -2301,7 +2301,7 @@ - # GETTEXT - ########################################################################### - --GETTEXT_PACKAGE="glipper" -+GETTEXT_PACKAGE="glipper-old" - - - cat >>confdefs.h <<_ACEOF -diff -wbBur glipper-0.95.1/configure.in glipper-0.95.1.my/configure.in ---- glipper-0.95.1/configure.in 2006-11-21 03:59:24.000000000 +0300 -+++ glipper-0.95.1.my/configure.in 2007-08-09 13:35:04.000000000 +0400 -@@ -5,7 +5,7 @@ - AC_PREREQ(2.5) - - # Set VERSION number here --AC_INIT(glipper, [0.95.1], [svenrech@gmx.de]) -+AC_INIT(glipper-old, [0.95.1], [svenrech@gmx.de]) - AC_CONFIG_SRCDIR([src/main.c]) - AC_CONFIG_HEADER([config.h]) - AM_INIT_AUTOMAKE -@@ -29,7 +29,7 @@ - # GETTEXT - ########################################################################### - --GETTEXT_PACKAGE="glipper" -+GETTEXT_PACKAGE="glipper-old" - AC_SUBST(GETTEXT_PACKAGE) - AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package]) - -diff -wbBur glipper-0.95.1/data/glipper.desktop.in glipper-0.95.1.my/data/glipper.desktop.in ---- glipper-0.95.1/data/glipper.desktop.in 2006-06-26 23:46:04.000000000 +0400 -+++ glipper-0.95.1.my/data/glipper.desktop.in 2007-08-09 13:04:01.000000000 +0400 -@@ -3,9 +3,9 @@ - _Name=Glipper - _Comment=Clipboard Manager - Categories=GTK;GNOME;Application;Utility; --TryExec=glipper --Exec=glipper --Icon=glipper.png -+TryExec=glipper-old -+Exec=glipper-old -+Icon=glipper-old.png - Terminal=false - Type=Application - StartupNotify=false -diff -wbBur glipper-0.95.1/data/Makefile.am glipper-0.95.1.my/data/Makefile.am ---- glipper-0.95.1/data/Makefile.am 2006-06-26 23:46:08.000000000 +0400 -+++ glipper-0.95.1.my/data/Makefile.am 2007-08-09 13:33:06.000000000 +0400 -@@ -1,13 +1,13 @@ - desktopdir = $(datadir)/applications --desktop_in_files = glipper.desktop.in -+desktop_in_files = glipper-old.desktop.in - desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) - @INTLTOOL_DESKTOP_RULE@ - - icondir = $(datadir)/pixmaps --icon_DATA = glipper.png -+icon_DATA = glipper-old.png - --gladedir = $(datadir)/glipper --glade_DATA = glipper-properties.glade -+gladedir = $(datadir)/glipper-old -+glade_DATA = glipper-old-properties.glade - - EXTRA_DIST = \ - $(desktop_in_files) \ -diff -wbBur glipper-0.95.1/data/Makefile.in glipper-0.95.1.my/data/Makefile.in ---- glipper-0.95.1/data/Makefile.in 2006-11-21 03:42:44.000000000 +0300 -+++ glipper-0.95.1.my/data/Makefile.in 2007-08-09 13:16:54.000000000 +0400 -@@ -214,12 +214,12 @@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - desktopdir = $(datadir)/applications --desktop_in_files = glipper.desktop.in -+desktop_in_files = glipper-old.desktop.in - desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) - icondir = $(datadir)/pixmaps --icon_DATA = glipper.png --gladedir = $(datadir)/glipper --glade_DATA = glipper-properties.glade -+icon_DATA = glipper-old.png -+gladedir = $(datadir)/glipper-old -+glade_DATA = glipper-old-properties.glade - EXTRA_DIST = \ - $(desktop_in_files) \ - $(icon_DATA) \ -diff -wbBur glipper-0.95.1/help/Makefile.am glipper-0.95.1.my/help/Makefile.am ---- glipper-0.95.1/help/Makefile.am 2006-11-15 00:00:59.000000000 +0300 -+++ glipper-0.95.1.my/help/Makefile.am 2007-08-09 13:33:10.000000000 +0400 -@@ -1,7 +1,7 @@ - include $(top_srcdir)/gnome-doc-utils.make - dist-hook: doc-dist-hook - --DOC_MODULE = glipper -+DOC_MODULE = glipper-old - DOC_ENTITIES = - DOC_INCLUDES = - DOC_FIGURES = -diff -wbBur glipper-0.95.1/help/Makefile.in glipper-0.95.1.my/help/Makefile.in ---- glipper-0.95.1/help/Makefile.in 2006-11-21 03:42:44.000000000 +0300 -+++ glipper-0.95.1.my/help/Makefile.in 2007-08-09 13:04:40.000000000 +0400 -@@ -374,7 +374,7 @@ - _clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk) - _clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc) - _clean_dir = $(if $(DOC_MODULE),clean-doc-dir) --DOC_MODULE = glipper -+DOC_MODULE = glipper-old - DOC_ENTITIES = - DOC_INCLUDES = - DOC_FIGURES = -diff -wbBur glipper-0.95.1/po/POTFILES.in glipper-0.95.1.my/po/POTFILES.in ---- glipper-0.95.1/po/POTFILES.in 2006-06-26 23:46:14.000000000 +0400 -+++ glipper-0.95.1.my/po/POTFILES.in 2007-08-09 13:17:22.000000000 +0400 -@@ -1,4 +1,4 @@ - src/main.c - src/preferences.c --data/glipper-properties.glade --data/glipper.desktop.in -+data/glipper-old-properties.glade -+data/glipper-old.desktop.in -diff -wbBur glipper-0.95.1/src/main.c glipper-0.95.1.my/src/main.c ---- glipper-0.95.1/src/main.c 2006-11-21 03:05:53.000000000 +0300 -+++ glipper-0.95.1.my/src/main.c 2007-08-09 13:46:53.000000000 +0400 -@@ -141,7 +141,7 @@ - GError* pix_error = NULL; - - menuHeader = gtk_image_menu_item_new_with_label(""); -- pixbuf = gdk_pixbuf_new_from_file(PIXMAPDIR"/glipper.png", &pix_error); -+ pixbuf = gdk_pixbuf_new_from_file(PIXMAPDIR"/glipper-old.png", &pix_error); - - //In case we cannot load icon, display error message and exit - if (pix_error != NULL) -@@ -312,7 +312,7 @@ - - error = NULL; - //gnome_help_display ("glipper", NULL, &error); -- gnome_help_display_desktop(NULL, "glipper", "glipper", -+ gnome_help_display_desktop(NULL, "glipper-old", "glipper-old", - section, &error); - - if (error) -@@ -337,7 +337,7 @@ - - //Load trayicon - TrayIcon = (GtkWidget*)egg_tray_icon_new("GLIPPER"); -- pixbuf = gdk_pixbuf_new_from_file(PIXMAPDIR"/glipper.png", &pix_error); -+ pixbuf = gdk_pixbuf_new_from_file(PIXMAPDIR"/glipper-old.png", &pix_error); - - //In case we cannot load icon, display error message and exit - if (pix_error != NULL) -@@ -392,7 +392,7 @@ - "license", license, - "name", "Glipper", - "comments", _("Clipboardmanager for Gnome"), -- "logo", gdk_pixbuf_new_from_file(PIXMAPDIR"/glipper.png", &pix_error), -+ "logo", gdk_pixbuf_new_from_file(PIXMAPDIR"/glipper-old.png", &pix_error), - "website", "http://glipper.sourceforge.net/", - "version", VERSION, - NULL); -@@ -442,7 +442,7 @@ - //trys to open (or create) a file in "~/.glipper" for writing purposes: - FILE* writeGlipperFile(char* filename) - { -- gchar* directory = g_build_path("/", g_get_home_dir(), ".glipper", NULL); -+ gchar* directory = g_build_path("/", g_get_home_dir(), ".glipper-old", NULL); - gchar* path = g_build_filename(directory, filename, NULL); - FILE* file = fopen(path, "w"); - if (file == NULL) -@@ -453,7 +453,7 @@ - g_warning("Can't open or create file %s!", file); - } - else -- g_warning ("Can't create directory '.glipper' in user's home directory!"); -+ g_warning ("Can't create directory '.glipper-old' in user's home directory!"); - g_free(directory); - g_free(path); - return file; -@@ -480,7 +480,7 @@ - - void readHistory() - { -- gchar* path= g_build_filename(g_get_home_dir(), ".glipper/history", NULL); -+ gchar* path= g_build_filename(g_get_home_dir(), ".glipper-old/history", NULL); - FILE* histFile = fopen(path, "r"); - g_free(path); - if (histFile != 0) -@@ -501,7 +501,7 @@ - - void readPreferences() - { -- gchar* path= g_build_filename(g_get_home_dir(), ".glipper/prefs", NULL); -+ gchar* path= g_build_filename(g_get_home_dir(), ".glipper-old/prefs", NULL); - FILE* prefFile = fopen(path, "r"); - g_free(path); - free(keyComb); -@@ -599,7 +599,7 @@ - - //Init GTK+ (and optionally GNOME libs) - #ifndef DISABLE_GNOME -- gnome_program_init("glipper", VERSION, NULL, argc, argv, -+ gnome_program_init("glipper-old", VERSION, NULL, argc, argv, - NULL, NULL, NULL); - #endif /*DISABLE_GNOME*/ - gtk_init (&argc, &argv); -diff -wbBur glipper-0.95.1/src/Makefile.am glipper-0.95.1.my/src/Makefile.am ---- glipper-0.95.1/src/Makefile.am 2006-11-14 23:28:11.000000000 +0300 -+++ glipper-0.95.1.my/src/Makefile.am 2007-08-09 13:32:44.000000000 +0400 -@@ -1,6 +1,6 @@ - AM_CFLAGS = $(FR_CFLAGS) -I$(top_srcdir) \ - -DGLIPPERLOCALEDIR=\""$(glipperlocaledir)"\" -DPIXMAPDIR=\""$(datadir)/pixmaps"\" \ -- -DGLADEDIR=\""$(datadir)/glipper"\" -+ -DGLADEDIR=\""$(datadir)/glipper-old"\" - - noinst_PROGRAMS=glipper - bin_PROGRAMS=glipper -diff -wbBur glipper-0.95.1/src/Makefile.in glipper-0.95.1.my/src/Makefile.in ---- glipper-0.95.1/src/Makefile.in 2006-11-21 03:42:44.000000000 +0300 -+++ glipper-0.95.1.my/src/Makefile.in 2007-08-09 13:03:48.000000000 +0400 -@@ -223,7 +223,7 @@ - target_alias = @target_alias@ - AM_CFLAGS = $(FR_CFLAGS) -I$(top_srcdir) \ - -DGLIPPERLOCALEDIR=\""$(glipperlocaledir)"\" -DPIXMAPDIR=\""$(datadir)/pixmaps"\" \ -- -DGLADEDIR=\""$(datadir)/glipper"\" -+ -DGLADEDIR=\""$(datadir)/glipper-old"\" - - glipper_SOURCES = \ - main.c main.h preferences.c preferences.h \ -diff -wbBur glipper-0.95.1/src/preferences.c glipper-0.95.1.my/src/preferences.c ---- glipper-0.95.1/src/preferences.c 2006-07-15 17:27:49.000000000 +0400 -+++ glipper-0.95.1.my/src/preferences.c 2007-08-09 13:17:31.000000000 +0400 -@@ -8,7 +8,7 @@ - #include "main.h" - #include "utils/glipper-i18n.h" - --#define GLADE_XML_FILE "glipper-properties.glade" -+#define GLADE_XML_FILE "glipper-old-properties.glade" - - GtkWidget* historyLength; - GtkWidget* itemLength; diff --git a/community/glipper/PKGBUILD b/community/glipper/PKGBUILD deleted file mode 100644 index f1fae4d4e..000000000 --- a/community/glipper/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 44486 2011-04-07 20:24:38Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Pbl Gomez <pblgomez@gmail.com> - -pkgname=glipper -pkgver=1.0 -pkgrel=12 -pkgdesc="Clipboard for gnome desktop" -arch=('i686' 'x86_64' 'mips64el') -url="http://sourceforge.net/projects/glipper/" -license=("GPL") -depends=('python2-gconf' 'python-gnomeapplet' 'python2-libgnome' 'hicolor-icon-theme') -makedepends=('pkgconfig' 'perlxml' 'gnome-doc-utils') -optdepends=('pycrypto: encrypted connection support in Network plugin') -install=glipper.install -options=(!emptydirs !libtool) -source=(http://downloads.sourceforge.net/sourceforge/glipper/$pkgname-$pkgver.tar.bz2) -md5sums=('95315e62b950877611d4645a0b47e1ba') - -build() { - cd $srcdir/$pkgname-$pkgver - - ./configure --prefix=/usr --sysconfdir=/etc - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=$pkgdir install - - sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" \ - $pkgdir/usr/lib/glipper/glipper - - install -dm755 ${pkgdir}/usr/share/gconf/schemas - gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas $pkgdir/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/community/glipper/glipper.install b/community/glipper/glipper.install deleted file mode 100644 index 72012f6cd..000000000 --- a/community/glipper/glipper.install +++ /dev/null @@ -1,30 +0,0 @@ -pkgname=glipper - -post_install() { - export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source` - /usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/${pkgname}.schemas >/dev/null - /usr/bin/gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -pre_upgrade() { - echo "If you use Gnome, read http://glipper.sourceforge.net/ and remove ~/.glipper" - echo "If you don't use Gnome, use glipper-old package" - /bin/true -} - -post_upgrade() { - /usr/bin/gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -pre_remove() { - if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then - schemas=(usr/share/gconf/schemas/${pkgname}.schemas) - elif [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then - schemas=(opt/gnome/share/gconf/schemas/${pkgname}.schemas) - else - schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`) - fi - export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source` - usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null -} - diff --git a/community/gnome-commander/PKGBUILD b/community/gnome-commander/PKGBUILD index 026532442..203294179 100644 --- a/community/gnome-commander/PKGBUILD +++ b/community/gnome-commander/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 37675 2011-01-16 12:03:36Z ibiru $ +# $Id: PKGBUILD 46124 2011-05-03 20:51:46Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Johannes Sjolund <j.sjolund@gmail.com> pkgname=gnome-commander -pkgver=1.2.8.10 +pkgver=1.2.8.11 pkgrel=1 pkgdesc="A graphical two-pane filemanager for Gnome" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('perlxml' 'gnome-doc-utils>=0.20.1' 'intltool') options=(!libtool) install=gnome-commander.install source=(ftp://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/$pkgname-$pkgver.tar.bz2) -sha256sums=('148035ae09c32a383d30512e0a7129350a32b71d181bbd15b915cb67bc9232e0') +sha256sums=('ef0c466b0858542cf8aa2c63eee701a257ce189655d6a5e5f5bc64690ac26cd9') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -29,6 +29,10 @@ build() { --localstatedir=/var --disable-scrollkeeper --enable-python make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install mkdir -p "${pkgdir}"/usr/share/gconf/schemas diff --git a/community/gnumail/PKGBUILD b/community/gnumail/PKGBUILD index 6d4ea1590..dcdddce20 100644 --- a/community/gnumail/PKGBUILD +++ b/community/gnumail/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 44415 2011-04-07 13:04:56Z spupykin $ +# $Id: PKGBUILD 46065 2011-05-03 10:03:55Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=gnumail pkgver=1.2.0pre3 -pkgrel=4 +pkgrel=5 pkgdesc="A complete and fast mail application for GNUstep" arch=('i686' 'x86_64' 'mips64el') url="http://www.collaboration-world.com/gnumail" @@ -18,6 +18,12 @@ md5sums=('0f91fe0c32ef369ea843a2ab3909fb2b') build() { cd $srcdir/GNUMail . /etc/profile.d/GNUstep.sh - make + make \ + ADDITIONAL_OBJCFLAGS=-I/opt/GNUstep/System/Library/Headers \ + ADDITIONAL_GUI_LIBS="-L/opt/GNUstep/System/Library/Libraries -lGNUMail -lPantomime -lAddresses -lAddressView" +} + +package() { + cd $srcdir/GNUMail make GNUSTEP_INSTALLATION_DIR=$pkgdir/opt/GNUstep/System install } diff --git a/community/gnunet-setup/PKGBUILD b/community/gnunet-setup/PKGBUILD new file mode 100644 index 000000000..6e3585ef8 --- /dev/null +++ b/community/gnunet-setup/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 46057 2011-05-03 09:18:56Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=gnunet-setup +pkgver=0.9.0pre2 +pkgrel=1 +pkgdesc="setup tool for gnunet" +arch=(i686 x86_64) +url="http://gnunet.org/" +license=('GPL') +depends=('gnunet') +source=(ftp://ftp.gnu.org/gnu/gnunet/gnunet-setup-$pkgver.tar.gz) +md5sums=('b9c768fb2278b19561654c261f98062f') + +build() { + cd "$srcdir/$pkgname-$pkgver" + sed -i 's#gladeui-1#gladeui-2#' configure + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/community/kde4-kio-rapip/PKGBUILD b/community/kde4-kio-rapip/PKGBUILD new file mode 100644 index 000000000..92377772a --- /dev/null +++ b/community/kde4-kio-rapip/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 46077 2011-05-03 10:19:53Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: ReNoM <renom@list.ru> + +pkgname=kde4-kio-rapip +pkgver=0.2 +pkgrel=1 +pkgdesc="KIOSlave to browse through the PDA file system via the SynCE infrastructure" +arch=(i686 x86_64) +url="http://synce.sourceforge.net/" +license="MIT" +depends=('kdelibs' 'synce-libsynce' 'synce-librapi') +makedepends=('gcc' 'cmake' 'automoc4') +install=kde4-kio-rapip.install +source=(http://downloads.sourceforge.net/synce/$pkgname-$pkgver.tar.gz) +md5sums=('94473e10e1b4dd6040c646a8c7421d0c') + +build() { + cd "$srcdir/$pkgname-$pkgver" + cmake -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` . + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR=$pkgdir install + install -Dm0644 LICENSE $pkgdir/usr/share/licenses/kde4-kio-rapip/LICENSE +} diff --git a/community/kde4-kio-rapip/kde4-kio-rapip.install b/community/kde4-kio-rapip/kde4-kio-rapip.install new file mode 100644 index 000000000..b3ddbc43f --- /dev/null +++ b/community/kde4-kio-rapip/kde4-kio-rapip.install @@ -0,0 +1,14 @@ +post_install() { + which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true + update-mime-database usr/share/mime 1>/dev/null 2>/dev/null || true +} + +post_upgrade() { + which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true + update-mime-database usr/share/mime 1>/dev/null 2>/dev/null || true +} + +post_remove() { + which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true + update-mime-database usr/share/mime 1>/dev/null 2>/dev/null || true +} diff --git a/community/lcms2/PKGBUILD b/community/lcms2/PKGBUILD deleted file mode 100644 index 54dffb4f4..000000000 --- a/community/lcms2/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> -pkgname=lcms2 -pkgver=2.1 -pkgrel=1 -pkgdesc="Small-footprint color management engine" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.littlecms.com/" -license=('MIT') -depends=('libtiff') -options=(!libtool) -source=(http://downloads.sourceforge.net/project/lcms/lcms/$pkgver/lcms2-$pkgver.tar.gz) -md5sums=('08036edb115ad74456dfa20b1998b5f4') - -build() { - cd "$srcdir"/lcms2-$pkgver - - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir"/lcms2-$pkgver - - make DESTDIR="$pkgdir/" install - install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING -} - -# vim:set ts=2 sw=2 et: diff --git a/community/libpanelappletmm/PKGBUILD b/community/libpanelappletmm/PKGBUILD deleted file mode 100644 index 268785310..000000000 --- a/community/libpanelappletmm/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# $Id: PKGBUILD 28934 2010-10-07 19:16:14Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -# Contributor: uastasi <uastasi@archlinux.us> -pkgname=libpanelappletmm -pkgver=2.26.0 -pkgrel=3 -pkgdesc="C++ library for creating GNOME panel applets" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.gnome.org" -license=('GPL') -depends=( 'gtkmm' 'gnome-panel-bonobo' 'gconfmm') -options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('7aa569660b7ab36c1d86a7fa0beb7458306678e46bb2b7b1fd782bbcb5eb3852') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/usr/share - make - make DESTDIR="${pkgdir}" install -} diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index 43cf5b972..8d9ca3488 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 44862 2011-04-12 10:26:44Z spupykin $ +# $Id: PKGBUILD 46097 2011-05-03 14:39:45Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> @@ -11,12 +11,12 @@ _user=http _group=http pkgname=nginx -pkgver=1.0.0 +pkgver=1.0.1 pkgrel=1 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server" arch=('i686' 'x86_64' 'mips64el') depends=('pcre' 'zlib' 'openssl') -url="http://nginx.net/" +url="http://nginx.org" license=('custom') backup=("etc/nginx/conf/nginx.conf" "etc/nginx/conf/koi-win" @@ -27,7 +27,7 @@ backup=("etc/nginx/conf/nginx.conf" "etc/logrotate.d/nginx") source=(http://sysoev.ru/nginx/nginx-${pkgver}.tar.gz nginx) -md5sums=('5751c920c266ea5bb5fc38af77e9c71c' +md5sums=('4d4e70e3c6c907cb101c97e9cf9399c8' '837b010afcbdfe82d8e65ef00c4e14ba') build() { diff --git a/community/panflute/PKGBUILD b/community/panflute/PKGBUILD deleted file mode 100644 index 0f1a63445..000000000 --- a/community/panflute/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 31469 2010-10-31 21:20:40Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Owain Sutton <owainsutton @ gmail dot com> - -pkgname=panflute -pkgver=0.7.0 -pkgrel=1 -pkgdesc="Music player interface and panel applet - successor to music-applet" -arch=('i686' 'x86_64' 'mips64el') -url="https://launchpad.net/panflute" -license=('GPL') -depends=('dbus-python' 'gnome-python' 'python-notify' 'pygtk' 'python-numpy' 'python-gnomeapplet') -makedepends=('perlxml' 'gnome-doc-utils>=0.18' 'intltool' 'gnome-python-desktop' 'python-mpd') -optdepends=('python-mpd: for mpd support') -install=panflute.install -source=(http://launchpad.net/${pkgname}/0.7/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz) -md5sums=('3499e5e7beb9ee737898a7f1ccff9cb2') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/panflute \ - --disable-schemas-install - - make - make DESTDIR="${pkgdir}" install - - sed -i "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ - $(find ${pkgdir}/usr/lib/python2.7/site-packages/panflute/ -name '*.py') \ - ${pkgdir}/usr/lib/panflute/panflute-applet \ - ${pkgdir}/usr/bin/panflute-{daemon,launch-player} \ - ${pkgdir}/usr/bin/panflute-debugger \ - ${pkgdir}/usr/bin/panflute-tests - - install -m755 -d "${pkgdir}"/usr/share/gconf/schemas - gconf-merge-schema "${pkgdir}"/usr/share/gconf/schemas/${pkgname}.schemas --domain ${pkgname} \ - "${pkgdir}"/etc/gconf/schemas/*.schemas - - rm -rf "${pkgdir}"/etc/gconf -} diff --git a/community/panflute/panflute.install b/community/panflute/panflute.install deleted file mode 100644 index 078b30c4c..000000000 --- a/community/panflute/panflute.install +++ /dev/null @@ -1,17 +0,0 @@ -pkgname=panflute - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} diff --git a/community/pantomime/PKGBUILD b/community/pantomime/PKGBUILD index 3f192473a..d8cfc9588 100644 --- a/community/pantomime/PKGBUILD +++ b/community/pantomime/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 14370 2010-04-03 00:07:53Z foutrelis $ +# $Id: PKGBUILD 46068 2011-05-03 10:04:36Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=pantomime pkgver=1.2.0pre3 -pkgrel=2 +pkgrel=3 pkgdesc="A set of Objective-C classes that model a mail system" arch=('i686' 'x86_64' 'mips64el') url="http://www.collaboration-world.com/pantomime" @@ -12,17 +13,20 @@ license=("LGPL" "custom") depends=('gnustep-back' 'openssl') makedepends=('gnustep-make' 'gnustep-base' 'gcc-objc') options=('!makeflags') -source=(http://www.collaboration-world.com/cgi-bin/project/download.cgi/Pantomime-$pkgver.tar.gz?rid=104) -md5sums=('b88f4634ec1f3a1ea1d5551ee10d9db7') +source=("Pantomime-$pkgver.tar.gz::http://www.collaboration-world.com/cgi-bin/project/download.cgi/Pantomime-$pkgver.tar.gz?rid=104" + build-fix.patch) +md5sums=('b88f4634ec1f3a1ea1d5551ee10d9db7' + '53dc4960f4c2b50274ca01b2f29567d0') build() { + cd $srcdir/Pantomime source /etc/profile.d/GNUstep.sh - cd $startdir/src - mv Pantomime-$pkgver.tar.gz?rid=104 Pantomime-$pkgver.tar.gz - tar xfz Pantomime-$pkgver.tar.gz - cd $startdir/src/Pantomime + patch -p1 <$srcdir/build-fix.patch + make +} - make || return 1 - make GNUSTEP_INSTALLATION_DIR=$startdir/pkg/opt/GNUstep/System install || return 1 - install -D -m644 Documentation/LICENSE.elm $startdir/pkg/usr/share/licenses/$pkgname/LICENSE.elm -} +package() { + cd $srcdir/Pantomime + make GNUSTEP_INSTALLATION_DIR=$pkgdir/opt/GNUstep/System install + install -D -m644 Documentation/LICENSE.elm $pkgdir/usr/share/licenses/$pkgname/LICENSE.elm +} diff --git a/community/pantomime/build-fix.patch b/community/pantomime/build-fix.patch new file mode 100644 index 000000000..5696024b4 --- /dev/null +++ b/community/pantomime/build-fix.patch @@ -0,0 +1,12 @@ +diff -wbBur Pantomime/Framework/Pantomime/NSString+Extensions.m Pantomime.my/Framework/Pantomime/NSString+Extensions.m +--- Pantomime/Framework/Pantomime/NSString+Extensions.m 2006-09-04 20:04:02.000000000 +0000 ++++ Pantomime.my/Framework/Pantomime/NSString+Extensions.m 2011-05-03 09:49:54.000000000 +0000 +@@ -41,7 +41,7 @@ + #include <CoreFoundation/CFString.h> + #include <CoreFoundation/CFStringEncodingExt.h> + #else +-#include <GNUstepBase/GSCategories.h> ++//#include <GNUstepBase/GSCategories.h> + #endif + + #include <ctype.h> diff --git a/community/rawstudio/PKGBUILD b/community/rawstudio/PKGBUILD index ac33e7d99..4a2bfb58d 100644 --- a/community/rawstudio/PKGBUILD +++ b/community/rawstudio/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 44889 2011-04-12 12:28:53Z spupykin $ +# $Id: PKGBUILD 46083 2011-05-03 10:24:47Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,13 +6,13 @@ pkgname=rawstudio pkgver=2.0 -pkgrel=1 +pkgrel=2 pkgdesc="An open source raw-image converter written in GTK+" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://rawstudio.org/" depends=('exiv2' 'libgphoto2' 'flickcurl' 'libjpeg' 'fftw' 'gconf' 'lensfun' - 'raptor' 'lcms') + 'raptor1' 'lcms' 'gtk2') install=${pkgname}.install options=('!libtool') source=(http://rawstudio.org/files/release/${pkgname}-${pkgver}.tar.gz) diff --git a/community/sensors-applet/FS9379.patch b/community/sensors-applet/FS9379.patch deleted file mode 100644 index 5fee4e20f..000000000 --- a/community/sensors-applet/FS9379.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- sensors-applet-2.2.1.orig/plugins/nvidia/nvidia-plugin.c -+++ sensors-applet-2.2.1/plugins/nvidia/nvidia-plugin.c -@@ -81,7 +81,7 @@ - /* create the connection to the X server */ - if (!(nvidia_sensors_dpy = XOpenDisplay(NULL))) { - /* no connection to the X server avaible */ -- return; -+ return sensors; - } - - /* check if the NV-CONTROL extension is available on this X -only in patch2: -unchanged: ---- sensors-applet-2.2.1.orig/plugins/libsensors/libsensors-plugin.c -+++ sensors-applet-2.2.1/plugins/libsensors/libsensors-plugin.c -@@ -258,7 +258,8 @@ - * file - if neither succeed, exit */ - if ((file = fopen (LIBSENSORS_CONFIG_FILE, "r")) == NULL) { - if ((file = fopen (LIBSENSORS_ALTERNATIVE_CONFIG_FILE, "r")) == NULL) { -- return; -+ g_debug("%s: error opening libsensors config file... ", __FUNCTION__); -+ return sensors; - } - } - -@@ -266,7 +267,8 @@ - * valid, close file and return */ - if (sensors_init(file) != 0) { - fclose(file); -- return; -+ g_debug("%s: error initing libsensors from config file...", __FUNCTION__); -+ return sensors; - } - fclose(file); - -@@ -293,7 +295,8 @@ - - int nr = 0; - if (sensors_init(NULL) != 0) { -- return; -+ g_debug("%s: error initing libsensors", __FUNCTION__); -+ return sensors; - } - i = 0; - while ((chip_name = sensors_get_detected_chips(NULL, &nr))) -@@ -502,7 +505,7 @@ - if (regcomp(&uri_re, "^sensor://([a-z0-9-]+)/([0-9]+)$", - REG_EXTENDED | REG_ICASE) != 0) { - g_debug("Error compiling regexp...not initing libsensors sensors interface"); -- return; -+ return NULL; - } - - return libsensors_plugin_get_sensors(); diff --git a/community/sensors-applet/PKGBUILD b/community/sensors-applet/PKGBUILD deleted file mode 100644 index 2a98f3b16..000000000 --- a/community/sensors-applet/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 41542 2011-03-07 16:09:06Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -# Contributor: Roman Kyrylych <roman@archlinux.org> -# Contributor: Michael Barker - -pkgname=sensors-applet -pkgver=2.2.7 -pkgrel=3 -pkgdesc="An applet for the GNOME Panel to display readings from hardware sensors, including CPU temperature, fan speeds and voltage readings." -arch=('i686' 'x86_64' 'mips64el') -url="http://sensors-applet.sourceforge.net/" -license=('GPL') -depends=('gnome-panel-bonobo' 'lm_sensors' 'hicolor-icon-theme') -makedepends=('intltool' 'gnome-doc-utils>=0.18.1' 'libxnvctrl' 'libgnomeui') -optdepends=('hddtemp: for HDD support' - 'libxnvctrl: for Nvidia GPU support') -install=sensors-applet.install -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz - sensors-applet-2.2.7-libnotify-0.7.patch) -options=('!libtool') -md5sums=('f342fab98be4f1b9a25af0689af20130' - '96a4393d9e75e5eb88a6e906a5a7e464') - -build() { - cd $srcdir/$pkgname-$pkgver - patch -Np1 -i $srcdir/sensors-applet-2.2.7-libnotify-0.7.patch - ./configure --prefix=/usr \ - --libexecdir=/usr/lib/sensors-applet \ - --localstatedir=/var \ - --disable-scrollkeeper \ - --with-nvidia \ - --enable-libnotify - make - make DESTDIR=$pkgdir install -} diff --git a/community/sensors-applet/sensors-applet-2.2.7-libnotify-0.7.patch b/community/sensors-applet/sensors-applet-2.2.7-libnotify-0.7.patch deleted file mode 100644 index ea2f7803a..000000000 --- a/community/sensors-applet/sensors-applet-2.2.7-libnotify-0.7.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/sensors-applet/active-sensor-libnotify.c b/sensors-applet/active-sensor-libnotify.c -index e69b005..f7a7eb8 100644 ---- a/sensors-applet/active-sensor-libnotify.c -+++ b/sensors-applet/active-sensor-libnotify.c -@@ -84,10 +84,23 @@ void active_sensor_libnotify_notify(ActiveSensor *active_sensor, - - /* now create a new one */ - g_debug("Creating new notification"); -+ #ifdef NOTIFY_CHECK_VERSION -+ #if NOTIFY_CHECK_VERSION (0, 7, 1) -+ active_sensor->notification[notif_type] = notify_notification_new(summary, -+ message, -+ icon_filename); -+ #else -+ active_sensor->notification[notif_type] = notify_notification_new(summary, -+ message, -+ icon_filename, -+ attach); -+ #endif -+ #else - active_sensor->notification[notif_type] = notify_notification_new(summary, - message, - icon_filename, - attach); -+ #endif - g_signal_connect(active_sensor->notification[notif_type], "closed", - G_CALLBACK(notif_closed_cb), - active_sensor); -diff --git a/sensors-applet/sensors-applet.c b/sensors-applet/sensors-applet.c -index 9486173..81675b8 100644 ---- a/sensors-applet/sensors-applet.c -+++ b/sensors-applet/sensors-applet.c -@@ -303,11 +303,23 @@ void sensors_applet_notify(SensorsApplet *sensors_applet, - message = g_strdup_printf(_("An error occurred while trying to save the current sensor configuration. ")); - break; - } -- -+ #ifdef NOTIFY_CHECK_VERSION -+ #if NOTIFY_CHECK_VERSION (0, 7, 1) -+ sensors_applet->notification = notify_notification_new(summary, -+ message, -+ GTK_STOCK_DIALOG_WARNING); -+ #else -+ sensors_applet->notification = notify_notification_new(summary, -+ message, -+ GTK_STOCK_DIALOG_WARNING, -+ GTK_WIDGET(sensors_applet->applet)); -+ #endif -+ #else - sensors_applet->notification = notify_notification_new(summary, - message, - GTK_STOCK_DIALOG_WARNING, - GTK_WIDGET(sensors_applet->applet)); -+ #endif - g_free(summary); - g_free(message); - diff --git a/community/sensors-applet/sensors-applet.install b/community/sensors-applet/sensors-applet.install deleted file mode 100644 index 43ed0a554..000000000 --- a/community/sensors-applet/sensors-applet.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/community/springlobby/PKGBUILD b/community/springlobby/PKGBUILD index 0c3dd6d60..51e31a83e 100644 --- a/community/springlobby/PKGBUILD +++ b/community/springlobby/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 45554 2011-04-24 08:25:45Z svenstaro $ +# $Id: PKGBUILD 46111 2011-05-03 18:11:02Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: DuGi <dugi@irc.pl> pkgname=springlobby -pkgver=0.129 +pkgver=0.130 pkgrel=1 pkgdesc="A free cross-platform lobby client for the Spring RTS project." arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('boost' 'asio' 'cmake') source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2 springlobby.desktop springlobby.png) -md5sums=('ff6573d21f6720f693312dca7fd31d5a' +md5sums=('b876b3fd98c73db816ed0d677117d39a' '45f8b59d033931d02e734fe3bd7777dd' '1f388187539aeb0358b51995e26ed890') diff --git a/community/synce-hal/PKGBUILD b/community/synce-hal/PKGBUILD new file mode 100644 index 000000000..4b1e4849f --- /dev/null +++ b/community/synce-hal/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 46079 2011-05-03 10:20:22Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: ansgras <ataflinski@uni-koblenz.de> + +pkgname=synce-hal +pkgver=0.15 +pkgrel=1 +pkgdesc="hal based alternative for SynCE dccm" +arch=('i686' 'x86_64') +url="http://synce.sourceforge.net/" +license=('GPL') +depends=('synce-libsynce' 'gnet' 'dhclient' 'hal' 'dbus') +source=(http://switch.dl.sf.net/sourceforge/synce/synce-hal-$pkgver.tar.gz) +md5sums=('796eca27a2ce561247e7a71375c242b6') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname \ + --with-hal-addon-dir=/usr/lib/hal/scripts + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR="$pkgdir/" install +} diff --git a/community/synce-libsynce/PKGBUILD b/community/synce-libsynce/PKGBUILD index f19ed11b6..1329374b6 100644 --- a/community/synce-libsynce/PKGBUILD +++ b/community/synce-libsynce/PKGBUILD @@ -1,21 +1,26 @@ -# $Id: PKGBUILD 43060 2011-03-23 21:47:47Z spupykin $ +# $Id: PKGBUILD 46029 2011-05-02 10:37:25Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zhukov Pavel <gelios@gmail.com> pkgname=synce-libsynce pkgver=0.15.1 -pkgrel=1 +pkgrel=2 pkgdesc="provide a means of communication with a Windows CE device - libraries" arch=('i686' 'x86_64' 'mips64el') url="http://synce.sourceforge.net/" license=('GPL') -depends=('glibc' 'hal') +depends=('dbus-glib') +options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/synce/libsynce-$pkgver.tar.gz) md5sums=('eaddc88c5f0027e89c6f0fffec34def2') build() { cd $srcdir/libsynce-$pkgver - ./configure --prefix=/usr + ./configure --prefix=/usr --enable-odccm-support --enable-udev-support --disable-hal-support make +} + +package() { + cd $srcdir/libsynce-$pkgver make DESTDIR=$pkgdir install } diff --git a/community/wtf/LICENSE b/community/wtf/LICENSE deleted file mode 100644 index dd912d4eb..000000000 --- a/community/wtf/LICENSE +++ /dev/null @@ -1,10 +0,0 @@ -Copyright (c) 2005, peter -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of the <ORGANIZATION> nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/community/wtf/PKGBUILD b/community/wtf/PKGBUILD deleted file mode 100644 index 9870fb27b..000000000 --- a/community/wtf/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# $Id: PKGBUILD 1265 2009-08-14 05:26:40Z ebelanger $ -# Maintainer: Jeff Mickey <j@codemac.net> - -pkgname=wtf -pkgver=20071004 -pkgrel=2 -pkgdesc="ancronym dictionary" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.mu.org/~mux/wtf/" -license=('BSD') -source=(http://www.mu.org/~mux/wtf/$pkgname-$pkgver.tar.gz LICENSE) -md5sums=('25944e275cc858e30cacea341509d19b' 'abac213cf24e9d5cab4e8115441eb717') - -build() { - cd $startdir/src/$pkgname-$pkgver - - install -D -m644 $pkgname.6 $startdir/pkg/usr/share/man/man6/$pkgname.6 - install -D -m755 $pkgname $startdir/pkg/usr/bin/$pkgname - mkdir -p $startdir/pkg/usr/share/misc/ - install -m644 acronyms acronyms.comp $startdir/pkg/usr/share/misc/ - install -Dm644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/community/xmonad-log-applet/PKGBUILD b/community/xmonad-log-applet/PKGBUILD deleted file mode 100644 index 76ee40a6f..000000000 --- a/community/xmonad-log-applet/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# Contributor: Alexander Kreuzer <alex@freesources.org> -# Maintainer: Jelle van der Waa <jelle vdwaa nl> - -pkgname=xmonad-log-applet -pkgver=1.0.2 -pkgrel=1 -pkgdesc="Gnome Applet that display xmonad log message through DBus" -arch=('i686' 'x86_64' 'mips64el') -url="http://uhsure.com/xmonad-log-applet.html" -license=('custom') -groups=() -install=$pkgname.install -depends=(dbus-core gnome-panel-bonobo hicolor-icon-theme) -makedepends=() -optdepends=("haskell-dbus: for xmonad integration see http://uhsure.com/xmonad-log-applet.html" ) -source=(http://uhsure.com/xmonad-log-applet/$pkgname-$pkgver.tar.gz) -noextract=() - -build() { - export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr - make -} -package() { - cd $srcdir/$pkgname-$pkgver - install -d $pkgdir/usr/libexec $pkgdir/usr/lib/bonobo/servers $pkgdir/usr/share/icons/hicolor/48x48/apps - make DESTDIR=$pkgdir install - install -D LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE - -} - -md5sums=('31219f21cb9075b33d3880e2eb5a2b80') diff --git a/community/xmonad-log-applet/xmonad-log-applet.install b/community/xmonad-log-applet/xmonad-log-applet.install deleted file mode 100644 index 2e96975d1..000000000 --- a/community/xmonad-log-applet/xmonad-log-applet.install +++ /dev/null @@ -1,3 +0,0 @@ -post_install() { - gtk-update-icon-cache /usr/share/icons/hicolor -} diff --git a/community/xulrunner-oss/PKGBUILD b/community/xulrunner-oss/PKGBUILD index 93674368b..756e41e3f 100644 --- a/community/xulrunner-oss/PKGBUILD +++ b/community/xulrunner-oss/PKGBUILD @@ -2,9 +2,9 @@ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xulrunner-oss -pkgver=2.0 -_ffoxver=4.0 -pkgrel=2 +pkgver=2.0.1 +_ffoxver=4.0.1 +pkgrel=1 pkgdesc="Mozilla Runtime Environment compiled with OSS support" arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') @@ -21,13 +21,14 @@ source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${_ffoxver} options=('!emptydirs') conflicts=('xulrunner') provides=("xulrunner=${pkgver}") -md5sums=('3468a2c463b4fc2788ba621e4b511c30' +md5sums=('9abda7d23151e97913c8555a64c13f34' '2358a2ddd35bcdd62ff42442dfe548d9' '639ea80e823543dd415b90c0ee804186' 'a0236f6c3e55f60b7888d8cf137ff209' - 'dea8c2a57a588bf5f6198ce7b4155655' + '0bf82bc6677e3ce57fd20a147fe8d7b1' '42f83468b296452fb754a81a4317ca64' - '81032ce49c2a5ac15d62155bcc42d3ed') + '81032ce49c2a5ac15d62155bcc42d3ed') + build() { cd "${srcdir}/mozilla-2.0" cp "${srcdir}/mozconfig" .mozconfig @@ -39,7 +40,7 @@ build() { patch -Np1 -i "${srcdir}/xulrunner-version.patch" patch -Np1 -i "${srcdir}/xulrunner-omnijar.patch" - + patch -Np1 -i "${srcdir}/port_gnomevfs_to_gio.patch" patch -Np0 -i "${srcdir}/oss.patch" @@ -49,6 +50,7 @@ build() { unset CFLAGS unset CXXFLAGS + export CXXFLAGS="-fpermissive" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" } diff --git a/community/xulrunner-oss/xulrunner-omnijar.patch b/community/xulrunner-oss/xulrunner-omnijar.patch index 05b665afd..66ec5206c 100644 --- a/community/xulrunner-oss/xulrunner-omnijar.patch +++ b/community/xulrunner-oss/xulrunner-omnijar.patch @@ -468,11 +468,11 @@ diff --git a/js/src/xpconnect/loader/mozJSComponentLoader.cpp b/js/src/xpconnect diff --git a/modules/libjar/nsJAR.cpp b/modules/libjar/nsJAR.cpp --- a/modules/libjar/nsJAR.cpp +++ b/modules/libjar/nsJAR.cpp -@@ -170,26 +170,23 @@ nsJAR::Open(nsIFile* zipFile) - NS_ENSURE_ARG_POINTER(zipFile); +@@ -171,26 +171,23 @@ nsJAR::Open(nsIFile* zipFile) if (mLock) return NS_ERROR_FAILURE; // Already open! mZipFile = zipFile; + mOuterZipEntry.Truncate(); mLock = PR_NewLock(); NS_ENSURE_TRUE(mLock, NS_ERROR_OUT_OF_MEMORY); @@ -499,13 +499,13 @@ diff --git a/modules/libjar/nsJAR.cpp b/modules/libjar/nsJAR.cpp NS_ENSURE_ARG_POINTER(aZipReader); NS_ENSURE_ARG_POINTER(aZipEntry); @@ -234,23 +231,22 @@ nsJAR::Close() + mLock = nsnull; } mParsedManifest = PR_FALSE; mManifestData.Reset(); mGlobalStatus = JAR_MANIFEST_NOT_PARSED; mTotalItemsInManifest = 0; - mOuterZipEntry.Truncate(0); -#ifdef MOZ_OMNIJAR - if (mZip == mozilla::OmnijarReader()) { diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD index 28d17576b..bf54f3bb2 100644 --- a/core/binutils/PKGBUILD +++ b/core/binutils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 116976 2011-03-27 06:07:38Z allan $ +# $Id: PKGBUILD 121290 2011-04-30 08:22:29Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc diff --git a/core/coreutils/PKGBUILD b/core/coreutils/PKGBUILD index 7d99e4155..a5dd6ce81 100644 --- a/core/coreutils/PKGBUILD +++ b/core/coreutils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 119714 2011-04-14 01:48:09Z allan $ +# $Id: PKGBUILD 120920 2011-04-27 11:05:23Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=coreutils -pkgver=8.11 +pkgver=8.12 pkgrel=1 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system" arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz coreutils-uname.patch coreutils-pam.patch su.pam) -md5sums=('b623ee9b1b768a14e40dfd35ff446f4c' +md5sums=('0f7d43c2d2e24314b43a6c6267e25b90' 'c4fcca138b6abf6d443d48a6f0cd8833' 'aad79a2aa6d566c375d7bdd1b0767278' 'fa85e5cce5d723275b14365ba71a8aad') diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index b30aeeb2b..2302717db 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 119862 2011-04-16 05:35:51Z allan $ +# $Id: PKGBUILD 121304 2011-04-30 13:23:58Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,8 +6,8 @@ pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc') pkgver=4.6.0 -pkgrel=3 -_snapshot=4.6-20110415 +pkgrel=4 +_snapshot=4.6-20110429 _libstdcppmanver=20110201 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection" license=('GPL' 'LGPL' 'custom') @@ -23,13 +23,13 @@ source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran, gcc_pure64.patch gcc_mips64el_lib.patch gcc-hash-style-both.patch) -md5sums=('aed037654091d1f478dfcb6e13444325' - '8d4b78c03c1d477c6cb562d42f461958' - 'c346e76014569b25e2869ff986d2ac2d' - '8376485de1c7aa90bb32f52f2372d451' - '0c2d89f9e2e614ad84c6e2aa239c5c1c' - '50bab6a0c9e5403ea77f57361dec5436' - '6e0032461f87ce60db6302ca652ae9d8' +md5sums=('fa586a5634ae3b462c5fb2d55160b14f' + '2591b1fad977f7bd6136c9ac1298ef04' + '366f93c1867f35c8860b42965efde955' + '21779792ef7e0ed7abef611160b0099c' + 'cf518c56b968925a2eca3aa2b4cdbd7b' + 'f66ef8597b99961eda7573df505ea354' + '3d89dd233ceb6a837d14ee6b940a43ed' '1e9fd2eaf0ee47ea64e82c48998f1999' '4030ee1c08dd1e843c0225b772360e76' '67e337993d821d72fccacbed52d48c34' diff --git a/core/libgcrypt/PKGBUILD b/core/libgcrypt/PKGBUILD index fbc9a5a85..e64faa607 100644 --- a/core/libgcrypt/PKGBUILD +++ b/core/libgcrypt/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 117849 2011-04-04 18:49:54Z andyrtr $ +# $Id: PKGBUILD 121250 2011-04-29 21:23:37Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=libgcrypt pkgver=1.4.6 -pkgrel=2 +pkgrel=3 pkgdesc="a general purpose crypto library based on the code used" arch=(i686 x86_64 'mips64el') url="http://www.gnupg.org" license=('LGPL') depends=('libgpg-error>=1.9') -options=(!libtool) +options=('!libtool' '!emptydirs') +install=$pkgname.install source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2 #ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/libgcrypt/${pkgname}-${pkgver}.tar.bz2 ) diff --git a/core/libtool/PKGBUILD b/core/libtool/PKGBUILD index e243b37ec..ffc562974 100644 --- a/core/libtool/PKGBUILD +++ b/core/libtool/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103285 2010-12-17 05:56:05Z allan $ +# $Id: PKGBUILD 116987 2011-03-27 06:40:02Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> @@ -6,7 +6,7 @@ pkgname=libtool pkgver=2.4 -pkgrel=2 +pkgrel=3 pkgdesc="A generic library support script" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libtool" diff --git a/core/tzdata/PKGBUILD b/core/tzdata/PKGBUILD index e1ee6ceb8..12de51816 100644 --- a/core/tzdata/PKGBUILD +++ b/core/tzdata/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 117841 2011-04-04 18:27:28Z andyrtr $ +# $Id: PKGBUILD 121182 2011-04-29 06:58:28Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=tzdata @@ -12,11 +12,14 @@ url="http://www.twinsun.com/tz/tz-link.htm" license=('GPL') depends=() makedepends=() -optdepends=('sh: required by tzselect') +optdepends=('bash: required by tzselect') options=('!emptydirs') source=(ftp://elsie.nci.nih.gov/pub/tzcode${_tzcode}.tar.gz \ ftp://elsie.nci.nih.gov/pub/${pkgname}${_tzdata}.tar.gz \ Makefile.patch) +md5sums=('ecb564279b28c5b184421c525d997d6c' + 'a068c27e7e426fdb12ab0c88506df20d' + 'a64ed97d1fc03c66ee8612c0d9f40507') build() { cd ${srcdir} @@ -29,12 +32,14 @@ build() { make } +check() { + cd ${srcdir} + make check +} + package() { cd ${srcdir} make DESTDIR="${pkgdir}" install rm "${pkgdir}/usr/share/zoneinfo/localtime" } -md5sums=('ecb564279b28c5b184421c525d997d6c' - 'a068c27e7e426fdb12ab0c88506df20d' - 'a64ed97d1fc03c66ee8612c0d9f40507') diff --git a/core/xfsprogs/PKGBUILD b/core/xfsprogs/PKGBUILD index 1dc00c598..6751be9ec 100644 --- a/core/xfsprogs/PKGBUILD +++ b/core/xfsprogs/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 100477 2010-11-23 17:28:22Z tpowa $ +# $Id: PKGBUILD 118982 2011-04-09 21:14:21Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=xfsprogs -pkgver=3.1.4 +pkgver=3.1.5 pkgrel=1 pkgdesc="XFS filesystem utilities" arch=('i686' 'x86_64' 'mips64el') @@ -12,6 +12,7 @@ depends=('util-linux-ng>=2.16') options=('!makeflags' '!libtool') # We mirror the sources as upstream tends to move them once a new release is out source=("ftp://ftp.archlinux.org/other/xfsprogs/${pkgname}-${pkgver}.tar.gz") +md5sums=('b1db37749e2b4149a0dd178abff956be') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -26,4 +27,3 @@ package() { chown -R root $pkgdir chgrp -R root $pkgdir } -md5sums=('74081975f148bcabcab26c4c3496ede9') diff --git a/extra/a52dec/PKGBUILD b/extra/a52dec/PKGBUILD index 1b0f05be0..9c64162b2 100644 --- a/extra/a52dec/PKGBUILD +++ b/extra/a52dec/PKGBUILD @@ -1,26 +1,32 @@ -# $Id: PKGBUILD 5600 2008-07-18 22:05:50Z jgc $ -# Maintainer: Thomas Baechler <thomas@archlinux.org> -# contributor: Sarah Hay <sarahhay@mb.sympatico.ca> +# $Id: PKGBUILD 122062 2011-05-02 05:42:16Z andrea $ +# Maintainer: +# Contributor: Thomas Baechler <thomas@archlinux.org> +# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=a52dec pkgver=0.7.4 -pkgrel=4 -pkgdesc="liba52 is a free library for decoding ATSC A/52 streams." +pkgrel=5 +pkgdesc="A free library for decoding ATSC A/52 streams" +url="http://liba52.sourceforge.net/" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') depends=('glibc') options=(!libtool) -source=(http://liba52.sourceforge.net/files/${pkgname}-${pkgver}.tar.gz - a52dec-0.7.4-build.patch) -url="http://liba52.sourceforge.net/" -md5sums=('caa9f5bc44232dc8aeea773fea56be80' 'fa16f224a7dceb7613824380abef0052') +source=("http://liba52.sourceforge.net/files/${pkgname}-${pkgver}.tar.gz" + 'a52dec-0.7.4-build.patch') +md5sums=('caa9f5bc44232dc8aeea773fea56be80' + 'fa16f224a7dceb7613824380abef0052') build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i ${srcdir}/a52dec-0.7.4-build.patch || return 1 - ./bootstrap || return 1 - ./configure --prefix=/usr --enable-shared || return 1 - make || return 1 - make DESTDIR=${pkgdir} install || return 1 - install -m644 liba52/a52_internal.h $startdir/pkg/usr/include/a52dec/ || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/a52dec-0.7.4-build.patch" + ./bootstrap + ./configure --prefix=/usr --enable-shared + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m644 liba52/a52_internal.h "${pkgdir}/usr/include/a52dec/" } diff --git a/extra/aubio/PKGBUILD b/extra/aubio/PKGBUILD index 26851a036..517f756d6 100644 --- a/extra/aubio/PKGBUILD +++ b/extra/aubio/PKGBUILD @@ -1,24 +1,27 @@ -# $Id: PKGBUILD 12257 2008-09-12 03:03:42Z eric $ +# $Id: PKGBUILD 122072 2011-05-02 05:51:30Z andrea $ # Maintainer: Tobias Kieslich tobias [funnychar] archlinux org -# AUR-Maintainer: Andrea Scarpino <bash.lnx@gmail.com> # Contributor: Peter Baldwin <bald_pete@hotmail.com> # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw> pkgname=aubio pkgver=0.3.2 -pkgrel=3 +pkgrel=4 pkgdesc="A library for audio labelling" arch=('i686' 'x86_64' 'mips64el') -url="http://aubio.piem.org/" +url="http://aubio.org/" license=('GPL') -depends=('libsamplerate' 'fftw' 'jack-audio-connection-kit') +depends=('libsamplerate' 'fftw' 'jack') options=('!libtool') -source=(http://aubio.piem.org/pub/${pkgname}-${pkgver}.tar.gz) +source=("http://aubio.org/pub/${pkgname}-${pkgver}.tar.gz") md5sums=('ffc3e5e4880fec67064f043252263a44') build() { - cd ${startdir}/src/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr - make || return 1 - make DESTDIR=${startdir}/pkg install + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/automoc4/PKGBUILD b/extra/automoc4/PKGBUILD index a71031bf3..2d0f8dc7c 100644 --- a/extra/automoc4/PKGBUILD +++ b/extra/automoc4/PKGBUILD @@ -1,28 +1,33 @@ -# $ Id: $ -# Maintainer: Pierre Schmitz <pierre@archlinux.de> +# $Id: PKGBUILD 122082 2011-05-02 06:05:33Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=automoc4 pkgver=0.9.88 -pkgrel=1 -pkgdesc="KDE automoc4" +pkgrel=2 +pkgdesc="Automatic moc for Qt4" arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('custom') -depends=('qt>=4.4') +depends=('qt') makedepends=('pkgconfig' 'cmake') -source=("ftp://ftp.archlinux.org/other/automoc4/automoc4-${pkgver}.tar.bz2") -md5sums=('adffb45ea2b550f284b1e3455f525176') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2" + 'license.txt') +md5sums=('91bf517cb940109180ecd07bc90c69ec' + '9014edbb7e2f02fe90b2db8707487bce') build() { - cd ${srcdir} + cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr make - make DESTDIR=$pkgdir install +} - grep -A 21 '^ Copyright' ${srcdir}/${pkgname}-${pkgver}/kde4automoc.cpp > license.txt - install -D license.txt ${pkgdir}/usr/share/licenses/automoc4/license.txt +package() { + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install + install -Dm644 "${srcdir}/license.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/automoc4/license.txt b/extra/automoc4/license.txt new file mode 100644 index 000000000..f9db60340 --- /dev/null +++ b/extra/automoc4/license.txt @@ -0,0 +1,31 @@ +Upstream Authors: + + Mathias Kretz <kretz@kde.org> + Alexander Neundorff <neundorff@kde.org> + +Copyright: + + Copyright (c) 2007 Mathias Kretz <kretz@kde.org> + +License: + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/extra/banshee/PKGBUILD b/extra/banshee/PKGBUILD index f3850002e..3f97b8415 100644 --- a/extra/banshee/PKGBUILD +++ b/extra/banshee/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 119748 2011-04-14 13:27:14Z jgc $ +# $Id: PKGBUILD 122335 2011-05-03 22:31:33Z ibiru $ # Contributor: György Balló <ballogy@freestart.hu> pkgname=banshee -pkgver=2.0.0 -pkgrel=3 +pkgver=2.0.1 +pkgrel=1 pkgdesc="Music management and playback for GNOME" arch=('i686' 'x86_64' 'mips64el') url="http://banshee.fm/" license=('MIT') -depends=('libxxf86vm' 'mono-addins' 'notify-sharp-svn' 'boo' 'libwebkit' 'gdata-sharp' 'gtk-sharp-beans' 'gudev-sharp' 'gkeyfile-sharp' 'taglib-sharp' 'libmtp' 'libgpod' 'mono-zeroconf' 'gstreamer0.10-base-plugins' 'desktop-file-utils' 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'gconf-sharp') +depends=('libxxf86vm' 'mono-addins' 'notify-sharp-svn' 'boo' 'libwebkit' 'gdata-sharp' 'gtk-sharp-beans' 'gudev-sharp' 'ipod-sharp' 'gkeyfile-sharp' 'taglib-sharp' 'libmtp' 'libgpod' 'mono-zeroconf' 'gstreamer0.10-base-plugins' 'desktop-file-utils' 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'gconf-sharp') makedepends=('intltool' 'gnome-doc-utils') optdepends=('gstreamer0.10-good-plugins: Extra media codecs' 'gstreamer0.10-ugly-plugins: Extra media codecs' @@ -18,7 +18,7 @@ optdepends=('gstreamer0.10-good-plugins: Extra media codecs' options=('!libtool') install=$pkgname.install source=(http://download.banshee.fm/$pkgname/stable/$pkgver/$pkgname-$pkgver.tar.bz2) -md5sums=('ecd129a3232bda507b98c90e6f9272cf') +md5sums=('83d77447936eed84eba2123b341b62ea') build() { export MONO_SHARED_DIR="$srcdir/.wabi" diff --git a/extra/cdparanoia/ChangeLog b/extra/cdparanoia/ChangeLog deleted file mode 100644 index a1a1d4df4..000000000 --- a/extra/cdparanoia/ChangeLog +++ /dev/null @@ -1,23 +0,0 @@ -2008-09-15 Alexander Fehr <pizzapunk gmail com> - - * cdparanoia-10.2-1: - New upstream release. - -2008-08-07 Alexander Fehr <pizzapunk gmail com> - - * cdparanoia-10.1-1: - New upstream release. - Changed license to GPL. - Added !makeflags option. - -2008-07-07 Alexander Fehr <pizzapunk gmail com> - - * cdparanoia-10.0-1: - New upstream release. - New maintainer. - Added arch variable. - Changed license to GPL3. - Fixed man page location. - Removed cdparanoia.patch. - Removed gcc34.patch. - Added ChangeLog. diff --git a/extra/cdparanoia/PKGBUILD b/extra/cdparanoia/PKGBUILD index 4e46272f0..223570a22 100644 --- a/extra/cdparanoia/PKGBUILD +++ b/extra/cdparanoia/PKGBUILD @@ -1,23 +1,29 @@ -# $Id: PKGBUILD 53529 2009-10-02 03:47:22Z eric $ -# Maintainer: Alexander Fehr <pizzapunk gmail com> +# $Id: PKGBUILD 122077 2011-05-02 05:53:24Z andrea $ +# Maintainer: +# Contributor: Alexander Fehr <pizzapunk gmail com> pkgname=cdparanoia pkgver=10.2 -pkgrel=2 +pkgrel=3 pkgdesc="Compact Disc Digital Audio extraction tool" arch=('i686' 'x86_64' 'mips64el') url="http://www.xiph.org/paranoia/" license=('GPL') depends=('glibc') options=('!makeflags') -source=(http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-$pkgver.src.tgz gcc.patch) -md5sums=('b304bbe8ab63373924a744eac9ebc652' '12da14958d2b84c6719fe69890436445') -sha1sums=('1901e20d3a370ca6afa4c76a9ef30d3f03044320' '67faaf0e3eed2e3de6f66d8168604bc6c7295921') +source=("http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-$pkgver.src.tgz" + 'gcc.patch') +md5sums=('b304bbe8ab63373924a744eac9ebc652' + '12da14958d2b84c6719fe69890436445') build() { - cd "$srcdir/cdparanoia-III-$pkgver" - patch -p0 -i ${srcdir}/gcc.patch || return 1 - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - make || return 1 - make prefix="$pkgdir/usr" MANDIR="$pkgdir/usr/share/man" install || return 1 + cd "${srcdir}/${pkgname}-III-${pkgver}" + patch -p0 -i ${srcdir}/gcc.patch + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd "${srcdir}/${pkgname}-III-${pkgver}" + make prefix="${pkgdir}/usr" MANDIR="${pkgdir}/usr/share/man" install } diff --git a/extra/deskbar-applet/PKGBUILD b/extra/deskbar-applet/PKGBUILD deleted file mode 100644 index 89417ddc1..000000000 --- a/extra/deskbar-applet/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 106730 2011-01-18 17:31:45Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=deskbar-applet -pkgver=2.32.0 -pkgrel=4 -pkgdesc="An all-in-one search bar for the GNOME panel" -arch=(i686 x86_64 'mips64el') -url="http://raphael.slinckx.net/deskbar/" -license=('GPL') -depends=('python-gnomekeyring' 'python-gnomeapplet' 'dbus-python' 'python-gnomedesktop' 'python-wnck' 'python2-gconf') -makedepends=('evolution-data-server' 'intltool' 'gnome-doc-utils') -options=('!libtool' '!emptydirs') -groups=('gnome-extra') -install=deskbar-applet.install -source=(http://ftp.gnome.org/pub/GNOME/sources/deskbar-applet/2.32/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('123f2231ac8449f8376030c1b25394f9bab18d5d219292afc6f27eda77d4e684') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed '/^modulesdir=/ s/@libdir@/@libexecdir@/' -i data/deskbar-applet.pc.in - PYTHON=python2 ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --libexecdir=/usr/lib \ - --disable-scrollkeeper --enable-evolution \ - --disable-schemas-install - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" \ - "$pkgdir/usr/lib/deskbar-applet/deskbar-applet" - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain deskbar-applet ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/extra/deskbar-applet/deskbar-applet.install b/extra/deskbar-applet/deskbar-applet.install deleted file mode 100644 index a97eaf8f2..000000000 --- a/extra/deskbar-applet/deskbar-applet.install +++ /dev/null @@ -1,22 +0,0 @@ -pkgname=deskbar-applet - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - -post_remove () { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/extra/eject/PKGBUILD b/extra/eject/PKGBUILD index 9ee637d40..3ec0bd9c2 100644 --- a/extra/eject/PKGBUILD +++ b/extra/eject/PKGBUILD @@ -1,24 +1,29 @@ -# $Id: PKGBUILD 84697 2010-07-03 16:22:38Z ibiru $ -# Maintainer: dorphell <dorphell@archlinux.org> +# $Id: PKGBUILD 122087 2011-05-02 06:23:02Z andrea $ +# Maintainer: +# Contributor: dorphell <dorphell@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=eject pkgver=2.1.5 -pkgrel=4 -pkgdesc="Eject is a program for ejecting removable media under software control" +pkgrel=5 +pkgdesc="A program for ejecting removable media under software control" arch=('i686' 'x86_64' 'mips64el') -url="http://ca.geocities.com/jefftranter@rogers.com/eject.html" +url="http://eject.sourceforge.net/" license=('GPL') depends=('glibc') -source=(ftp://mirrors.kernel.org/slackware/slackware-13.1/source/a/$pkgname/$pkgname-$pkgver.tar.bz2 - eject-2.1.5-handle-spaces.patch) +source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'eject-2.1.5-handle-spaces.patch') md5sums=('5a6cab2184ae4ed21128054d931d558f' '595b97c3bd56fd41e3b01b07885f81dc') build() { - cd $srcdir/$pkgname - patch -Np0 -i ../eject-2.1.5-handle-spaces.patch || return 1 - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - make || return 1 - make DESTDIR=$pkgdir install || return 1 + cd "${srcdir}/${pkgname}" + patch -Np0 -i "${srcdir}/eject-2.1.5-handle-spaces.patch" + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd "${srcdir}/${pkgname}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD index 4ed525aa1..731a5e78a 100644 --- a/extra/ekiga/PKGBUILD +++ b/extra/ekiga/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 112176 2011-03-04 10:45:51Z heftig $ +# $Id: PKGBUILD 122127 2011-05-02 09:20:52Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=ekiga pkgver=3.3.0 -pkgrel=2 +pkgrel=3 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)" url="http://www.ekiga.org" license=(GPL) arch=(i686 x86_64 mips64el) -depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'gtk2') +depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'gtk2' 'gconf') makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost') optdepends=('evolution-data-server: Evolution integration') provides=('gnomemeeting') diff --git a/extra/epiphany/PKGBUILD b/extra/epiphany/PKGBUILD index 60e8de91a..494341f87 100644 --- a/extra/epiphany/PKGBUILD +++ b/extra/epiphany/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 117992 2011-04-05 06:37:18Z heftig $ +# $Id: PKGBUILD 122054 2011-05-02 05:12:37Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=epiphany -pkgver=3.0.0 +pkgver=3.0.2 pkgrel=1 install=epiphany.install pkgdesc="A GNOME3 web browser based on the WebKit rendering engine." @@ -16,7 +16,7 @@ options=('!libtool' '!emptydirs') groups=('gnome') url="http://www.gnome.org/projects/epiphany/" source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('9407220e21e95008b0c5b0a0383d1bdc56a932c40a4486ea4f996ba47eeae7bb') +sha256sums=('befcc9b6061b2e5e9c78399423b09e27dc301dec55d96bf63590d543ce9bb805') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD index a54e8e427..ebfebbd14 100644 --- a/extra/gcin/PKGBUILD +++ b/extra/gcin/PKGBUILD @@ -1,19 +1,21 @@ -# $Id: PKGBUILD 121293 2011-04-30 12:04:42Z bisson $ +# $Id: PKGBUILD 122190 2011-05-02 18:01:07Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=gcin pkgver=1.6.1 -pkgrel=1 +pkgrel=2 pkgdesc='Input method server supporting various input methods' arch=('i686' 'x86_64' 'mips64el') license=('LGPL') -url='http://www.csie.nctu.edu.tw/~cp76/gcin/' +url='http://cle.linux.org.tw/gcin/download/' depends=('gtk2' 'libxtst') -makedepends=('anthy' 'qt') -optdepends=('qt: support for qt4 input method') -source=("${url}download/${pkgname}-${pkgver}.tar.bz2" +makedepends=('qt' 'gtk3' 'anthy') +optdepends=('qt: support for qt4 input method' + 'gtk3: support for gtk3 input method' + 'anthy: support for anthy input method') +source=("${url}${pkgname}-${pkgver}.tar.bz2" 'fix_x86_64_libdir.patch' 'fix_qt4_paths.patch') sha1sums=('acbfffbaf7eccd32ef251493e8c03dd126023b51' @@ -26,6 +28,8 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 -i ../fix_x86_64_libdir.patch patch -p1 -i ../fix_qt4_paths.patch + sed '/^GTK2IM=/c GTK2IM=gtk-2.0/2.10.0/immodules' -i gtk-im/Makefile + sed '/^GTK3IM=/c GTK3IM=gtk-3.0/3.0.0/immodules' -i gtk-im/Makefile # FS#24051 ./configure --prefix=/usr --use_i18n=Y make } diff --git a/extra/gcin/install b/extra/gcin/install index 1097ea400..c16d11b5e 100644 --- a/extra/gcin/install +++ b/extra/gcin/install @@ -1,13 +1,14 @@ post_install() { - echo -n "updating gtk.immodules... " - /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules - echo "done." + echo -n "updating gtk immodules... " + [ -x /usr/bin/gtk-query-immodules-2.0 ] && /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules + [ -x /usr/bin/gtk-query-immodules-3.0 ] && /usr/bin/gtk-query-immodules-3.0 > /usr/lib/gtk-3.0/3.0.0/immodules.cache + echo "done." } post_upgrade() { - post_install + post_install } post_remove() { - post_install + post_install } diff --git a/extra/gnome-netstatus/PKGBUILD b/extra/gnome-netstatus/PKGBUILD deleted file mode 100644 index 9d4370871..000000000 --- a/extra/gnome-netstatus/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 92034 2010-09-28 17:08:48Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gnome-netstatus -pkgver=2.28.2 -pkgrel=1 -pkgdesc="A GNOME applet that shows network status" -arch=(i686 x86_64 'mips64el') -license=('GPL') -url="http://www.gnome.org" -depends=('gnome-panel-bonobo>=2.32.0' 'hicolor-icon-theme') -makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils>=0.20.2') -options=(!emptydirs) -groups=('gnome-extra') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.bz2) -install=gnome-netstatus.install -sha256sums=('d1ad0a668a1344898d4f47b5591adddc7791edb6c2e92136ebcf8d278d959119') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/gnome-netstatus \ - --localstatedir=/var --disable-static \ - --disable-scrollkeeper - make - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-netstatus ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/extra/gnome-netstatus/gnome-netstatus.install b/extra/gnome-netstatus/gnome-netstatus.install deleted file mode 100644 index deb8b6773..000000000 --- a/extra/gnome-netstatus/gnome-netstatus.install +++ /dev/null @@ -1,22 +0,0 @@ -pkgname=gnome-netstatus - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --install ${pkgname} -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/extra/gnome-python-desktop/PKGBUILD b/extra/gnome-python-desktop/PKGBUILD index d963eefb6..adb317a8e 100644 --- a/extra/gnome-python-desktop/PKGBUILD +++ b/extra/gnome-python-desktop/PKGBUILD @@ -1,45 +1,34 @@ -# $Id: PKGBUILD 108483 2011-01-31 14:39:43Z jgc $ +# $Id: PKGBUILD 122148 2011-05-02 13:38:16Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Arjan Timmerman <arjan@soulfly.nl> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> pkgbase=gnome-python-desktop -pkgname=('gnome-python-desktop' 'python-brasero' 'python-bugbuddy' 'python-evince' 'python-evolution' 'python-gnomeapplet' 'python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-mediaprofiles' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck' 'python-gtksourceview' 'python-gnomeprint') +pkgname=('gnome-python-desktop' 'python-bugbuddy' 'python-evolution' 'python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck' 'python-gtksourceview' 'python-gnomeprint') pkgver=2.32.0 -pkgrel=4 +pkgrel=5 arch=(i686 x86_64 'mips64el') license=('GPL' 'LGPL') options=('!libtool') -makedepends=('intltool' 'pkg-config' 'gnome-media' 'gnome-panel-bonobo' 'gnome-python' 'gtksourceview' 'libgnomeprintui' 'libgtop' 'totem-plparser' 'evince' 'bug-buddy' 'brasero' 'gnome-desktop' 'metacity') +makedepends=('intltool' 'pkg-config' 'gnome-python' 'gtksourceview' 'libgnomeprintui' 'libgtop' 'totem-plparser' 'bug-buddy' 'gnome-desktop2' 'metacity' 'librsvg') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2) sha256sums=('09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9') build() { cd "${srcdir}/${pkgbase}-${pkgver}" - sed -i 's|evince-document-2.30|evince-document-2.32|g' configure - sed -i 's|evince-view-2.30|evince-view-2.32|g' configure PYTHON=/usr/bin/python2 ./configure --prefix=/usr --enable-metacity make } package_gnome-python-desktop() { - depends=('python-brasero' 'python-bugbuddy' 'python-evince' 'python-evolution' 'python-gnomeapplet' 'python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-mediaprofiles' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck' 'python-gtksourceview' 'python-gnomeprint' 'gnome-python') + depends=('python-bugbuddy' 'python-evolution' 'python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck' 'python-gtksourceview' 'python-gnomeprint' 'gnome-python') pkgdesc="Python bindings for the GNOME desktop environment" cd "${srcdir}/${pkgbase}-${pkgver}" make install-pkgconfigDATA DESTDIR="${pkgdir}" } -package_python-brasero() { - depends=('pygtk' 'brasero') - pkgdesc="Python bindings for brasero" - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C braseroburn install DESTDIR="${pkgdir}" - make -C braseromedia install DESTDIR="${pkgdir}" -} - package_python-bugbuddy() { depends=('pygtk' 'bug-buddy') pkgdesc="Python module for bug-buddy" @@ -48,14 +37,6 @@ package_python-bugbuddy() { make install-pkgpyexecPYTHON DESTDIR="${pkgdir}" } -package_python-evince() { - depends=('pygtk' 'evince') - pkgdesc="Python bindings for evince" - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C evince install DESTDIR="${pkgdir}" -} - package_python-evolution() { depends=('pygtk' 'evolution-data-server' 'python2-bonobo') pkgdesc="Python bindings for evolution" @@ -66,17 +47,9 @@ package_python-evolution() { install -m644 evolution/ecal.defs "${pkgdir}/usr/share/pygtk/2.0/defs/" } -package_python-gnomeapplet() { - depends=('pygtk' 'libgnomeui' 'gnome-panel-bonobo' 'python2-bonobo') - pkgdesc="Python bindings for gnome-panel" - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C gnomeapplet install DESTDIR="${pkgdir}" -} - package_python-gnomedesktop() { - depends=('pygtk' 'gnome-desktop' 'python2-gnomevfs') - pkgdesc="Python bindings for gnome-desktop" + depends=('pygtk' 'gnome-desktop2' 'python2-gnomevfs') + pkgdesc="Python bindings for gnome-desktop 2.x" cd "${srcdir}/${pkgbase}-${pkgver}" make -C gnomedesktop install DESTDIR="${pkgdir}" @@ -98,14 +71,6 @@ package_python-gtop() { make -C gtop install DESTDIR="${pkgdir}" } -package_python-mediaprofiles() { - depends=('pygtk' 'gnome-media') - pkgdesc="Python bindings for gnome-media" - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C mediaprofiles install DESTDIR="${pkgdir}" -} - package_python-metacity() { depends=('pygtk' 'metacity') pkgdesc="Python bindings for metacity" diff --git a/extra/gnuchess/PKGBUILD b/extra/gnuchess/PKGBUILD index c0bfce62d..5e6a71091 100644 --- a/extra/gnuchess/PKGBUILD +++ b/extra/gnuchess/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 108753 2011-02-02 19:55:44Z jgc $ +# $Id: PKGBUILD 122210 2011-05-03 05:16:02Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=gnuchess -pkgver=5.08 +pkgver=6.0.0 pkgrel=1 pkgdesc="Lets most modern computers play a full game of chess" url="http://www.gnu.org/software/chess/chess.html" @@ -11,7 +11,7 @@ arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('glibc' 'ncurses' 'readline') source=(ftp://ftp.gnu.org/pub/gnu/chess/$pkgname-$pkgver.tar.gz) -md5sums=('9db91dbac6b5b86de0c57a420a9fea57') +md5sums=('1a7a46188dab76f4339d22ff47c31515') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/gv/PKGBUILD b/extra/gv/PKGBUILD index f96dc13d8..8ce7b917d 100644 --- a/extra/gv/PKGBUILD +++ b/extra/gv/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 103001 2010-12-13 22:11:14Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> +# $Id: PKGBUILD 122132 2011-05-02 09:38:25Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gv -pkgver=3.7.1 -pkgrel=2 +pkgver=3.7.2 +pkgrel=1 pkgdesc="A program to view PostScript and PDF documents" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/gv/" license=('GPL') -depends=('xaw3d' 'ghostscript') +depends=('xaw3d' 'ghostscript' 'desktop-file-utils') install=gv.install -source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz gv.desktop gv.png aplinedel.patch) -md5sums=('bf4823d00d8e431f97dbcb7dd87c46ac' 'cf04652952f2d0903bc7578b4826f50c'\ - 'ab0e3879dbe39e59ad1c923020c28a86' '8a57a5d50a0d68dc1d98108e9665bd2d') -sha1sums=('05fcf76f29de77e67379bae7e9ca1c8a26bbf6e1' 'c8230fe08ee6d22525678a97832f44941237d174'\ - '35b9168e526527001b1b5b8ee34a5b69d9369590' 'e6358e74ec2641730b44443a49df36322df2bdd8') +source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz gv.desktop gv.png) +md5sums=('eb47d465755b7291870af66431c6f2e1' + 'cf04652952f2d0903bc7578b4826f50c' + 'ab0e3879dbe39e59ad1c923020c28a86') +sha1sums=('d9573e17f5d88d150fccb257ce205dbceab83e8a' + 'c8230fe08ee6d22525678a97832f44941237d174' + '35b9168e526527001b1b5b8ee34a5b69d9369590') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < ../aplinedel.patch sed -i -e "s:-dGraphicsAlphaBits=2:\0 -dAlignToPixels=0:" src/Makefile.{am,in} ./configure --prefix=/usr make diff --git a/extra/gv/aplinedel.patch b/extra/gv/aplinedel.patch deleted file mode 100644 index 3026e426c..000000000 --- a/extra/gv/aplinedel.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur a/src/gv_misc_res.dat b/src/gv_misc_res.dat ---- a/src/gv_misc_res.dat 2010-10-15 09:21:36.000000000 +0200 -+++ b/src/gv_misc_res.dat 2010-10-15 09:21:48.000000000 +0200 -@@ -476,7 +476,6 @@ - <Key>BackSpace: GV_Page(up,left-bottom,!page-1,bottom-rightedge)\n\ - <Key>Insert: GV_Page(page-5) \n\ - <Key>Delete: GV_Page(page+5) \n\ -- <Key>apLineDel: GV_Page(page+5) \n\ - <Key>Home: GV_Page(page=0) \n\ - <Key>End: GV_Page(page=99999) \n\ - <Key>Prior: GV_Page(page-1) \n\ diff --git a/extra/gv/gv.install b/extra/gv/gv.install index dd0e8c9c6..0c048cd5b 100644 --- a/extra/gv/gv.install +++ b/extra/gv/gv.install @@ -1,7 +1,8 @@ -infodir=/usr/share/info +infodir=usr/share/info file=gv.info.gz post_install() { + update-desktop-database -q [ -x usr/bin/install-info ] || return 0 install-info $infodir/$file $infodir/dir 2> /dev/null } @@ -11,6 +12,7 @@ post_upgrade() { } pre_remove() { + update-desktop-database -q [ -x usr/bin/install-info ] || return 0 install-info --delete $infodir/$file $infodir/dir 2> /dev/null } diff --git a/extra/htdig/quoting.patch b/extra/htdig/CVE-2007-6110.patch index 57b0e3b78..57b0e3b78 100644 --- a/extra/htdig/quoting.patch +++ b/extra/htdig/CVE-2007-6110.patch diff --git a/extra/htdig/PKGBUILD b/extra/htdig/PKGBUILD index a00bae159..f40457224 100644 --- a/extra/htdig/PKGBUILD +++ b/extra/htdig/PKGBUILD @@ -1,39 +1,45 @@ -# $Id: $ +# $Id: PKGBUILD 122102 2011-05-02 07:10:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=htdig pkgver=3.2.0b6 -pkgrel=6 -pkgdesc="A complete world wide web indexing and searching system for a domain or intranet." -url="http://www.htdig.org" +pkgrel=7 +pkgdesc="Scripts and HTML code needed for using ht://Dig as a web search engine" +url="http://www.htdig.org/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('gcc-libs' 'zlib' 'bash') -options=('!libtool' '!emptydirs') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - gcc4.3.patch - quoting.patch) +depends=('openssl') +options=('!libtool' 'emptydirs') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'gcc4.3.patch' + 'CVE-2007-6110.patch') md5sums=('8b9b9587a411ac7dd278fa5413428960' '2aeda683f95b58efc0978d7fe951de59' '0d9099d3b5a32d322a8e0240f85a3578') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ${srcdir}/gcc4.3.patch - patch -p1 -i ${srcdir}/quoting.patch || return 1 + patch -p1 -i "${srcdir}/gcc4.3.patch" + patch -p1 -i "${srcdir}/CVE-2007-6110.patch" ./configure --prefix=/usr \ - --mandir=/usr/share/man \ - --with-config-dir=/etc/htdig \ - --with-default-config-file=/etc/htdig/htdig.conf \ - --with-database-dir=/var/lib/htdig/db \ - --with-cgi-bin-dir=/usr/bin \ - --with-common-dir=/usr/share/doc/htdig \ - --with-search-dir=/usr/share/doc/htdig \ - --with-image-dir=/usr/share/doc/htdig - make || return 1 - make DESTDIR=${pkgdir} install + --mandir=/usr/share/man \ + --with-config-dir=/etc/htdig \ + --with-default-config-file=/etc/htdig/htdig.conf \ + --with-database-dir=/var/lib/htdig/db \ + --with-cgi-bin-dir=/usr/bin \ + --with-common-dir=/usr/share/doc/htdig \ + --with-search-dir=/usr/share/doc/htdig \ + --with-image-dir=/usr/share/doc/htdig \ + --localstatedir=/var/lib/htdig \ + --with-ssl + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/kaffeine/PKGBUILD b/extra/kaffeine/PKGBUILD index fc32fd506..5fc44e597 100644 --- a/extra/kaffeine/PKGBUILD +++ b/extra/kaffeine/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 118974 2011-04-09 21:02:09Z tpowa $ +# $Id: PKGBUILD 122312 2011-05-03 18:56:11Z tpowa $ # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kaffeine -pkgver=1.2.1 +pkgver=1.2.2 pkgrel=1 pkgdesc='KDE media player' license=('GPL') @@ -21,6 +21,10 @@ build() { -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr make +} + +package() { + cd $srcdir/build make DESTDIR=$pkgdir install } -md5sums=('e65a8558836f0aa0d173d76e51ad065f') +md5sums=('690e48d2e5fe123887109aa9b1bc1c31') diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD index e59512436..93e781170 100644 --- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD +++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD @@ -3,9 +3,9 @@ # Contributor: Jakub Schmidtke <sjakub-at-gmail.com> pkgname=kdeplasma-applets-networkmanagement -pkgver=git20110418 -_commit=545967db075ed65b0452def93e1c1588190cdc9a -pkgrel=2 +pkgver=git20110502 +_commit=fdb4edbc91f60d358d202a694c4ab229c66f9f61 +pkgrel=1 pkgdesc="KDE control panel and widget network connections" arch=('i686' 'x86_64' 'mips64el') url="http://www.kde.org/" @@ -15,7 +15,7 @@ makedepends=('cmake' 'python2' 'automoc4' 'mobile-broadband-provider-info') optdepends=('mobile-broadband-provider-info: allow to add new mobile connection') install=${pkgname}.install source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}") -md5sums=('d7f50b4b6917d39c79332b868ad2d0cf') +md5sums=('6ac9e04cb917a8ac875b2bffde4b5420') build() { cd "${srcdir}" diff --git a/extra/kshutdown/PKGBUILD b/extra/kshutdown/PKGBUILD index 837f7a024..99e58f307 100644 --- a/extra/kshutdown/PKGBUILD +++ b/extra/kshutdown/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 110106 2011-02-16 13:52:25Z andrea $ +# $Id: PKGBUILD 122317 2011-05-03 18:58:40Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=kshutdown -pkgver=2.0beta12 +pkgver=2.0 pkgrel=1 pkgdesc="Shutdown Utility for KDE" arch=(i686 x86_64 'mips64el') @@ -27,4 +27,4 @@ package() { cd "${srcdir}/build" make DESTDIR="${pkgdir}" install } -md5sums=('392a345dab6fc4f6125007171bc8cb9c') +md5sums=('af9d2bfda919e7712319e14e6ca89610') diff --git a/extra/ktorrent/PKGBUILD b/extra/ktorrent/PKGBUILD index 65da93ce0..a0f1ebe79 100644 --- a/extra/ktorrent/PKGBUILD +++ b/extra/ktorrent/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 115087 2011-03-16 19:19:11Z andrea $ +# $Id: PKGBUILD 122112 2011-05-02 07:25:24Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Travis Willard <travisw@wmpub.ca> # Contributor: Georg Grabler <ggrabler@gmail.com> pkgname=ktorrent -pkgver=4.1.0 +pkgver=4.1.1 pkgrel=1 -pkgdesc="A BitTorrent program for KDE" +pkgdesc="A powerful BitTorrent client for KDE" arch=('i686' 'x86_64' 'mips64el') url="http://ktorrent.org" license=('GPL2') @@ -16,16 +16,16 @@ source=("http://ktorrent.org/downloads/${pkgver}/${pkgname}-${pkgver}.tar.bz2" 'httpserver.patch') install=${pkgname}.install options=('libtool') -md5sums=('3981c00810217e88b9772438df31df08' +md5sums=('affadf7c7198e5aa430e91ab75800296' '1f25b94615b0bbfa0457c99fb20de3e6') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" # build time patch - patch -Np0 -i ${srcdir}/httpserver.patch + patch -p0 -i "${srcdir}/httpserver.patch" - cd ${srcdir} + cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -36,6 +36,6 @@ build() { } package() { - cd ${srcdir}/build - make DESTDIR=${pkgdir} install + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install } diff --git a/extra/libcanberra/PKGBUILD b/extra/libcanberra/PKGBUILD index f5052b769..2a2e0af3b 100644 --- a/extra/libcanberra/PKGBUILD +++ b/extra/libcanberra/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 109949 2011-02-14 08:47:45Z ibiru $ +# $Id: PKGBUILD 122251 2011-05-03 10:40:20Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=libcanberra pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer) -pkgver=0.26 -pkgrel=5 +pkgver=0.28 +pkgrel=1 pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification" arch=(i686 x86_64 'mips64el') license=('LGPL') @@ -13,17 +13,16 @@ makedepends=('gtk-doc' 'libpulse' 'gstreamer0.10' 'gtk2' 'gtk3') options=(!emptydirs) url=http://0pointer.de/lennart/projects/libcanberra source=(http://0pointer.de/lennart/projects/${pkgbase}/${pkgbase}-${pkgver}.tar.gz - libcanberra-gtk-module.sh libcanberra-quit-add.patch) -md5sums=('ee2c66ada7c851a4e7b6eb1682285a24' - 'a54799e624aac814b9343ab05f25c38b' - 'a147bce8a7addcd40b21faaaf028819b') + libcanberra-gtk-module.sh) +md5sums=('c198b4811598c4c161ff505e4531b02c' + '21141257a1be80f3bc329829ff13b314') build() { cd "${srcdir}/${pkgbase}-${pkgver}" - patch -Np1 -i "${srcdir}/libcanberra-quit-add.patch" ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \ --disable-static --with-builtin=dso --enable-null --disable-oss \ - --enable-alsa --enable-gstreamer --enable-pulse + --enable-alsa --enable-gstreamer --enable-pulse \ + --with-systemdsystemunitdir=/lib/systemd/system make } @@ -37,11 +36,11 @@ package_libcanberra() { rm -f "${pkgdir}"/usr/lib/libcanberra-gtk*.la rm -f "${pkgdir}"/usr/lib/gtk-{2,3}.0/modules/*.la - install -m755 -d "${pkgdir}/usr/share/gconf" + install -d "${pkgdir}/usr/share/gconf" mv "${pkgdir}/etc/gconf/schemas" "${pkgdir}/usr/share/gconf/" - install -m755 -d "${pkgdir}/etc/X11/xinit/xinitrc.d" - install -m755 "${srcdir}/libcanberra-gtk-module.sh" "${pkgdir}/etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module" + install -D "${srcdir}/libcanberra-gtk-module.sh" \ + "${pkgdir}/etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module" # Split plugins for _p in pulse gstreamer; do @@ -53,7 +52,6 @@ package_libcanberra() { package_libcanberra-pulse() { pkgdesc="PulseAudio plugin for libcanberra" depends=("$pkgbase=$pkgver-$pkgrel" 'libpulse') - groups=('pulseaudio-gnome') cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/libcanberra/libcanberra-gtk-module.sh b/extra/libcanberra/libcanberra-gtk-module.sh index fbb7ff783..2ae6b7e17 100644 --- a/extra/libcanberra/libcanberra-gtk-module.sh +++ b/extra/libcanberra/libcanberra-gtk-module.sh @@ -1,10 +1,15 @@ #!/bin/sh -if [ -z "$GTK_MODULES" ] ; then - GTK_MODULES="canberra-gtk-module" -else - GTK_MODULES="$GTK_MODULES:canberra-gtk-module" -fi - -export GTK_MODULES - +case "$SESSION" in + GNOME) + # Done by gnome-settings-daemon + ;; + *) + if [ -z "$GTK_MODULES" ]; then + GTK_MODULES="canberra-gtk-module" + else + GTK_MODULES="$GTK_MODULES:canberra-gtk-module" + fi + export GTK_MODULES + ;; +esac diff --git a/extra/libcanberra/libcanberra-quit-add.patch b/extra/libcanberra/libcanberra-quit-add.patch deleted file mode 100644 index 0094569ae..000000000 --- a/extra/libcanberra/libcanberra-quit-add.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up libcanberra-0.26/src/canberra-gtk-module.c.quit-add libcanberra-0.26/src/canberra-gtk-module.c ---- libcanberra-0.26/src/canberra-gtk-module.c.quit-add 2011-01-07 22:48:49.388992626 -0500 -+++ libcanberra-0.26/src/canberra-gtk-module.c 2011-01-07 22:49:02.339995153 -0500 -@@ -932,11 +932,6 @@ static void connect_settings(void) { - connected = TRUE; - } - --static gboolean quit_handler(gpointer data) { -- dispatch_queue(); -- return FALSE; --} -- - G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) { - - /* This is the same quark libgnomeui uses! */ -@@ -963,8 +958,6 @@ G_MODULE_EXPORT void gtk_module_init(gin - install_hook(GTK_TYPE_WIDGET, "drag-drop", &signal_id_widget_drag_drop); - install_hook(GTK_TYPE_WIDGET, "drag-failed", &signal_id_widget_drag_failed); - install_hook(GTK_TYPE_EXPANDER, "activate", &signal_id_expander_activate); -- -- gtk_quit_add(1, quit_handler, NULL); - } - - G_MODULE_EXPORT gchar* g_module_check_init(GModule *module); diff --git a/extra/libdbusmenu-qt/PKGBUILD b/extra/libdbusmenu-qt/PKGBUILD index 4a1df9eee..674648c88 100644 --- a/extra/libdbusmenu-qt/PKGBUILD +++ b/extra/libdbusmenu-qt/PKGBUILD @@ -1,29 +1,30 @@ -# $Id: PKGBUILD 117011 2011-03-27 14:11:17Z andrea $ +# $Id: PKGBUILD 122259 2011-05-03 14:55:26Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libdbusmenu-qt -pkgver=0.8.1 +pkgver=0.8.2 pkgrel=1 pkgdesc="A library that provides a Qt implementation of the DBusMenu spec" arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/libdbusmenu-qt" license=('GPL') depends=('qt') -makedepends=('cmake' 'doxygen') +makedepends=('cmake') source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2") -md5sums=('495bf59b9fcc00e4260fd5acbb21b78b') +md5sums=('88be2548e00acf988c66ed3a35844f64') build() { - cd ${srcdir} + cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release + -DCMAKE_BUILD_TYPE=Release \ + -DWITH_DOC=OFF make } package() { - cd ${srcdir}/build - make DESTDIR=${pkgdir} install -} + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install +} diff --git a/extra/libgail-gnome/PKGBUILD b/extra/libgail-gnome/PKGBUILD deleted file mode 100644 index 9b8ec0e08..000000000 --- a/extra/libgail-gnome/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 111400 2011-02-26 15:19:19Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=libgail-gnome -pkgver=1.20.4 -pkgrel=1 -pkgdesc="GNOME Accessibility Implementation Library for gnomeui and libbonoboui" -arch=(i686 x86_64 'mips64el') -license=('LGPL') -depends=('gnome-panel-bonobo' 'at-spi' 'libgnomeui') -makedepends=('intltool' 'pkgconfig') -options=('!libtool' '!emptydirs') -groups=('gnome-extra') -install=libgail-gnome.install -url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.20/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('c28f6757bdcf0651883837fc77708aa6b826438c1b96c39332eb9d53ae1bf0b0') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var - make - make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/extra/libgail-gnome/libgail-gnome.install b/extra/libgail-gnome/libgail-gnome.install deleted file mode 100644 index 81e110fd1..000000000 --- a/extra/libgail-gnome/libgail-gnome.install +++ /dev/null @@ -1,19 +0,0 @@ -pkgname=libgail-gnome - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - if [ -e usr/share/gconf/schemas/${pkgname}.schemas ]; then - usr/sbin/gconfpkg --uninstall ${pkgname} - fi -} diff --git a/extra/libktorrent/PKGBUILD b/extra/libktorrent/PKGBUILD index 4ea50a3ea..b39a2dc82 100644 --- a/extra/libktorrent/PKGBUILD +++ b/extra/libktorrent/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 115082 2011-03-16 19:16:25Z andrea $ +# $Id: PKGBUILD 122107 2011-05-02 07:24:22Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libktorrent -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=1 -pkgdesc="A BitTorrent library based on KDE Platform" +pkgdesc="A BitTorrent protocol implementation" arch=('i686' 'x86_64' 'mips64el') url="http://ktorrent.org" license=('GPL2') depends=('kdelibs') makedepends=('automoc4' 'cmake' 'boost') -source=("http://ktorrent.org/downloads/4.1.0/${pkgname}-${pkgver}.tar.bz2") +source=("http://ktorrent.org/downloads/4.1.1/${pkgname}-${pkgver}.tar.bz2") options=('libtool') -md5sums=('76d3e58bbf2e4df7e97421e06ebf8fb8') +md5sums=('96de8dd6d6cea4255ce946bb4cd69836') build() { - cd ${srcdir} + cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -26,6 +26,6 @@ build() { } package() { - cd ${srcdir}/build - make DESTDIR=${pkgdir} install + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install } diff --git a/extra/libofa/PKGBUILD b/extra/libofa/PKGBUILD index 531985ea3..b41468114 100644 --- a/extra/libofa/PKGBUILD +++ b/extra/libofa/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 80563 2010-05-19 16:11:07Z andrea $ +# $Id: PKGBUILD 122092 2011-05-02 06:40:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=libofa pkgver=0.9.3 -pkgrel=2 -pkgdesc="Open Fingerprint Architecture" +pkgrel=3 +pkgdesc="An open-source audio fingerprint by MusicIP" arch=(i686 x86_64 'mips64el') url="http://code.google.com/p/musicip-libofa/" license=('GPL2' 'custom') @@ -13,26 +13,26 @@ depends=('expat' 'curl' 'fftw' 'gcc-libs') makedepends=('pkgconfig') options=('!libtool') source=("http://musicip-libofa.googlecode.com/files/$pkgname-$pkgver.tar.gz" - 'gcc-4.patch' - 'gcc4.3.patch' - 'gcc4.5.patch') + 'gcc-4.patch' + 'gcc4.3.patch' + 'gcc4.5.patch') sha1sums=('3dec8e1dcea937f74b4165e9ffd4d4f355e4594a' 'cb19377d0634c03d2a49cfc61915cec918c341f7' 'cae08bdc12de923d5e032696702a0530ae6eafc1' - '754d69d66ab46219035ccafeeb3ff62433cca4f2') + '754d69d66ab46219035ccafeeb3ff62433cca4f2') build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np0 -i ${srcdir}/gcc-4.patch || return 1 - patch -Np1 -i ${srcdir}/gcc4.3.patch || return 1 - patch -Np1 -i ${srcdir}/gcc4.5.patch || return 1 - ./configure --prefix=/usr || return 1 - make || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p0 -i ${srcdir}/gcc-4.patch + patch -p1 -i ${srcdir}/gcc4.3.patch + patch -p1 -i ${srcdir}/gcc4.5.patch + ./configure --prefix=/usr + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR=${pkgdir} install - install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index 3a08b7b20..bf364d44a 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 117449 2011-04-02 08:46:57Z giovanni $ +# $Id: PKGBUILD 122137 2011-05-02 10:27:04Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=mercurial -pkgver=1.8.2 +pkgver=1.8.3 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('python2') optdepends=('tk: for the hgk GUI') source=(http://www.selenic.com/mercurial/release/${pkgname}-${pkgver}.tar.gz mercurial.profile) -md5sums=('a1634b9b709ecc70662f3257abece2c7' +md5sums=('7afea936dfdb21220064cac6402f8743' '43e1d36564d4c7fbe9a091d3ea370a44') build() { diff --git a/extra/mousetweaks/PKGBUILD b/extra/mousetweaks/PKGBUILD index 0d71b3962..c9120e845 100644 --- a/extra/mousetweaks/PKGBUILD +++ b/extra/mousetweaks/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=mousetweaks -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="Mouse accessibility enhancements for the GNOME desktop" arch=(i686 x86_64 'mips64el') @@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=mousetweaks.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('780c6349aa331635d15abc1f119d4f35de1534f1250e1921ec5f05efa098d242') +sha256sums=('9e9d2d5b183857b75504cc48e017e5419cd754aed08aa5cf39c310583277d722') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/nautilus/PKGBUILD b/extra/nautilus/PKGBUILD index 992e93e7a..ebfe1d46d 100644 --- a/extra/nautilus/PKGBUILD +++ b/extra/nautilus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 121317 2011-04-30 15:08:05Z ibiru $ +# $Id: PKGBUILD 122052 2011-05-02 05:12:25Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=nautilus -pkgver=3.0.1 -pkgrel=2 +pkgver=3.0.1.1 +pkgrel=1 pkgdesc="The GNOME shell and file manager" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -14,17 +14,11 @@ url="http://www.gnome.org" groups=('gnome') options=('!libtool' '!emptydirs') install=nautilus.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 - places-sidebar.patch progress-ui-handler.patch) -sha256sums=('f759d615c880caebf84290bc00c354488266bd7292479d88b8811a9c4f3106e8' - 'ddf020bf8c5ede07fb737b37561d0e557b105c2b96dfa56d9a9f5110ecfbc041' - '5b6f911b1d3e0317c370c674bc52f6521bdd785647087863d33d3b60ddf00433') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('ba53b2b8a38bcd4d6a1860421de222dc5b6b9904cceed49b2d0d90e972ee7dd6') build() { cd "${srcdir}/${pkgname}-${pkgver}" - #fixed for 3.0.2 - patch -Np1 -i "${srcdir}/places-sidebar.patch" - patch -Np1 -i "${srcdir}/progress-ui-handler.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/nautilus \ diff --git a/extra/nautilus/places-sidebar.patch b/extra/nautilus/places-sidebar.patch deleted file mode 100644 index e6c3f6327..000000000 --- a/extra/nautilus/places-sidebar.patch +++ /dev/null @@ -1,36 +0,0 @@ -From cd5a1e5cf95a165c66e7a097530058864dc3a38f Mon Sep 17 00:00:00 2001 -From: Cosimo Cecchi <cosimoc@gnome.org> -Date: Thu, 28 Apr 2011 18:05:07 +0000 -Subject: places-sidebar: make sure to return if we click inside empty space - -https://bugzilla.gnome.org/show_bug.cgi?id=648872 ---- -diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c -index 6e49a4c..56216ab 100644 ---- a/src/nautilus-places-sidebar.c -+++ b/src/nautilus-places-sidebar.c -@@ -2685,6 +2685,7 @@ bookmarks_button_release_event_cb (GtkWidget *widget, - GtkTreeIter iter; - GtkTreeModel *model; - GtkTreeView *tree_view; -+ gboolean res; - - path = NULL; - -@@ -2708,8 +2709,12 @@ bookmarks_button_release_event_cb (GtkWidget *widget, - return FALSE; - } - -- gtk_tree_view_get_path_at_pos (tree_view, (int) event->x, (int) event->y, -- &path, NULL, NULL, NULL); -+ res = gtk_tree_view_get_path_at_pos (tree_view, (int) event->x, (int) event->y, -+ &path, NULL, NULL, NULL); -+ -+ if (!res) { -+ return FALSE; -+ } - - gtk_tree_model_get_iter (model, &iter, path); - --- -cgit v0.9 diff --git a/extra/nautilus/progress-ui-handler.patch b/extra/nautilus/progress-ui-handler.patch deleted file mode 100644 index 231ea64bc..000000000 --- a/extra/nautilus/progress-ui-handler.patch +++ /dev/null @@ -1,28 +0,0 @@ -From fdcc2f36f549a18ea6f587fb9e9bad97f0114c59 Mon Sep 17 00:00:00 2001 -From: Cosimo Cecchi <cosimoc@gnome.org> -Date: Thu, 28 Apr 2011 18:25:15 +0000 -Subject: progress-ui-handler: don't add progress infos to the window twice - -We were adding them twice in case there was already one operation -running. - -https://bugzilla.gnome.org/show_bug.cgi?id=648857 ---- -diff --git a/src/nautilus-progress-ui-handler.c b/src/nautilus-progress-ui-handler.c -index 2479682..fe295b2 100644 ---- a/src/nautilus-progress-ui-handler.c -+++ b/src/nautilus-progress-ui-handler.c -@@ -315,10 +315,10 @@ handle_new_progress_info (NautilusProgressUIHandler *self, - G_CALLBACK (progress_info_finished_cb), self); - - self->priv->active_infos++; -- progress_ui_handler_add_to_window (self, info); - - if (self->priv->active_infos == 1) { - /* this is the only active operation, present the window */ -+ progress_ui_handler_add_to_window (self, info); - gtk_window_present (GTK_WINDOW (self->priv->progress_window)); - } else { - if (gtk_widget_get_visible (self->priv->progress_window)) { --- -cgit v0.9 diff --git a/extra/netspeed-applet/PKGBUILD b/extra/netspeed-applet/PKGBUILD deleted file mode 100644 index 11db6d894..000000000 --- a/extra/netspeed-applet/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 94521 2010-10-07 19:29:30Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Arjan Timmerman <arjan@archlinux.org> - -pkgname=netspeed-applet -pkgver=0.16 -pkgrel=2 -pkgdesc="GNOME applet that shows how much traffic occurs on a specified network device." -arch=(i686 x86_64 'mips64el') -license=('GPL') -url="http://projects.gnome.org/netspeed/" -depends=('gnome-panel-bonobo>=2.32.0' 'libgtop>=2.28.2' 'wireless_tools' 'hicolor-icon-theme') -makedepends=('pkgconfig' 'gnome-doc-utils>=0.20.2' 'intltool') -install=netspeed-applet.install -source=(http://launchpad.net/netspeed/trunk/0.16/+download/netspeed_applet-${pkgver}.tar.gz) -md5sums=('8ae5f925d29fca9b70a248ad05316877') - -build() { - cd "${srcdir}/netspeed_applet-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/netspeed-applet \ - --localstatedir=/var --disable-scrollkeeper - make - make DESTDIR="${pkgdir}" install -} diff --git a/extra/netspeed-applet/netspeed-applet.install b/extra/netspeed-applet/netspeed-applet.install deleted file mode 100644 index 1a05f573e..000000000 --- a/extra/netspeed-applet/netspeed-applet.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/openexr/PKGBUILD b/extra/openexr/PKGBUILD index af65ffe11..9fe115aef 100644 --- a/extra/openexr/PKGBUILD +++ b/extra/openexr/PKGBUILD @@ -1,23 +1,29 @@ -# $Id: PKGBUILD 17474 2008-10-30 16:25:54Z pierre $ +# $Id: PKGBUILD 122097 2011-05-02 06:42:28Z andrea $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=openexr -pkgver=1.6.1 +pkgver=1.7.0 pkgrel=1 -depends=('zlib' 'ilmbase') -pkgdesc="openexr library for EXR images" +pkgdesc="An high dynamic-range image file format library" +url="http://www.openexr.com/" arch=(i686 x86_64 'mips64el') +license=('BSD') +depends=('zlib' 'ilmbase') options=('!libtool') -license=('custom') -source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz" 'gcc43.patch') -url="http://www.openexr.org" -md5sums=('11951f164f9c872b183df75e66de145a' '7c83ee3d69ad688142e7de63cb68e70a') +source=("http://download.savannah.nongnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'gcc43.patch') +md5sums=('27113284f7d26a58f853c346e0851d7a' + 'd91fae759053a70bcedcf02eb33ca4a2') build() { - cd $startdir/src/$pkgname-$pkgver - patch -p1 -i $srcdir/gcc43.patch || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p0 -i ${srcdir}/gcc43.patch ./configure --prefix=/usr - make || return 1 - make DESTDIR=$startdir/pkg install - install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/openexr/gcc43.patch b/extra/openexr/gcc43.patch index 362487276..ab99eb9a1 100644 --- a/extra/openexr/gcc43.patch +++ b/extra/openexr/gcc43.patch @@ -1,22 +1,11 @@ -diff -Nura openexr-1.6.1/exrenvmap/main.cpp openexr-1.6.1.new/exrenvmap/main.cpp ---- openexr-1.6.1/exrenvmap/main.cpp 2007-04-25 03:07:51.000000000 +0200 -+++ openexr-1.6.1.new/exrenvmap/main.cpp 2008-10-30 17:18:13.000000000 +0100 -@@ -45,6 +45,7 @@ - #include <iostream> - #include <exception> - #include <stdlib.h> -+#include <string.h> +--- exrenvmap/blurImage.cpp ++++ exrenvmap/blurImage.cpp +@@ -39,6 +39,8 @@ + // + //----------------------------------------------------------------------------- - using namespace Imf; - using namespace std; -diff -Nura openexr-1.6.1/exrmaketiled/main.cpp openexr-1.6.1.new/exrmaketiled/main.cpp ---- openexr-1.6.1/exrmaketiled/main.cpp 2007-04-25 03:08:45.000000000 +0200 -+++ openexr-1.6.1.new/exrmaketiled/main.cpp 2008-10-30 17:18:40.000000000 +0100 -@@ -46,6 +46,7 @@ - #include <exception> - #include <string> - #include <stdlib.h> -+#include <string.h> ++#include <cstring> ++ + #include <blurImage.h> - using namespace Imf; - using namespace std; + #include <resizeImage.h> diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD index d5db674dc..e89eb4d9e 100644 --- a/extra/postgresql/PKGBUILD +++ b/extra/postgresql/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 120393 2011-04-23 18:29:42Z dan $ +# $Id: PKGBUILD 122182 2011-05-02 17:54:57Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgbase=postgresql pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') pkgver=9.0.4 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url="http://www.postgresql.org" license=('custom:PostgreSQL') diff --git a/extra/postgresql/postgresql.install b/extra/postgresql/postgresql.install index c3fa4fc3e..d65bb6a7f 100644 --- a/extra/postgresql/postgresql.install +++ b/extra/postgresql/postgresql.install @@ -1,4 +1,7 @@ post_install() { + if [ ! -d '/var/lib/postgres' ]; then + mkdir -p '/var/lib/postgres' + fi getent group postgres >/dev/null || groupadd -g 88 postgres getent passwd postgres >/dev/null || useradd -c 'PostgreSQL user' -u 88 -g postgres -d '/var/lib/postgres' -s /bin/bash postgres passwd -l postgres >/dev/null diff --git a/extra/pulseaudio-mixer-applet/PKGBUILD b/extra/pulseaudio-mixer-applet/PKGBUILD deleted file mode 100644 index 0854d5a30..000000000 --- a/extra/pulseaudio-mixer-applet/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 99926 2010-11-19 14:16:58Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Samed Beyribey <ras0ir AT eventualis DOT org> - -pkgname=pulseaudio-mixer-applet -pkgver=0.2.2 -pkgrel=6 -pkgdesc="GNOME panel applet to control PulseAudio devices and streams" -arch=(i686 x86_64 'mips64el') -url="https://launchpad.net/pama" -license=(GPL3) -depends=(gnome-media gnome-panel-bonobo libpulse glib2) -makedepends=(intltool) -source=(http://launchpad.net/pama/${pkgver%.*}/$pkgver/+download/pulseaudio-mixer-applet-$pkgver.tar.gz) -md5sums=('b7df43c999ad8583f779e678cfe768ae') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install -} diff --git a/extra/seahorse-plugins/PKGBUILD b/extra/seahorse-plugins/PKGBUILD deleted file mode 100644 index afc7fd5d5..000000000 --- a/extra/seahorse-plugins/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 112893 2011-03-07 15:53:09Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=seahorse-plugins -pkgver=2.30.1 -pkgrel=3 -pkgdesc="Seahorse plugins" -arch=(i686 x86_64 'mips64el') -license=('GPL') -depends=('seahorse>=2.30.1' 'desktop-file-utils') -makedepends=('intltool' 'gnome-doc-utils>=0.20.0' 'pkgconfig' 'gedit>=2.30.2' 'nautilus>=2.30.1' 'gnome-panel-bonobo>=2.32.0') -optdepends=('gnome-panel-bonobo: applet support') -groups=('gnome-extra') -url="http://www.gnome.org" -options=('!libtool' '!emptydirs') -install=seahorse-plugins.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2 - gpgme-init.patch - seahorse-plugins-2.30.1-libnotify-0.7.patch) -sha256sums=('1fdfed1aef2c22a29a9abc00eae67752854e466a66cee2a8c1c278277e832d66' - '418d67892b348d02885e968c5299416baf545b12cf8f58b23579f79e87776ab2' - '9da8c5552217a56f4b7d12e28a425b3980b20953d8312c3017378e5a71536905') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/gpgme-init.patch" - patch -Np0 -i "${srcdir}/seahorse-plugins-2.30.1-libnotify-0.7.patch" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-scrollkeeper \ - --disable-update-mime-database \ - --disable-static - make - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain seahorse-plugins ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/extra/seahorse-plugins/gpgme-init.patch b/extra/seahorse-plugins/gpgme-init.patch deleted file mode 100644 index 7e2e94be2..000000000 --- a/extra/seahorse-plugins/gpgme-init.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -ruN seahorse-plugins-2.29.90.orig/agent/seahorse-agent-cache.c seahorse-plugins-2.29.90/agent/seahorse-agent-cache.c ---- seahorse-plugins-2.29.90.orig/agent/seahorse-agent-cache.c 2010-01-25 03:06:50.000000000 +0100 -+++ seahorse-plugins-2.29.90/agent/seahorse-agent-cache.c 2010-02-14 12:31:01.000000000 +0100 -@@ -236,6 +236,7 @@ - if (g_cache == NULL) { - g_cache = - g_hash_table_new_full (g_str_hash, g_str_equal, NULL, destroy_cache_item); -+ gpgme_check_version (NULL); - - err = gpgme_engine_check_version (proto); - g_return_if_fail (GPG_IS_OK (err)); -diff -ruN seahorse-plugins-2.29.90.orig/libseahorse/seahorse-pgp-operation.c seahorse-plugins-2.29.90/libseahorse/seahorse-pgp-operation.c ---- seahorse-plugins-2.29.90.orig/libseahorse/seahorse-pgp-operation.c 2010-01-25 03:06:50.000000000 +0100 -+++ seahorse-plugins-2.29.90/libseahorse/seahorse-pgp-operation.c 2010-02-14 12:31:25.000000000 +0100 -@@ -322,6 +322,8 @@ - gpgme_protocol_t proto = GPGME_PROTOCOL_OpenPGP; - gpgme_error_t err; - gpgme_ctx_t ctx; -+ -+ gpgme_check_version (NULL); - - err = gpgme_engine_check_version (proto); - g_return_if_fail (GPG_IS_OK (err)); -diff -ruN seahorse-plugins-2.29.90.orig/plugins/nautilus/seahorse-tool.c seahorse-plugins-2.29.90/plugins/nautilus/seahorse-tool.c ---- seahorse-plugins-2.29.90.orig/plugins/nautilus/seahorse-tool.c 2010-01-25 03:06:50.000000000 +0100 -+++ seahorse-plugins-2.29.90/plugins/nautilus/seahorse-tool.c 2010-02-14 12:32:44.000000000 +0100 -@@ -171,6 +171,7 @@ - - if (recips) { - -+ gpgme_check_version (NULL); - gerr = gpgme_new (&ctx); - g_return_val_if_fail (GPG_IS_OK (gerr), NULL); - -@@ -328,6 +329,8 @@ - id = cryptui_keyset_key_raw_keyid (keyset, signer); - g_free (signer); - -+ gpgme_check_version (NULL); -+ - gerr = gpgme_new (&ctx); - g_return_val_if_fail (GPG_IS_OK (gerr), NULL); - diff --git a/extra/seahorse-plugins/seahorse-plugins-2.30.1-libnotify-0.7.patch b/extra/seahorse-plugins/seahorse-plugins-2.30.1-libnotify-0.7.patch deleted file mode 100644 index 060340707..000000000 --- a/extra/seahorse-plugins/seahorse-plugins-2.30.1-libnotify-0.7.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- libseahorse/seahorse-notification.c -+++ libseahorse/seahorse-notification.c -@@ -34,6 +34,9 @@ - - #ifdef HAVE_LIBNOTIFY - #include <libnotify/notify.h> -+#ifndef NOTIFY_CHECK_VERSION -+#define NOTIFY_CHECK_VERSION(x,y,z) 0 -+#endif - #endif - - /* ----------------------------------------------------------------------------- -@@ -213,7 +216,12 @@ - heading = format_key_text (snotif->heading); - message = format_key_text (snotif->message); - -- notif = notify_notification_new (heading, message, snotif->icon, attachto); -+ notif = notify_notification_new (heading, message, snotif->icon -+#if NOTIFY_CHECK_VERSION (0, 7, 0) -+ ); -+#else -+ , attachto); -+#endif - - g_free (heading); - g_free (message); diff --git a/extra/seahorse-plugins/seahorse-plugins.install b/extra/seahorse-plugins/seahorse-plugins.install deleted file mode 100644 index 3f36ff2a2..000000000 --- a/extra/seahorse-plugins/seahorse-plugins.install +++ /dev/null @@ -1,26 +0,0 @@ -pkgname=seahorse-plugins - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-mime-database usr/share/mime >/dev/null 2>&1 -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - -post_remove() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-mime-database usr/share/mime -} diff --git a/extra/telepathy-qt4/PKGBUILD b/extra/telepathy-qt4/PKGBUILD index c35b76559..0d98fcdec 100644 --- a/extra/telepathy-qt4/PKGBUILD +++ b/extra/telepathy-qt4/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 120824 2011-04-26 16:25:58Z ibiru $ +# $Id: PKGBUILD 122345 2011-05-03 23:56:05Z andrea $ # Maintainer: Ionut Biru <ibiru@archlinux.org> +# Contributor: Andrea Scarpino <andrea@archlinux.org> + pkgname=telepathy-qt4 -pkgver=0.5.15 +pkgver=0.5.16 pkgrel=1 -pkgdesc="A library for Qt-based Telepathy clients." +pkgdesc="A library for Qt-based Telepathy clients" arch=('i686' 'x86_64' 'mips64el') -url="http://telepathy.freedesktop.org" +url="http://telepathy.freedesktop.org/wiki/" license=('LGPL') options=('!libtool') depends=('qt' 'telepathy-farsight') makedepends=('libxslt' 'python2' 'cmake') -source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('2066d447a46ca3d767ff82ca562244a0') +source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('82e36c051c74d323b329f69ac2c5427f') build() { cd "${srcdir}" - mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -26,5 +27,5 @@ build() { package() { cd "${srcdir}"/build - make DESTDIR="$pkgdir" install + make DESTDIR="${pkgdir}" install } diff --git a/extra/udisks/PKGBUILD b/extra/udisks/PKGBUILD index 300232975..2ad92d911 100644 --- a/extra/udisks/PKGBUILD +++ b/extra/udisks/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 119537 2011-04-11 22:26:25Z ibiru $ +# $Id: PKGBUILD 122326 2011-05-03 20:32:37Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=udisks pkgver=1.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="Disk Management Service" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/udisks" @@ -13,13 +13,16 @@ makedepends=('intltool' 'docbook-xsl' 'gtk-doc') options=(!libtool) #source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz) source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz - 01-mkfs-tempdir.patch) + 01-mkfs-tempdir.patch + fix_well_known_filesystems.patch) sha256sums=('a4d18b2de59c1567df5342f26960c6c3e70a0320f7bafe42893f2708c9b57dd5' - '786c0adb1a37e16b351c906527e3cbd17193bb51d8c1dd0889f216556c419c6c') + '786c0adb1a37e16b351c906527e3cbd17193bb51d8c1dd0889f216556c419c6c' + '00d92030de44c5856c7408339c4849bf9b88b66d6cfa6617364b4e8d9ed2bc5e') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i "${srcdir}/01-mkfs-tempdir.patch" + patch -Np1 -i "${srcdir}/fix_well_known_filesystems.patch" ./autogen.sh ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/udisks --disable-static diff --git a/extra/udisks/fix_well_known_filesystems.patch b/extra/udisks/fix_well_known_filesystems.patch new file mode 100644 index 000000000..77eee26ba --- /dev/null +++ b/extra/udisks/fix_well_known_filesystems.patch @@ -0,0 +1,12 @@ +diff -Nur udisks-1.0.3.orig/src/device.c udisks-1.0.3/src/device.c +--- udisks-1.0.3.orig/src/device.c 2011-04-05 13:16:00.000000000 -0700 ++++ udisks-1.0.3/src/device.c 2011-05-03 13:27:39.064679418 -0700 +@@ -5902,7 +5902,7 @@ + "msdos", + "umsdos", + "vfat", +- "exfat" ++ "exfat", + "ntfs", + NULL, + }; diff --git a/extra/upower/PKGBUILD b/extra/upower/PKGBUILD index 8c9201da2..fac9cc594 100644 --- a/extra/upower/PKGBUILD +++ b/extra/upower/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 116154 2011-03-22 19:35:44Z ibiru $ +# $Id: PKGBUILD 122280 2011-05-03 18:02:14Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=upower -pkgver=0.9.9 +pkgver=0.9.10 pkgrel=1 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics" arch=('i686' 'x86_64' 'mips64el') @@ -13,12 +13,16 @@ makedepends=('pkg-config' 'intltool' 'docbook-xsl' 'gobject-introspection') replaces=('devicekit-power') options=('!libtool') source=($url/releases/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('39e19bab2c776000477d6d0ddb4bc508808954f63867a2da2be40eaf341214e2') +sha256sums=('fa567509c4ce8d1975259665b907929cac692a59dbe0e217e7494b1cdc949288') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/upower --disable-static make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/vino/PKGBUILD b/extra/vino/PKGBUILD index cfbed0f8e..4401b8086 100644 --- a/extra/vino/PKGBUILD +++ b/extra/vino/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 120634 2011-04-25 18:44:11Z ibiru $ +# $Id: PKGBUILD 122171 2011-05-02 16:51:49Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=vino -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 pkgdesc="a VNC server for the GNOME desktop" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ url="http://www.gnome.org" options=(!emptydirs) install=vino.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('d2111f1f8dbcb78005cce3d28ea42b5deabe5ced83eb11030e4a74874fdfdfca') +sha256sums=('ca2d72f70d2a94e31e63d0267ec41820aab168c6545954c355a609f3c6c31923') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/webmin/PKGBUILD b/extra/webmin/PKGBUILD index 1fb31dd0b..436b73199 100644 --- a/extra/webmin/PKGBUILD +++ b/extra/webmin/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 118950 2011-04-09 15:28:29Z tpowa $ +# $Id: PKGBUILD 122336 2011-05-03 22:31:36Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=webmin -pkgver=1.540 +pkgver=1.550 pkgrel=1 pkgdesc="a web-based interface for system administration" arch=(i686 x86_64 'mips64el') @@ -210,7 +210,9 @@ build() { # install license install -m 644 -D $startdir/src/$pkgname-$pkgver/LICENCE $startdir/pkg/usr/share/licenses/webmin/LICENCE } -md5sums=('8086fc60419937c4b2844796cfd2aea1' + + +md5sums=('d892599a6e3e6f102a8261d2804fb1b5' 'da6bea412a5be8cf82a813078fec5847' 'bfebb75bb94029b48c46b7f1ba1aa811' '0673e51af0e81418b4a6c1e205f7e5cd') diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 927752f21..b2af0eaf1 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -19,10 +19,9 @@ # * Disabled ContentHandlers and other Google/Yahoo! related services pkgname=icecat -pkgver=4.0 -_pkgver=4.0 +pkgver=4.0.1 pkgrel=1 -_xulver=2.0 +_xulver=2.0.1 pkgdesc="GNU version of the Firefox browser. SafeBrowsing and other Google services disabled!" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/gnuzilla/" @@ -31,10 +30,9 @@ depends=("xulrunner=${_xulver}" 'desktop-file-utils') makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa') provides=('firefox') conflicts=('firefox') -replaces=("firefox=${_pkgver}") +replaces=("firefox=${pkgver}") install=icecat.install -#source=(http://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz -source=(ftp://ftp.gnu.org/gnu/gnuzilla/${_pkgver}/${pkgname}-${_pkgver}.tar.bz2 +source=(http://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz mozconfig icecat.desktop icecat-safe.desktop @@ -50,15 +48,15 @@ source=(ftp://ftp.gnu.org/gnu/gnuzilla/${_pkgver}/${pkgname}-${_pkgver}.tar.bz2 duck-duck-go-ssl.xml duck-duck-go-lite.xml # Default options - firefox.js + firefox.js region.properties) build() { - ICECATDIR="/usr/lib/${pkgname}-4.0" && export ICECATDIR + ICECATDIR="/usr/lib/${pkgname}-${pkgver}" && export ICECATDIR msg2 "Patching some files..." - cd "${srcdir}/${pkgname}-${_pkgver}/" + cd "${srcdir}/${pkgname}-${pkgver}/" patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch" patch -Np0 -i "${srcdir}/xulrunner-copy-stub.patch" @@ -72,37 +70,35 @@ build() { export LDFLAGS="-Wl,-rpath,${ICECATDIR}" - #make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" ./configure - - touch config* - make MOZ_MAKE_FLAGS="${MAKEFLAGS}" msg2 "Build complete" + } package() { - ICECATDIR="/usr/lib/${pkgname}-4.0" && export ICECATDIR + ICECATDIR="/usr/lib/${pkgname}-${pkgver}" && export ICECATDIR - cd "${srcdir}/${pkgname}-${_pkgver}/" - #make -j1 -f client.mk DESTDIR="${pkgdir}" install + cd "${srcdir}/${pkgname}-${pkgver}/" make install DESTDIR="${pkgdir}" msg2 "Finishing..." - install -m755 -d ${pkgdir}/usr/share/applications install -m755 -d ${pkgdir}/usr/share/pixmaps - install -m644 ${srcdir}/${pkgname}-${_pkgver}/browser/branding/unofficial/default48.png ${pkgdir}/usr/share/pixmaps/icecat.png + install -m644 ${srcdir}/${pkgname}-${pkgver}/browser/branding/unofficial/default48.png ${pkgdir}/usr/share/pixmaps/icecat.png install -m644 ${srcdir}/icecat.desktop ${pkgdir}/usr/share/applications/ install -m644 ${srcdir}/icecat-safe.desktop ${pkgdir}/usr/share/applications/ + cd ${pkgdir}/usr/lib + ln -s ${ICECATDIR} icecat + msg2 "Removing proprietary and anti-privacy search engines" rm -f ${pkgdir}${ICECATDIR}/searchplugins/{google,answers,amazondotcom,eBay,yahoo,bing}.xml msg2 "And provide better ones..." install -m755 -d ${pkgdir}${ICECATDIR}/searchplugins/ install -m644 ${srcdir}/*.xml ${pkgdir}${ICECATDIR}/searchplugins/ } -md5sums=('6d7031ecdcf8edb214aaa3fbb1d3fe33' +md5sums=('1b4d44ee5badc28fd332cba564ecde0a' '436db1f6167ffe82fcd71a53ffd80d0e' 'e81ad01dbc16ba28bf92ba4b7c309ca7' 'd93fe402b87cd000a869e1fd6badc6c9' diff --git a/libre/kernel26-libre/PKGBUILD b/libre/kernel26-libre/PKGBUILD index 31dca52b0..673a464a1 100644 --- a/libre/kernel26-libre/PKGBUILD +++ b/libre/kernel26-libre/PKGBUILD @@ -6,7 +6,7 @@ pkgname=('kernel26-libre' 'kernel26-libre-headers' 'kernel26-libre-docs') # Buil _kernelname=${pkgname#kernel26-libre} _basekernel=2.6.38 -pkgver=${_basekernel}.4 +pkgver=${_basekernel}.5 pkgrel=1 makedepends=('xmlto' 'docbook-xsl') _patchname="patch-${pkgver}-${pkgrel}-LIBRE" @@ -24,15 +24,6 @@ source=(http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/li kernel26.install Kbuild Kbuild.platforms) -md5sums=('0f1a5d184d4029c9d9b38a4b9407c392' - 'bff27ebb220bd720d622047174511d94' - '8395aac2f31718b45afe57794c21ab81' - 'a6b673aead69b12f50b8ca53d1f14b14' - 'fa7d6abea1e2163b1ab2b1acfe117f51' - '25584700a0a679542929c4bed31433b6' - '2d68b4cf4caedd1f0188f4877eca1d43' - '2967cecc3af9f954ccc822fd63dca6ff' - '8267264d9a8966e57fdacd1fa1fc65c4') build() { cd ${srcdir}/linux-$pkgver @@ -170,7 +161,8 @@ package_kernel26-libre-headers() { ${pkgdir}/usr/src/linux-${_kernver}/.config mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/include - for i in acpi asm-generic config crypto drm generated linux math-emu media net pcmcia scsi sound trace video xen; do + for i in acpi asm-generic config crypto drm generated linux math-emu \ + media net pcmcia scsi sound trace video xen; do cp -a include/$i ${pkgdir}/usr/src/linux-${_kernver}/include/ done diff --git a/multilib/nspluginwrapper/PKGBUILD b/multilib/nspluginwrapper/PKGBUILD index 136207012..9c2f230a9 100644 --- a/multilib/nspluginwrapper/PKGBUILD +++ b/multilib/nspluginwrapper/PKGBUILD @@ -1,34 +1,26 @@ -# $Id: PKGBUILD 26767 2010-09-15 23:06:22Z bluewind $ +# $Id: PKGBUILD 46102 2011-05-03 15:47:24Z bluewind $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=nspluginwrapper -pkgver=1.3.0 -pkgrel=4 +pkgver=1.3.2 +pkgrel=1 pkgdesc="Cross-platform NPAPI compatible plugin viewer" arch=('x86_64' 'mips64el') url="http://freshmeat.net/projects/nspluginwrapper/" license=('GPL') depends=('curl' 'lib32-libxt' 'lib32-gcc-libs' 'gtk2' 'lib32-gtk2') makedepends=('gcc-multilib') -source=(ftp://ftp.archlinux.org/other/nspluginwrapper/$pkgname-$pkgver.tar.gz - npw-viewer.c.patch - nspluginwrapper-20090625-fix-npident-array-sending.patch +source=(http://web.mit.edu/davidben/Public/$pkgname/$pkgname-$pkgver.tar.gz nspluginwrapper-native-windows.patch) -sha256sums=('0af7e2ae4c6258d5c17addbcc4658b84c979860da843873f0d15d90ee9a8259d' - '4b216cca327ae76e6e2ab6dc6bbaf3efe1123c63a09b0e7e45c964531fcbdeb0' - '8bb55b845017b60912c62c4abadc50a3f0397ddf470599b8453b97d9e69f8cd5' +sha256sums=('f3a40d160601520d36b6f5c342e1e9751b2bdc70dff5e2e880e1d18ed8830201' '3796b66f53448f4668e70aec97a3d74db2b2fcd308b36f87373405547cae38b1') build() { cd "$srcdir/$pkgname-$pkgver" - # Fix build - patch -p1 -i "$srcdir/npw-viewer.c.patch" - # See http://web.archiveorange.com/archive/v/tptsHOJYbGKIfNFz9xHz - patch -p0 -i "$srcdir/nspluginwrapper-20090625-fix-npident-array-sending.patch" # Patch taken from the openSuSE src.rpm patch -p0 -i "$srcdir/nspluginwrapper-native-windows.patch" ./configure --with-lib32=lib32 --with-lib64=lib - make + make -j1 } package() { diff --git a/multilib/nspluginwrapper/npw-viewer.c.patch b/multilib/nspluginwrapper/npw-viewer.c.patch deleted file mode 100644 index a213003fd..000000000 --- a/multilib/nspluginwrapper/npw-viewer.c.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nur nspluginwrapper-1.3.0.orig//src/npw-viewer.c nspluginwrapper-1.3.0//src/npw-viewer.c ---- nspluginwrapper-1.3.0.orig//src/npw-viewer.c 2009-01-02 15:22:29.000000000 +0100 -+++ nspluginwrapper-1.3.0//src/npw-viewer.c 2010-08-26 18:46:50.574976221 +0200 -@@ -4187,7 +4187,8 @@ - #define high_offset offsetof(struct _XtAppStruct, __maybe__input_max) - #define n_offsets_max (high_offset - low_offset)/2 - int i, ofs, n_offsets = 0; -- int offsets[n_offsets_max] = { 0, }; -+ int offsets[n_offsets_max]; -+ offsets[0] = 0; - - #define n_inputs_max 4 /* number of refinements/input sources */ - int fd, id, n_inputs = 0; diff --git a/multilib/nspluginwrapper/nspluginwrapper-20090625-fix-npident-array-sending.patch b/multilib/nspluginwrapper/nspluginwrapper-20090625-fix-npident-array-sending.patch deleted file mode 100644 index 568a4ea1f..000000000 --- a/multilib/nspluginwrapper/nspluginwrapper-20090625-fix-npident-array-sending.patch +++ /dev/null @@ -1,178 +0,0 @@ -Index: src/npw-viewer.c -=================================================================== ---- src/npw-viewer.c (revision 942) -+++ src/npw-viewer.c (working copy) -@@ -2059,7 +2059,7 @@ - RPC_METHOD_NPN_INVOKE, - RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin, - RPC_TYPE_NP_OBJECT, npobj, -- RPC_TYPE_NP_IDENTIFIER, methodName, -+ RPC_TYPE_NP_IDENTIFIER, &methodName, - RPC_TYPE_ARRAY, RPC_TYPE_NP_VARIANT, argCount, args, - RPC_TYPE_INVALID); - -@@ -2249,7 +2249,7 @@ - RPC_METHOD_NPN_GET_PROPERTY, - RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin, - RPC_TYPE_NP_OBJECT, npobj, -- RPC_TYPE_NP_IDENTIFIER, propertyName, -+ RPC_TYPE_NP_IDENTIFIER, &propertyName, - RPC_TYPE_INVALID); - - if (error != RPC_ERROR_NO_ERROR) { -@@ -2311,7 +2311,7 @@ - RPC_METHOD_NPN_SET_PROPERTY, - RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin, - RPC_TYPE_NP_OBJECT, npobj, -- RPC_TYPE_NP_IDENTIFIER, propertyName, -+ RPC_TYPE_NP_IDENTIFIER, &propertyName, - RPC_TYPE_NP_VARIANT, value, - RPC_TYPE_INVALID); - -@@ -2370,7 +2370,7 @@ - RPC_METHOD_NPN_REMOVE_PROPERTY, - RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin, - RPC_TYPE_NP_OBJECT, npobj, -- RPC_TYPE_NP_IDENTIFIER, propertyName, -+ RPC_TYPE_NP_IDENTIFIER, &propertyName, - RPC_TYPE_INVALID); - - if (error != RPC_ERROR_NO_ERROR) { -@@ -2427,7 +2427,7 @@ - RPC_METHOD_NPN_HAS_PROPERTY, - RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin, - RPC_TYPE_NP_OBJECT, npobj, -- RPC_TYPE_NP_IDENTIFIER, propertyName, -+ RPC_TYPE_NP_IDENTIFIER, &propertyName, - RPC_TYPE_INVALID); - - if (error != RPC_ERROR_NO_ERROR) { -@@ -2484,7 +2484,7 @@ - RPC_METHOD_NPN_HAS_METHOD, - RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin, - RPC_TYPE_NP_OBJECT, npobj, -- RPC_TYPE_NP_IDENTIFIER, methodName, -+ RPC_TYPE_NP_IDENTIFIER, &methodName, - RPC_TYPE_INVALID); - - if (error != RPC_ERROR_NO_ERROR) { -@@ -2780,7 +2780,7 @@ - - int error = rpc_method_invoke(g_rpc_connection, - RPC_METHOD_NPN_IDENTIFIER_IS_STRING, -- RPC_TYPE_NP_IDENTIFIER, identifier, -+ RPC_TYPE_NP_IDENTIFIER, &identifier, - RPC_TYPE_INVALID); - - if (error != RPC_ERROR_NO_ERROR) { -@@ -2838,7 +2838,7 @@ - - int error = rpc_method_invoke(g_rpc_connection, - RPC_METHOD_NPN_UTF8_FROM_IDENTIFIER, -- RPC_TYPE_NP_IDENTIFIER, identifier, -+ RPC_TYPE_NP_IDENTIFIER, &identifier, - RPC_TYPE_INVALID); - - if (error != RPC_ERROR_NO_ERROR) { -@@ -2902,7 +2902,7 @@ - - int error = rpc_method_invoke(g_rpc_connection, - RPC_METHOD_NPN_INT_FROM_IDENTIFIER, -- RPC_TYPE_NP_IDENTIFIER, identifier, -+ RPC_TYPE_NP_IDENTIFIER, &identifier, - RPC_TYPE_INVALID); - - if (error != RPC_ERROR_NO_ERROR) { -Index: src/npw-wrapper.c -=================================================================== ---- src/npw-wrapper.c (revision 942) -+++ src/npw-wrapper.c (working copy) -@@ -1528,7 +1528,7 @@ - free(name); - - return rpc_method_send_reply(connection, -- RPC_TYPE_NP_IDENTIFIER, ident, -+ RPC_TYPE_NP_IDENTIFIER, &ident, - RPC_TYPE_INVALID); - } - -@@ -1601,7 +1601,7 @@ - NPIdentifier ident = g_NPN_GetIntIdentifier(intid); - - return rpc_method_send_reply(connection, -- RPC_TYPE_NP_IDENTIFIER, ident, -+ RPC_TYPE_NP_IDENTIFIER, &ident, - RPC_TYPE_INVALID); - } - -Index: src/npruntime.c -=================================================================== ---- src/npruntime.c (revision 942) -+++ src/npruntime.c (working copy) -@@ -221,7 +221,7 @@ - int error = rpc_method_invoke(g_rpc_connection, - RPC_METHOD_NPCLASS_HAS_METHOD, - RPC_TYPE_NP_OBJECT, npobj, -- RPC_TYPE_NP_IDENTIFIER, name, -+ RPC_TYPE_NP_IDENTIFIER, &name, - RPC_TYPE_INVALID); - - if (error != RPC_ERROR_NO_ERROR) { -@@ -327,7 +327,7 @@ - int error = rpc_method_invoke(g_rpc_connection, - RPC_METHOD_NPCLASS_INVOKE, - RPC_TYPE_NP_OBJECT, npobj, -- RPC_TYPE_NP_IDENTIFIER, name, -+ RPC_TYPE_NP_IDENTIFIER, &name, - RPC_TYPE_ARRAY, RPC_TYPE_NP_VARIANT, argCount, args, - RPC_TYPE_INVALID); - -@@ -509,7 +509,7 @@ - int error = rpc_method_invoke(g_rpc_connection, - RPC_METHOD_NPCLASS_HAS_PROPERTY, - RPC_TYPE_NP_OBJECT, npobj, -- RPC_TYPE_NP_IDENTIFIER, name, -+ RPC_TYPE_NP_IDENTIFIER, &name, - RPC_TYPE_INVALID); - - if (error != RPC_ERROR_NO_ERROR) { -@@ -599,7 +599,7 @@ - int error = rpc_method_invoke(g_rpc_connection, - RPC_METHOD_NPCLASS_GET_PROPERTY, - RPC_TYPE_NP_OBJECT, npobj, -- RPC_TYPE_NP_IDENTIFIER, name, -+ RPC_TYPE_NP_IDENTIFIER, &name, - RPC_TYPE_INVALID); - - if (error != RPC_ERROR_NO_ERROR) { -@@ -684,7 +684,7 @@ - int error = rpc_method_invoke(g_rpc_connection, - RPC_METHOD_NPCLASS_SET_PROPERTY, - RPC_TYPE_NP_OBJECT, npobj, -- RPC_TYPE_NP_IDENTIFIER, name, -+ RPC_TYPE_NP_IDENTIFIER, &name, - RPC_TYPE_NP_VARIANT, value, - RPC_TYPE_INVALID); - -@@ -763,7 +763,7 @@ - int error = rpc_method_invoke(g_rpc_connection, - RPC_METHOD_NPCLASS_REMOVE_PROPERTY, - RPC_TYPE_NP_OBJECT, npobj, -- RPC_TYPE_NP_IDENTIFIER, name, -+ RPC_TYPE_NP_IDENTIFIER, &name, - RPC_TYPE_INVALID); - - if (error != RPC_ERROR_NO_ERROR) { -Index: src/npw-rpc.c -=================================================================== ---- src/npw-rpc.c (revision 942) -+++ src/npw-rpc.c (working copy) -@@ -1252,7 +1252,7 @@ - // the browser side - static int do_send_NPIdentifier(rpc_message_t *message, void *p_value) - { -- NPIdentifier ident = (NPIdentifier)p_value; -+ NPIdentifier ident = *(NPIdentifier *)p_value; - int id = 0; - if (ident) { - #ifdef BUILD_WRAPPER diff --git a/multilib/wine/PKGBUILD b/multilib/wine/PKGBUILD index 33cfd7574..9b1578bdc 100644 --- a/multilib/wine/PKGBUILD +++ b/multilib/wine/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 45826 2011-04-29 19:49:25Z svenstaro $ +# $Id: PKGBUILD 46051 2011-05-02 23:40:05Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Eduardo Romero <eduardo@archlinux.org> @@ -6,7 +6,7 @@ pkgname=wine pkgver=1.3.19 -pkgrel=1 +pkgrel=2 _pkgbasever=${pkgver/rc/-rc} @@ -49,6 +49,7 @@ makedepends=(autoconf ncurses bison perl fontforge flex prelink libcups lib32-libcups gnutls lib32-gnutls v4l-utils lib32-v4l-utils + oss ) optdepends=( @@ -63,6 +64,7 @@ optdepends=( libcups lib32-libcups gnutls lib32-gnutls v4l-utils lib32-v4l-utils + oss ) if [[ $CARCH == i686 ]]; then @@ -87,6 +89,10 @@ build() { rm -rf $pkgname-{32,64}-build mkdir $pkgname-32-build + # hacky hax for ossv4 being "too old" + sed -i "s|<sys/soundcard.h>|</usr/lib/oss/include/sys/soundcard.h>|g" $pkgname/configure + sed -i "s|<sys/soundcard.h>|</usr/lib/oss/include/sys/soundcard.h>|g" $pkgname/dlls/wineoss.drv/*.c + if [[ $CARCH == x86_64 ]]; then msg2 "Building Wine-64..." diff --git a/staging/cyrus-sasl-plugins/PKGBUILD b/staging/cyrus-sasl-plugins/PKGBUILD new file mode 100644 index 000000000..5817bb657 --- /dev/null +++ b/staging/cyrus-sasl-plugins/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 122144 2011-05-02 13:27:49Z stephane $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=cyrus-sasl-plugins +pkgver=2.1.23 +pkgrel=5 +pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" +arch=('i686' 'x86_64') +url="http://cyrusimap.web.cmu.edu/" +license=('custom') +depends=('postgresql-libs>=9.0.3' 'krb5' 'libldap>2.4' + 'libmysqlclient>=5.5.10') +source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz + cyrus-sasl-2.1.22-gcc44.patch + cyrus-sasl-2.1.23-db5-fix.patch) +md5sums=('2eb0e48106f0e9cd8001e654f267ecbc' + '5deb4d67b53ecba20c7887fc8fdebee1' + '3ae4347705141145f31cf786c38ea9ef') +options=('!libtool') + +build() { + cd ${srcdir}/cyrus-sasl-${pkgver} + patch -Np1 -i $srcdir/cyrus-sasl-2.1.22-gcc44.patch + # from http://bugs.gentoo.org/show_bug.cgi?id=319935 + patch -Np0 -i ${srcdir}/cyrus-sasl-2.1.23-db5-fix.patch + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-login \ + --disable-plain \ + --enable-sql \ + --disable-sqlite \ + --enable-gssapi=/usr/include/gssapi \ + --with-mysql=/usr \ + --with-pgsql=/usr \ + --enable-postgresql \ + --enable-ldapdb \ + --with-ldap=/usr + cd sasldb + make + cd ../plugins + make +} + +package () { + cd ${srcdir}/cyrus-sasl-${pkgver}/plugins + make DESTDIR=${pkgdir} install + + install -Dm644 ../COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING + + rm -f ${pkgdir}/usr/lib/sasl2/libsasldb.* +} diff --git a/staging/cyrus-sasl-plugins/cyrus-sasl-2.1.22-gcc44.patch b/staging/cyrus-sasl-plugins/cyrus-sasl-2.1.22-gcc44.patch new file mode 100644 index 000000000..e2621278b --- /dev/null +++ b/staging/cyrus-sasl-plugins/cyrus-sasl-2.1.22-gcc44.patch @@ -0,0 +1,24 @@ +fix warnings with gcc-4.4 + +http://bugs.gentoo.org/248738 + +--- cyrus-sasl-2.1.22/plugins/digestmd5.c ++++ cyrus-sasl-2.1.22/plugins/digestmd5.c +@@ -2715,7 +2715,7 @@ static sasl_server_plug_t digestmd5_serv + "DIGEST-MD5", /* mech_name */ + #ifdef WITH_RC4 + 128, /* max_ssf */ +-#elif WITH_DES ++#elif defined(WITH_DES) + 112, + #else + 1, +@@ -4034,7 +4034,7 @@ static sasl_client_plug_t digestmd5_clie + "DIGEST-MD5", + #ifdef WITH_RC4 /* mech_name */ + 128, /* max ssf */ +-#elif WITH_DES ++#elif defined(WITH_DES) + 112, + #else + 1, diff --git a/staging/cyrus-sasl-plugins/cyrus-sasl-2.1.23-db5-fix.patch b/staging/cyrus-sasl-plugins/cyrus-sasl-2.1.23-db5-fix.patch new file mode 100644 index 000000000..2ccd6cdb3 --- /dev/null +++ b/staging/cyrus-sasl-plugins/cyrus-sasl-2.1.23-db5-fix.patch @@ -0,0 +1,23 @@ +--- sasldb/db_berkeley.c.orig 2010-10-04 21:11:15.044010468 -0400 ++++ sasldb/db_berkeley.c 2010-10-04 21:12:18.921998718 -0400 +@@ -100,7 +100,7 @@ + ret = db_create(mbdb, NULL, 0); + if (ret == 0 && *mbdb != NULL) + { +-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 ++#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR == 5 + ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660); + #else + ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660); + +--- utils/dbconverter-2.c.orig 2010-10-04 21:23:39.778000256 -0400 ++++ utils/dbconverter-2.c 2010-10-04 21:24:50.384999893 -0400 +@@ -214,7 +214,7 @@ + ret = db_create(mbdb, NULL, 0); + if (ret == 0 && *mbdb != NULL) + { +-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 ++#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR == 5 + ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664); + #else + ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664); diff --git a/staging/cyrus-sasl/PKGBUILD b/staging/cyrus-sasl/PKGBUILD new file mode 100644 index 000000000..6d42f9f75 --- /dev/null +++ b/staging/cyrus-sasl/PKGBUILD @@ -0,0 +1,53 @@ +# $Id: PKGBUILD 122168 2011-05-02 15:13:37Z stephane $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=cyrus-sasl +pkgver=2.1.23 +pkgrel=5 +pkgdesc="SASL authentication daemon" +arch=('i686' 'x86_64') +license=('custom') +url="http://asg.web.cmu.edu/cyrus/download/" +depends=('pam>=1.0.1-2' 'krb5' 'libldap' 'cyrus-sasl-plugins' 'db>=5.0') +replaces=(cyrus-sasl-mysql cyrus-sasl-pgsql) +conflicts=(cyrus-sasl-mysql cyrus-sasl-pgsql) +backup=(etc/conf.d/saslauthd) +source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${pkgname}-${pkgver}.tar.gz + saslauthd + saslauthd.conf.d + cyrus-sasl-2.1.23-gcc4.patch + cyrus-sasl-2.1.23+db-5.0.patch) +md5sums=('2eb0e48106f0e9cd8001e654f267ecbc' + '697dfb51206c398bc976ce9f4cffe72d' + '96d8a2f6189501f8044838e04d5cae7f' + '3a71688df7d5724cd55a8de17d74f34e' + '35c189c8e93ad37e3ae3c49386fdeb2c') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Fix building with db v5.x + patch -Np1 -i ../cyrus-sasl-2.1.23+db-5.0.patch + + # Fix error: #elif with no expression + patch -Np1 -i ../cyrus-sasl-2.1.23-gcc4.patch + + ./configure --prefix=/usr --mandir=/usr/share/man \ + --with-ldap=/usr --with-saslauthd=/var/run/saslauthd \ + --disable-krb4 --with-gss_impl=mit --disable-otp + cd saslauthd + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}/saslauthd" + make DESTDIR="${pkgdir}" install + make testsaslauthd + install -m755 testsaslauthd "${pkgdir}/usr/sbin" + + install -dm766 "${pkgdir}/var/run/saslauthd" + install -Dm755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/saslauthd" + install -Dm644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd" + + install -Dm644 ../COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl/COPYING" +} diff --git a/staging/cyrus-sasl/cyrus-sasl-2.1.23+db-5.0.patch b/staging/cyrus-sasl/cyrus-sasl-2.1.23+db-5.0.patch new file mode 100644 index 000000000..62df3e67e --- /dev/null +++ b/staging/cyrus-sasl/cyrus-sasl-2.1.23+db-5.0.patch @@ -0,0 +1,24 @@ +diff -Naur cyrus-sasl-2.1.23.ori/sasldb/db_berkeley.c cyrus-sasl-2.1.23/sasldb/db_berkeley.c +--- cyrus-sasl-2.1.23.ori/sasldb/db_berkeley.c 2009-04-28 08:09:18.000000000 -0700 ++++ cyrus-sasl-2.1.23/sasldb/db_berkeley.c 2011-05-02 07:16:42.748675977 -0700 +@@ -100,7 +100,7 @@ + ret = db_create(mbdb, NULL, 0); + if (ret == 0 && *mbdb != NULL) + { +-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 ++#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5 + ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660); + #else + ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660); +diff -Naur cyrus-sasl-2.1.23.ori/utils/dbconverter-2.c cyrus-sasl-2.1.23/utils/dbconverter-2.c +--- cyrus-sasl-2.1.23.ori/utils/dbconverter-2.c 2003-02-13 11:56:17.000000000 -0800 ++++ cyrus-sasl-2.1.23/utils/dbconverter-2.c 2011-05-02 07:16:42.748675977 -0700 +@@ -214,7 +214,7 @@ + ret = db_create(mbdb, NULL, 0); + if (ret == 0 && *mbdb != NULL) + { +-#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 ++#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5 + ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664); + #else + ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664); diff --git a/staging/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch b/staging/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch new file mode 100644 index 000000000..0d8627b1f --- /dev/null +++ b/staging/cyrus-sasl/cyrus-sasl-2.1.23-gcc4.patch @@ -0,0 +1,21 @@ +diff -Naur cyrus-sasl-2.1.23.ori/plugins/digestmd5.c cyrus-sasl-2.1.23/plugins/digestmd5.c +--- cyrus-sasl-2.1.23.ori/plugins/digestmd5.c 2009-04-28 08:09:17.000000000 -0700 ++++ cyrus-sasl-2.1.23/plugins/digestmd5.c 2011-05-02 07:56:55.375403814 -0700 +@@ -2715,7 +2715,7 @@ + "DIGEST-MD5", /* mech_name */ + #ifdef WITH_RC4 + 128, /* max_ssf */ +-#elif WITH_DES ++#elif defined(WITH_DES) + 112, + #else + 1, +@@ -4034,7 +4034,7 @@ + "DIGEST-MD5", + #ifdef WITH_RC4 /* mech_name */ + 128, /* max ssf */ +-#elif WITH_DES ++#elif defined(WITH_DES) + 112, + #else + 1, diff --git a/staging/cyrus-sasl/saslauthd b/staging/cyrus-sasl/saslauthd new file mode 100644 index 000000000..c470c801c --- /dev/null +++ b/staging/cyrus-sasl/saslauthd @@ -0,0 +1,50 @@ +#!/bin/bash + +# source application-specific settings +[ -f /etc/conf.d/saslauthd ] && . /etc/conf.d/saslauthd + +. /etc/rc.conf +. /etc/rc.d/functions + +DAEMON_NAME="saslauthd" +SASLAUTHD_BIN=/usr/sbin/saslauthd +SASLAUTHD_PID=`pidof -o %PPID $SASLAUTHD_BIN` + +case "$1" in + start) + stat_busy "Starting $DAEMON_NAME" + [ -z "$SASLAUTHD_PID" ] && $SASLAUTHD_BIN $SASLAUTHD_OPTS + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + echo `pidof -o %PPID $SASLAUTHD_BIN` > /var/run/$DAEMON_NAME.pid + fi + add_daemon $DAEMON_NAME + stat_done + ;; + + stop) + stat_busy "Stopping $DAEMON_NAME" + [ ! -z "$SASLAUTHD_PID" ] && kill $SASLAUTHD_PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm /var/run/$DAEMON_NAME.pid &> /dev/null + fi + rm_daemon $DAEMON_NAME + stat_done + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 +# vim: ts=2 sw=2 et ft=sh diff --git a/staging/cyrus-sasl/saslauthd.conf.d b/staging/cyrus-sasl/saslauthd.conf.d new file mode 100644 index 000000000..b42b5d0b0 --- /dev/null +++ b/staging/cyrus-sasl/saslauthd.conf.d @@ -0,0 +1 @@ +SASLAUTHD_OPTS="-m /var/run/saslauthd -a pam" diff --git a/staging/gtk2/PKGBUILD b/staging/gtk2/PKGBUILD new file mode 100644 index 000000000..e67d63520 --- /dev/null +++ b/staging/gtk2/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 122323 2011-05-03 20:18:27Z stephane $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgbase=gtk2 +pkgname=('gtk2' 'gtk-update-icon-cache') +pkgver=2.24.4 +pkgrel=2 +arch=('i686' 'x86_64') +url="http://www.gtk.org/" +makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'krb5' 'gnutls' + 'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2' 'gobject-introspection') +options=('!libtool' '!docs') +license=('LGPL') +source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.bz2 + xid-collision-debug.patch) +sha256sums=('7d3033ad83647079977466d3e8f1a7533f47abd5cc693f01b8797ff43dd407a5' + 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') + +build() { + cd "${srcdir}/gtk+-${pkgver}" + patch -Np1 -i "${srcdir}/xid-collision-debug.patch" + + CXX=/bin/false ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --with-xinput=yes + make +} +package_gtk2() { + pkgdesc="The GTK+ Toolkit (v2)" + install=gtk2.install + depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'krb5' 'gnutls' 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache') + backup=(etc/gtk-2.0/gtkrc) + + cd "${srcdir}/gtk+-${pkgver}" + + make DESTDIR="${pkgdir}" install + sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert + echo 'gtk-fallback-icon-theme = "gnome"' > "${pkgdir}/etc/gtk-2.0/gtkrc" + #split this out to use with gtk3 too + rm ${pkgdir}/usr/bin/gtk-update-icon-cache +} +package_gtk-update-icon-cache() { + pkgdesc="The GTK+ update icon cache tool" + depends=('gdk-pixbuf2') + + cd "${srcdir}/gtk+-${pkgver}/gtk" + + install -D -m755 gtk-update-icon-cache ${pkgdir}/usr/bin/gtk-update-icon-cache +} diff --git a/staging/gtk2/gtk2.install b/staging/gtk2/gtk2.install new file mode 100644 index 000000000..4e2b72f1b --- /dev/null +++ b/staging/gtk2/gtk2.install @@ -0,0 +1,16 @@ +post_install() { + usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +pre_remove() { + rm -f etc/gtk-2.0/gtk.immodules &>/dev/null + rm -f etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null +} diff --git a/staging/gtk2/xid-collision-debug.patch b/staging/gtk2/xid-collision-debug.patch new file mode 100644 index 000000000..d61238c3b --- /dev/null +++ b/staging/gtk2/xid-collision-debug.patch @@ -0,0 +1,15 @@ +--- gtk+-2.18.3/gdk/x11/gdkxid.c 2009-06-19 04:59:18.000000000 +0200 ++++ gtk+-2.18.3/gdk/x11/gdkxid.c.new 2009-07-22 11:30:12.000000000 +0200 +@@ -56,10 +56,10 @@ + if (!display_x11->xid_ht) + display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash, + (GEqualFunc) gdk_xid_equal); +- ++/* + if (g_hash_table_lookup (display_x11->xid_ht, xid)) + g_warning ("XID collision, trouble ahead"); +- ++*/ + g_hash_table_insert (display_x11->xid_ht, xid, data); + } + diff --git a/staging/openssh/PKGBUILD b/staging/openssh/PKGBUILD index 42443afc2..d00f114f3 100644 --- a/staging/openssh/PKGBUILD +++ b/staging/openssh/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 121075 2011-04-28 23:41:59Z stephane $ -# Maintainer: Aaron Griffin <aaron@archlinux.org> +# $Id: PKGBUILD 122205 2011-05-03 02:22:30Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=openssh -pkgver=5.8p1 +pkgver=5.8p2 pkgrel=2 pkgdesc='Free version of the SSH connectivity tools' arch=('i686' 'x86_64') @@ -15,7 +16,7 @@ source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver} 'sshd.confd' 'sshd.pam' 'sshd') -sha1sums=('adebb2faa9aba2a3a3c8b401b2b19677ab53f0de' +sha1sums=('e610270e0c5484fb291cd81bbcbefbeb5e391a62' 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' '660092c57bde28bed82078f74011f95fc51c2293' '6b7f8ebf0c1cc37137a7d9a53447ac8a0ee6a2b5') diff --git a/testing/binutils/PKGBUILD b/testing/binutils/PKGBUILD deleted file mode 100644 index 40416653c..000000000 --- a/testing/binutils/PKGBUILD +++ /dev/null @@ -1,83 +0,0 @@ -# $Id: PKGBUILD 121290 2011-04-30 08:22:29Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc - -pkgname=binutils -pkgver=2.21 -pkgrel=7 -_date=20110430 -pkgdesc="A set of programs to assemble and manipulate binary and object files" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/binutils/" -license=('GPL') -groups=('base') -depends=('glibc>=2.13' 'zlib') -makedepends=('dejagnu') -options=('!libtool' '!distcc' '!ccache') -install=binutils.install -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2) -md5sums=('7b3e28fb35cb8bb371cc47291e1c6dec') - -mksource() { - mkdir ${pkgname}-${_date} - cd ${pkgname}-${_date} - export _TAG=binutils-2_21-branch - export 'CVSROOT=:pserver:anoncvs@sourceware.org:/cvs/src' - cvs -z9 co -r $_TAG binutils || return 1 - mv src binutils - tar -cvjf ../binutils-${pkgver}_${_date}.tar.bz2 binutils/* -} - -build() { - cd ${srcdir} - mkdir binutils-build && cd binutils-build - - [[ $CARCH == "x86_64" ]] && CONFIGFLAG="--enable-64-bit-bfd --disable-multilib" - - ${srcdir}/binutils/configure --prefix=/usr \ - --enable-ld=default --enable-gold \ - --enable-plugins --enable-threads \ - --enable-shared $CONFIGFLAG - - # This checks the host environment and makes sure all the necessary tools are available to compile Binutils. - make configure-host - - make tooldir=${pkgdir}/usr -} - -check() { - cd ${srcdir}/binutils-build - - # do not abort on errors - manually check log files - make -k -j1 check || true -} - -package() { - cd ${srcdir}/binutils-build - make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install - - # Add some useful headers - install -m644 ${srcdir}/binutils/include/libiberty.h ${pkgdir}/usr/include - install -m644 ${srcdir}/binutils/include/demangle.h ${pkgdir}/usr/include - - # Rebuild libiberty.a with -fPIC - make -C libiberty clean - make CFLAGS="$CFLAGS -fPIC" -C libiberty - install -m644 libiberty/libiberty.a ${pkgdir}/usr/lib - - # Rebuild libbfd.a with -fPIC - make -C bfd clean - # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API - make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd - install -m644 bfd/libbfd.a ${pkgdir}/usr/lib - - # Remove Windows/Novell specific man pages - rm -f ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}* - - # Remove these symlinks, they are not ABI stable. - # Programs should compile static to the .a file. - rm -f ${pkgdir}/usr/lib/lib{bfd,opcodes}.so - echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" >${pkgdir}/usr/lib/libbfd.so - echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" >${pkgdir}/usr/lib/libopcodes.so -} diff --git a/testing/binutils/binutils.install b/testing/binutils/binutils.install deleted file mode 100644 index 8bf9f3a47..000000000 --- a/testing/binutils/binutils.install +++ /dev/null @@ -1,17 +0,0 @@ -infodir=usr/share/info -filelist=(as.info bfd.info binutils.info configure.info gprof.info ld.info standards.info) - -post_upgrade() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - diff --git a/testing/bluez/PKGBUILD b/testing/bluez/PKGBUILD new file mode 100644 index 000000000..f59dd51d8 --- /dev/null +++ b/testing/bluez/PKGBUILD @@ -0,0 +1,75 @@ +# $Id: PKGBUILD 122198 2011-05-02 21:32:44Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Geoffroy Carrier <geoffroy@archlinux.org> + +pkgname=bluez +pkgver=4.92 +pkgrel=2 +pkgdesc="Libraries and tools for the Bluetooth protocol stack" +url="http://www.bluez.org/" +arch=('i686' 'x86_64') +license=('GPL2') +depends=('dbus-core') +makedepends=('gstreamer0.10-base' 'libusb-compat' 'libnl' 'libsndfile') +optdepends=("gstreamer0.10-base: bluetooth GStreamer support" + "alsa-lib: Audio bluetooth devices support" + "dbus-python: to run bluez-simple-agent" + "pygobject: to run bluez-simple-agent" + "libusb-compat: USB adapters support" + "cups: CUPS backend" + "libnl: netlink plugin") +conflicts=('bluez-libs' 'bluez-utils') +provides=('bluez-libs' 'bluez-utils') +replaces=('bluez-libs' 'bluez-utils') +options=('!libtool') +backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf + 'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf') +source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2" + 'bluetooth.conf.d' + 'rc.bluetooth') +md5sums=('33bb9a75239889c5ee5fbc666ad41c5c' + '8f60a5eb9d84b9c64c478d63e1c24b10' + 'ca4c39eb4bb201bd2eacad01492cd735') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/lib \ + --enable-gstreamer \ + --enable-alsa \ + --enable-usb \ + --enable-tools \ + --enable-bccmd \ + --enable-dfutool \ + --enable-hidd \ + --enable-pand \ + --enable-dund \ + --enable-cups \ + --disable-udevrules \ + --enable-configfiles + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + + install -Dm755 ${srcdir}/rc.bluetooth ${pkgdir}/etc/rc.d/bluetooth + + install -d ${pkgdir}/etc/bluetooth + install -m644 network/network.conf \ + input/input.conf \ + audio/audio.conf \ + serial/serial.conf \ + ${pkgdir}/etc/bluetooth/ + + install -Dm644 ${srcdir}/bluetooth.conf.d \ + ${pkgdir}/etc/conf.d/bluetooth + + install -Dm755 test/simple-agent ${pkgdir}/usr/bin/bluez-simple-agent + sed -i 's#/usr/bin/python#/usr/bin/python2#' \ + ${pkgdir}/usr/bin/bluez-simple-agent +} diff --git a/testing/bluez/bluetooth.conf.d b/testing/bluez/bluetooth.conf.d new file mode 100644 index 000000000..6648740eb --- /dev/null +++ b/testing/bluez/bluetooth.conf.d @@ -0,0 +1,30 @@ +# Bluetooth configuraton file + +# Bluetooth services (allowed values are "true" and "false") + +# Run the bluetoothd daemon (default: true) +#DAEMON_ENABLE="false" + +# Run the sdp daemon (default: false) +# If this is disabled, hcid's internal sdp daemon will be used +#SDPD_ENABLE="true" + +# Run the bluetooth HID daemon (default: false) +#HIDD_ENABLE="true" + +# Activate rfcomm ports (default: false) +#RFCOMM_ENABLE="true" + +# Run bluetooth dial-up networking daemon (default: false) +#DUND_ENABLE="true" + +# Run bluetooth PAN daemon (default: false) +#PAND_ENABLE="true" + +# rfcomm configuration file (default: /etc/bluetooth/rfcomm.conf) +#RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" + +# Options for hidd, dund and pand (default: none) +#HIDD_OPTIONS="" +#DUND_OPTIONS="" +#PAND_OPTIONS="" diff --git a/testing/bluez/rc.bluetooth b/testing/bluez/rc.bluetooth new file mode 100644 index 000000000..096242011 --- /dev/null +++ b/testing/bluez/rc.bluetooth @@ -0,0 +1,100 @@ +#!/bin/bash +# +# Start/stop the Bluetooth daemons +# + +. /etc/rc.conf +. /etc/rc.d/functions + +DAEMON_NAME="bluetoothd" +HIDD_NAME="hidd" +RFCOMM_NAME="rfcomm" +PAND_NAME="pand" +DUND_NAME="dund" + +DAEMON_EXEC="/usr/sbin/bluetoothd" +HIDD_EXEC="/usr/bin/hidd" +RFCOMM_EXEC="/usr/bin/rfcomm" +PAND_EXEC="/usr/bin/pand" +DUND_EXEC="/usr/bin/dund" + +DAEMON_ENABLE="true" +HIDD_ENABLE="false" +RFCOMM_ENABLE="false" +DUND_ENABLE="false" +PAND_ENABLE="false" + +RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" + +HIDD_OPTIONS="" +DUND_OPTIONS="" +PAND_OPTIONS="" + +[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth + +case "$1" in + start) + stat_busy "Starting bluetooth subsystem:" + if [ "$DAEMON_ENABLE" = "true" -a -x "$DAEMON_EXEC" ] ; then + stat_append " $DAEMON_NAME" + $DAEMON_EXEC + sleep 1 + fi + if [ "$SDPD_ENABLE" = "true" -a -x "$SDPD_EXEC" ] ; then + stat_append " $SDPD_NAME" + $SDPD_EXEC + fi + if [ "$HIDD_ENABLE" = "true" -a -x "$HIDD_EXEC" ]; then + stat_append " $HIDD_NAME" + $HIDD_EXEC $HIDD_OPTIONS --server + fi + if [ "$RFCOMM_ENABLE" = "true" -a -x "$RFCOMM_EXEC" -a -f "$RFCOMM_CONFIG" ]; then + stat_append " $RFCOMM_NAME" + $RFCOMM_EXEC -f $RFCOMM_CONFIG bind all + fi + if [ "$DUND_ENABLE" = "true" -a -x "$DUND_EXEC" -a -n "$DUND_OPTIONS" ]; then + stat_append " $DUND_NAME" + $DUND_EXEC $DUND_OPTIONS + fi + if [ "$PAND_ENABLE" = "true" -a -x "$PAND_EXEC" -a -n "$PAND_OPTIONS" ]; then + stat_append " $PAND_NAME" + $PAND_EXEC $PAND_OPTIONS + fi + add_daemon bluetooth + stat_done + ;; + stop) + stat_busy "Stopping bluetooth subsystem:" + + stat_append " $PAND_NAME" + killall $PAND_NAME >/dev/null 2>&1 + + stat_append " $DUND_NAME" + killall $DUND_NAME >/dev/null 2>&1 + + if [ -x "$RFCOMM_EXEC" ]; then + stat_append " $RFCOMM_NAME" + $RFCOMM_EXEC release all >/dev/null 2>&1 + fi + + stat_append " $HIDD_NAME" + killall $HIDD_NAME >/dev/null 2>&1 + + stat_append " $SDPD_NAME" + killall $SDPD_NAME >/dev/null 2>&1 + + stat_append " $DAEMON_NAME" + killall $DAEMON_NAME >/dev/null 2>&1 + + rm_daemon bluetooth + stat_done + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/coreutils/PKGBUILD b/testing/coreutils/PKGBUILD deleted file mode 100644 index e63b4f02f..000000000 --- a/testing/coreutils/PKGBUILD +++ /dev/null @@ -1,69 +0,0 @@ -# $Id: PKGBUILD 120920 2011-04-27 11:05:23Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=coreutils -pkgver=8.12 -pkgrel=1 -pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system" -arch=('i686' 'x86_64') -license=('GPL3') -url="http://www.gnu.org/software/coreutils" -groups=('base') -depends=('glibc' 'shadow' 'pam' 'acl' 'gmp' 'libcap') -replaces=('mktemp') -backup=('etc/pam.d/su') -install=${pkgname}.install -options=('!emptydirs') -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz - coreutils-uname.patch - coreutils-pam.patch - su.pam) -md5sums=('0f7d43c2d2e24314b43a6c6267e25b90' - 'c4fcca138b6abf6d443d48a6f0cd8833' - 'aad79a2aa6d566c375d7bdd1b0767278' - 'fa85e5cce5d723275b14365ba71a8aad') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - # added su wheel group pam patch (from fedora git) - patch -Np1 -i ${srcdir}/coreutils-pam.patch - - # linux specific uname improvement (from gentoo portage) - patch -Np1 -i ${srcdir}/coreutils-uname.patch - - autoreconf -v - ./configure --prefix=/usr \ - --enable-install-program=su \ - --enable-no-install-program=groups,hostname,kill,uptime \ - --enable-pam - make -} - -check() { - cd ${srcdir}/${pkgname}-${pkgver} - make RUN_EXPENSIVE_TESTS=yes check -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - - cd ${pkgdir}/usr/bin - install -dm755 ${pkgdir}/{bin,usr/sbin} - - # binaries required by FHS - _fhs="cat chgrp chmod chown cp date dd df echo false ln ls \ - mkdir mknod mv pwd rm rmdir stty su sync true uname" - mv ${_fhs} ${pkgdir}/bin - - # binaries required by various Arch scripts - _bin="cut dir dircolors du install mkfifo readlink shred \ - sleep touch tr vdir" - mv ${_bin} ${pkgdir}/bin - ln -sf /bin/sleep ${pkgdir}/usr/bin/sleep - - mv chroot ${pkgdir}/usr/sbin - install -Dm644 ${srcdir}/su.pam ${pkgdir}/etc/pam.d/su -} diff --git a/testing/coreutils/coreutils-pam.patch b/testing/coreutils/coreutils-pam.patch deleted file mode 100644 index e61908f3f..000000000 --- a/testing/coreutils/coreutils-pam.patch +++ /dev/null @@ -1,428 +0,0 @@ -diff -urNp coreutils-8.4-orig/configure.ac coreutils-8.4/configure.ac ---- coreutils-8.4-orig/configure.ac 2010-01-11 18:20:42.000000000 +0100 -+++ coreutils-8.4/configure.ac 2010-02-12 10:17:46.000000000 +0100 -@@ -126,6 +126,13 @@ if test "$gl_gcc_warnings" = yes; then - AC_SUBST([GNULIB_WARN_CFLAGS]) - fi - -+dnl Give the chance to enable PAM -+AC_ARG_ENABLE(pam, dnl -+[ --enable-pam Enable use of the PAM libraries], -+[AC_DEFINE(USE_PAM, 1, [Define if you want to use PAM]) -+LIB_PAM="-ldl -lpam -lpam_misc" -+AC_SUBST(LIB_PAM)]) -+ - AC_FUNC_FORK - - optional_bin_progs= -diff -urNp coreutils-8.4-orig/doc/coreutils.texi coreutils-8.4/doc/coreutils.texi ---- coreutils-8.4-orig/doc/coreutils.texi 2010-01-03 18:06:20.000000000 +0100 -+++ coreutils-8.4/doc/coreutils.texi 2010-02-12 10:17:46.000000000 +0100 -@@ -15081,8 +15081,11 @@ to certain shells, etc.). - @findex syslog - @command{su} can optionally be compiled to use @code{syslog} to report - failed, and optionally successful, @command{su} attempts. (If the system --supports @code{syslog}.) However, GNU @command{su} does not check if the --user is a member of the @code{wheel} group; see below. -+supports @code{syslog}.) -+ -+This version of @command{su} has support for using PAM for -+authentication. You can edit @file{/etc/pam.d/su} to customize its -+behaviour. - - The program accepts the following options. Also see @ref{Common options}. - -@@ -15124,6 +15127,8 @@ environment variables except @env{TERM}, - @env{PATH} to a compiled-in default value. Change to @var{user}'s home - directory. Prepend @samp{-} to the shell's name, intended to make it - read its login startup file(s). -+Additionaly @env{DISPLAY} and @env{XAUTHORITY} environment variables -+are preserved as well for PAM functionality. - - @item -m - @itemx -p -@@ -15163,33 +15168,6 @@ Exit status: - the exit status of the subshell otherwise - @end display - --@cindex wheel group, not supported --@cindex group wheel, not supported --@cindex fascism --@subsection Why GNU @command{su} does not support the @samp{wheel} group -- --(This section is by Richard Stallman.) -- --@cindex Twenex --@cindex MIT AI lab --Sometimes a few of the users try to hold total power over all the --rest. For example, in 1984, a few users at the MIT AI lab decided to --seize power by changing the operator password on the Twenex system and --keeping it secret from everyone else. (I was able to thwart this coup --and give power back to the users by patching the kernel, but I --wouldn't know how to do that in Unix.) -- --However, occasionally the rulers do tell someone. Under the usual --@command{su} mechanism, once someone learns the root password who --sympathizes with the ordinary users, he or she can tell the rest. The --``wheel group'' feature would make this impossible, and thus cement the --power of the rulers. -- --I'm on the side of the masses, not that of the rulers. If you are --used to supporting the bosses and sysadmins in whatever they do, you --might find this idea strange at first. -- -- - @node timeout invocation - @section @command{timeout}: Run a command with a time limit - -diff -urNp coreutils-8.4-orig/src/Makefile.am coreutils-8.4/src/Makefile.am ---- coreutils-8.4-orig/src/Makefile.am 2010-01-03 18:06:20.000000000 +0100 -+++ coreutils-8.4/src/Makefile.am 2010-02-12 10:17:46.000000000 +0100 -@@ -361,7 +361,7 @@ factor_LDADD += $(LIB_GMP) - uptime_LDADD += $(GETLOADAVG_LIBS) - - # for crypt --su_LDADD += $(LIB_CRYPT) -+su_LDADD += $(LIB_CRYPT) @LIB_PAM@ - - # for various ACL functions - copy_LDADD += $(LIB_ACL) -diff -urNp coreutils-8.4-orig/src/su.c coreutils-8.4/src/su.c ---- coreutils-8.4-orig/src/su.c 2010-02-12 10:15:15.000000000 +0100 -+++ coreutils-8.4/src/su.c 2010-02-12 10:24:29.000000000 +0100 -@@ -37,6 +37,16 @@ - restricts who can su to UID 0 accounts. RMS considers that to - be fascist. - -+#ifdef USE_PAM -+ -+ Actually, with PAM, su has nothing to do with whether or not a -+ wheel group is enforced by su. RMS tries to restrict your access -+ to a su which implements the wheel group, but PAM considers that -+ to be fascist, and gives the user/sysadmin the opportunity to -+ enforce a wheel group by proper editing of /etc/pam.conf -+ -+#endif -+ - Compile-time options: - -DSYSLOG_SUCCESS Log successful su's (by default, to root) with syslog. - -DSYSLOG_FAILURE Log failed su's (by default, to root) with syslog. -@@ -53,6 +63,15 @@ - #include <pwd.h> - #include <grp.h> - -+#ifdef USE_PAM -+# include <signal.h> -+# include <sys/wait.h> -+# include <sys/fsuid.h> -+# include <unistd.h> -+# include <security/pam_appl.h> -+# include <security/pam_misc.h> -+#endif /* USE_PAM */ -+ - #include "system.h" - #include "getpass.h" - -@@ -120,10 +139,17 @@ - /* The user to become if none is specified. */ - #define DEFAULT_USER "root" - -+#ifndef USE_PAM - char *crypt (char const *key, char const *salt); -+#endif - --static void run_shell (char const *, char const *, char **, size_t) -+static void run_shell (char const *, char const *, char **, size_t, -+ const struct passwd *) -+#ifdef USE_PAM -+ ; -+#else - ATTRIBUTE_NORETURN; -+#endif - - /* If true, pass the `-f' option to the subshell. */ - static bool fast_startup; -@@ -209,7 +235,26 @@ log_su (struct passwd const *pw, bool su - } - #endif - -+#ifdef USE_PAM -+static pam_handle_t *pamh = NULL; -+static int retval; -+static struct pam_conv conv = { -+ misc_conv, -+ NULL -+}; -+ -+#define PAM_BAIL_P if (retval) { \ -+ pam_end(pamh, PAM_SUCCESS); \ -+ return 0; \ -+} -+#define PAM_BAIL_P_VOID if (retval) { \ -+ pam_end(pamh, PAM_SUCCESS); \ -+return; \ -+} -+#endif -+ - /* Ask the user for a password. -+ If PAM is in use, let PAM ask for the password if necessary. - Return true if the user gives the correct password for entry PW, - false if not. Return true without asking for a password if run by UID 0 - or if PW has an empty password. */ -@@ -217,6 +262,44 @@ log_su (struct passwd const *pw, bool su - static bool - correct_password (const struct passwd *pw) - { -+#ifdef USE_PAM -+ struct passwd *caller; -+ char *tty_name, *ttyn; -+ retval = pam_start(PROGRAM_NAME, pw->pw_name, &conv, &pamh); -+ PAM_BAIL_P; -+ -+ if (getuid() != 0 && !isatty(0)) { -+ fprintf(stderr, "standard in must be a tty\n"); -+ exit(1); -+ } -+ -+ caller = getpwuid(getuid()); -+ if(caller != NULL && caller->pw_name != NULL) { -+ retval = pam_set_item(pamh, PAM_RUSER, caller->pw_name); -+ PAM_BAIL_P; -+ } -+ -+ ttyn = ttyname(0); -+ if (ttyn) { -+ if (strncmp(ttyn, "/dev/", 5) == 0) -+ tty_name = ttyn+5; -+ else -+ tty_name = ttyn; -+ retval = pam_set_item(pamh, PAM_TTY, tty_name); -+ PAM_BAIL_P; -+ } -+ retval = pam_authenticate(pamh, 0); -+ PAM_BAIL_P; -+ retval = pam_acct_mgmt(pamh, 0); -+ if (retval == PAM_NEW_AUTHTOK_REQD) { -+ /* password has expired. Offer option to change it. */ -+ retval = pam_chauthtok(pamh, PAM_CHANGE_EXPIRED_AUTHTOK); -+ PAM_BAIL_P; -+ } -+ PAM_BAIL_P; -+ /* must be authenticated if this point was reached */ -+ return 1; -+#else /* !USE_PAM */ - char *unencrypted, *encrypted, *correct; - #if HAVE_GETSPNAM && HAVE_STRUCT_SPWD_SP_PWDP - /* Shadow passwd stuff for SVR3 and maybe other systems. */ -@@ -241,6 +324,7 @@ correct_password (const struct passwd *p - encrypted = crypt (unencrypted, correct); - memset (unencrypted, 0, strlen (unencrypted)); - return STREQ (encrypted, correct); -+#endif /* !USE_PAM */ - } - - /* Update `environ' for the new shell based on PW, with SHELL being -@@ -254,12 +338,18 @@ modify_environment (const struct passwd - /* Leave TERM unchanged. Set HOME, SHELL, USER, LOGNAME, PATH. - Unset all other environment variables. */ - char const *term = getenv ("TERM"); -+ char const *display = getenv ("DISPLAY"); -+ char const *xauthority = getenv ("XAUTHORITY"); - if (term) - term = xstrdup (term); - environ = xmalloc ((6 + !!term) * sizeof (char *)); - environ[0] = NULL; - if (term) - xsetenv ("TERM", term); -+ if (display) -+ xsetenv ("DISPLAY", display); -+ if (xauthority) -+ xsetenv ("XAUTHORITY", xauthority); - xsetenv ("HOME", pw->pw_dir); - xsetenv ("SHELL", shell); - xsetenv ("USER", pw->pw_name); -@@ -292,8 +382,13 @@ change_identity (const struct passwd *pw - { - #ifdef HAVE_INITGROUPS - errno = 0; -- if (initgroups (pw->pw_name, pw->pw_gid) == -1) -+ if (initgroups (pw->pw_name, pw->pw_gid) == -1) { -+#ifdef USE_PAM -+ pam_close_session(pamh, 0); -+ pam_end(pamh, PAM_ABORT); -+#endif - error (EXIT_CANCELED, errno, _("cannot set groups")); -+ } - endgrent (); - #endif - if (setgid (pw->pw_gid)) -@@ -302,6 +397,31 @@ change_identity (const struct passwd *pw - error (EXIT_CANCELED, errno, _("cannot set user id")); - } - -+#ifdef USE_PAM -+static int caught=0; -+/* Signal handler for parent process later */ -+static void su_catch_sig(int sig) -+{ -+ ++caught; -+} -+ -+int -+pam_copyenv (pam_handle_t *pamh) -+{ -+ char **env; -+ -+ env = pam_getenvlist(pamh); -+ if(env) { -+ while(*env) { -+ if (putenv (*env)) -+ xalloc_die (); -+ env++; -+ } -+ } -+ return(0); -+} -+#endif -+ - /* Run SHELL, or DEFAULT_SHELL if SHELL is empty. - If COMMAND is nonzero, pass it to the shell with the -c option. - Pass ADDITIONAL_ARGS to the shell as more arguments; there -@@ -309,17 +429,49 @@ change_identity (const struct passwd *pw - - static void - run_shell (char const *shell, char const *command, char **additional_args, -- size_t n_additional_args) -+ size_t n_additional_args, const struct passwd *pw) - { - size_t n_args = 1 + fast_startup + 2 * !!command + n_additional_args + 1; - char const **args = xnmalloc (n_args, sizeof *args); - size_t argno = 1; -+#ifdef USE_PAM -+ int child; -+ sigset_t ourset; -+ int status; -+ -+ retval = pam_open_session(pamh,0); -+ if (retval != PAM_SUCCESS) { -+ fprintf (stderr, "could not open session\n"); -+ exit (1); -+ } -+ -+/* do this at the last possible moment, because environment variables may -+ be passed even in the session phase -+*/ -+ if(pam_copyenv(pamh) != PAM_SUCCESS) -+ fprintf (stderr, "error copying PAM environment\n"); -+ -+ /* Credentials should be set in the parent */ -+ if (pam_setcred(pamh, PAM_ESTABLISH_CRED) != PAM_SUCCESS) { -+ pam_close_session(pamh, 0); -+ fprintf(stderr, "could not set PAM credentials\n"); -+ exit(1); -+ } -+ -+ child = fork(); -+ if (child == 0) { /* child shell */ -+ change_identity (pw); -+ pam_end(pamh, 0); -+#endif - - if (simulate_login) - { - char *arg0; - char *shell_basename; - -+ if(chdir(pw->pw_dir)) -+ error(0, errno, _("warning: cannot change directory to %s"), pw->pw_dir); -+ - shell_basename = last_component (shell); - arg0 = xmalloc (strlen (shell_basename) + 2); - arg0[0] = '-'; -@@ -344,6 +496,67 @@ run_shell (char const *shell, char const - error (0, errno, "%s", shell); - exit (exit_status); - } -+#ifdef USE_PAM -+ } else if (child == -1) { -+ fprintf(stderr, "can not fork user shell: %s", strerror(errno)); -+ pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT); -+ pam_close_session(pamh, 0); -+ pam_end(pamh, PAM_ABORT); -+ exit(1); -+ } -+ /* parent only */ -+ sigfillset(&ourset); -+ if (sigprocmask(SIG_BLOCK, &ourset, NULL)) { -+ fprintf(stderr, "%s: signal malfunction\n", PROGRAM_NAME); -+ caught = 1; -+ } -+ if (!caught) { -+ struct sigaction action; -+ action.sa_handler = su_catch_sig; -+ sigemptyset(&action.sa_mask); -+ action.sa_flags = 0; -+ sigemptyset(&ourset); -+ if (sigaddset(&ourset, SIGTERM) -+ || sigaddset(&ourset, SIGALRM) -+ || sigaction(SIGTERM, &action, NULL) -+ || sigprocmask(SIG_UNBLOCK, &ourset, NULL)) { -+ fprintf(stderr, "%s: signal masking malfunction\n", PROGRAM_NAME); -+ caught = 1; -+ } -+ } -+ if (!caught) { -+ do { -+ int pid; -+ -+ pid = waitpid(-1, &status, WUNTRACED); -+ -+ if (((pid_t)-1 != pid) && (0 != WIFSTOPPED (status))) { -+ kill(getpid(), WSTOPSIG(status)); -+ /* once we get here, we must have resumed */ -+ kill(pid, SIGCONT); -+ } -+ } while (0 != WIFSTOPPED(status)); -+ } -+ -+ if (caught) { -+ fprintf(stderr, "\nSession terminated, killing shell..."); -+ kill (child, SIGTERM); -+ } -+ /* Not checking retval on this because we need to call close session */ -+ pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT); -+ retval = pam_close_session(pamh, 0); -+ PAM_BAIL_P_VOID; -+ retval = pam_end(pamh, PAM_SUCCESS); -+ PAM_BAIL_P_VOID; -+ if (caught) { -+ sleep(2); -+ kill(child, SIGKILL); -+ fprintf(stderr, " ...killed.\n"); -+ exit(-1); -+ } -+ exit ((0 != WIFEXITED (status)) ? WEXITSTATUS (status) -+ : WTERMSIG (status) + 128); -+#endif /* USE_PAM */ - } - - /* Return true if SHELL is a restricted shell (one not returned by -@@ -511,9 +724,9 @@ main (int argc, char **argv) - shell = xstrdup (shell ? shell : pw->pw_shell); - modify_environment (pw, shell); - -+#ifndef USE_PAM - change_identity (pw); -- if (simulate_login && chdir (pw->pw_dir) != 0) -- error (0, errno, _("warning: cannot change directory to %s"), pw->pw_dir); -+#endif - - /* error() flushes stderr, but does not check for write failure. - Normally, we would catch this via our atexit() hook of -@@ -523,5 +736,5 @@ main (int argc, char **argv) - if (ferror (stderr)) - exit (EXIT_CANCELED); - -- run_shell (shell, command, argv + optind, MAX (0, argc - optind)); -+ run_shell (shell, command, argv + optind, MAX (0, argc - optind), pw); - } diff --git a/testing/coreutils/coreutils-uname.patch b/testing/coreutils/coreutils-uname.patch deleted file mode 100644 index b458abeba..000000000 --- a/testing/coreutils/coreutils-uname.patch +++ /dev/null @@ -1,173 +0,0 @@ -On linux platforms, grok /proc/cpuinfo for the CPU/vendor info. - -Prob not suitable for upstream seeing as how it's 100% linux-specific -http://lists.gnu.org/archive/html/bug-coreutils/2005-09/msg00063.html - -Patch originally by Carlos E. Gorges <carlos@techlinux.com.br>, but -heavily reworked to suck less. - -To add support for additional platforms, check out the show_cpuinfo() -func in the linux/arch/<ARCH>/ source tree of the kernel. - ---- coreutils/src/uname.c -+++ coreutils/src/uname.c -@@ -50,6 +50,11 @@ - # include <mach-o/arch.h> - #endif - -+#if defined(__linux__) -+# define USE_PROCINFO -+# define UNAME_HARDWARE_PLATFORM -+#endif -+ - #include "system.h" - #include "error.h" - #include "quote.h" -@@ -138,6 +143,117 @@ - exit (status); - } - -+#if defined(USE_PROCINFO) -+ -+# if defined(__s390__) || defined(__s390x__) -+# define CPUINFO_FILE "/proc/sysinfo" -+# define CPUINFO_FORMAT "%64[^\t :]%*[ :]%256[^\n]%c" -+# else -+# define CPUINFO_FILE "/proc/cpuinfo" -+# define CPUINFO_FORMAT "%64[^\t:]\t:%256[^\n]%c" -+# endif -+ -+# define PROCINFO_PROCESSOR 0 -+# define PROCINFO_HARDWARE_PLATFORM 1 -+ -+static void __eat_cpuinfo_space(char *buf) -+{ -+ /* first eat trailing space */ -+ char *tmp = buf + strlen(buf) - 1; -+ while (tmp > buf && isspace(*tmp)) -+ *tmp-- = '\0'; -+ /* then eat leading space */ -+ tmp = buf; -+ while (*tmp && isspace(*tmp)) -+ tmp++; -+ if (tmp != buf) -+ memmove(buf, tmp, strlen(tmp)+1); -+ /* finally collapse whitespace */ -+ tmp = buf; -+ while (tmp[0] && tmp[1]) { -+ if (isspace(tmp[0]) && isspace(tmp[1])) { -+ memmove(tmp, tmp+1, strlen(tmp)); -+ continue; -+ } -+ ++tmp; -+ } -+} -+ -+static int __linux_procinfo(int x, char *fstr, size_t s) -+{ -+ FILE *fp; -+ -+ char *procinfo_keys[] = { -+ /* --processor --hardware-platform */ -+ #if defined(__alpha__) -+ "cpu model", "system type" -+ #elif defined(__arm__) -+ "Processor", "Hardware" -+ #elif defined(__avr32__) -+ "processor", "cpu family" -+ #elif defined(__bfin__) -+ "CPU", "BOARD Name" -+ #elif defined(__cris__) -+ "cpu", "cpu model" -+ #elif defined(__frv__) -+ "CPU-Core", "System" -+ #elif defined(__i386__) || defined(__x86_64__) -+ "model name", "vendor_id" -+ #elif defined(__ia64__) -+ "family", "vendor" -+ #elif defined(__hppa__) -+ "cpu", "model" -+ #elif defined(__m68k__) -+ "CPU", "MMU" -+ #elif defined(__mips__) -+ "cpu model", "system type" -+ #elif defined(__powerpc__) || defined(__powerpc64__) -+ "cpu", "machine" -+ #elif defined(__s390__) || defined(__s390x__) -+ "Type", "Manufacturer" -+ #elif defined(__sh__) -+ "cpu type", "machine" -+ #elif defined(sparc) || defined(__sparc__) -+ "type", "cpu" -+ #elif defined(__vax__) -+ "cpu type", "cpu" -+ #else -+ "unknown", "unknown" -+ #endif -+ }; -+ -+ if ((fp = fopen(CPUINFO_FILE, "r")) != NULL) { -+ char key[65], value[257], eol, *ret = NULL; -+ -+ while (fscanf(fp, CPUINFO_FORMAT, key, value, &eol) != EOF) { -+ __eat_cpuinfo_space(key); -+ if (!strcmp(key, procinfo_keys[x])) { -+ __eat_cpuinfo_space(value); -+ ret = value; -+ break; -+ } -+ if (eol != '\n') { -+ /* we need two fscanf's here in case the previous -+ * length limit caused us to read right up to the -+ * newline ... doing "%*[^\n]\n" wont eat the newline -+ */ -+ fscanf(fp, "%*[^\n]"); -+ fscanf(fp, "\n"); -+ } -+ } -+ fclose(fp); -+ -+ if (ret) { -+ strncpy(fstr, ret, s); -+ return 0; -+ } -+ } -+ -+ return -1; -+} -+ -+#endif -+ - /* Print ELEMENT, preceded by a space if something has already been - printed. */ - -@@ -250,10 +344,14 @@ main (int argc, char **argv) - if (toprint & PRINT_PROCESSOR) - { - char const *element = unknown; --#if HAVE_SYSINFO && defined SI_ARCHITECTURE -+#if ( HAVE_SYSINFO && defined SI_ARCHITECTURE ) || defined(USE_PROCINFO) - { - static char processor[257]; -+#if defined(USE_PROCINFO) -+ if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor)) -+#else - if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor)) -+#endif - element = processor; - } - #endif -@@ -306,9 +404,13 @@ main (int argc, char **argv) - if (element == unknown) - { - static char hardware_platform[257]; -+#if defined(USE_PROCINFO) -+ if (0 <= __linux_procinfo (PROCINFO_HARDWARE_PLATFORM, hardware_platform, sizeof hardware_platform)) -+#else - size_t s = sizeof hardware_platform; - static int mib[] = { CTL_HW, UNAME_HARDWARE_PLATFORM }; - if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0) -+#endif - element = hardware_platform; - } - #endif diff --git a/testing/coreutils/coreutils.install b/testing/coreutils/coreutils.install deleted file mode 100644 index 8caae6686..000000000 --- a/testing/coreutils/coreutils.install +++ /dev/null @@ -1,21 +0,0 @@ -infodir=usr/share/info -filelist=(coreutils.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - usr/bin/install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - usr/bin/install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - diff --git a/testing/coreutils/su.pam b/testing/coreutils/su.pam deleted file mode 100644 index cf15f40f1..000000000 --- a/testing/coreutils/su.pam +++ /dev/null @@ -1,9 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -# Uncomment the following line to implicitly trust users in the "wheel" group. -#auth sufficient pam_wheel.so trust use_uid -# Uncomment the following line to require a user to be in the "wheel" group. -#auth required pam_wheel.so use_uid -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so diff --git a/testing/dcron/PKGBUILD b/testing/dcron/PKGBUILD index 76af827e8..5583d9267 100644 --- a/testing/dcron/PKGBUILD +++ b/testing/dcron/PKGBUILD @@ -2,7 +2,7 @@ pkgname=dcron pkgver=4.5 -pkgrel=1 +pkgrel=2 pkgdesc="dillon's lightweight cron daemon" arch=('i686' 'x86_64') license=('GPL') @@ -38,5 +38,7 @@ package() { install -D -m0600 extra/root.crontab "$pkgdir/var/spool/cron/root" install -D -m755 extra/crond.rc "$pkgdir/etc/rc.d/crond" install -D -m0644 extra/crond.conf "$pkgdir/etc/conf.d/crond" - install -D -m644 extra/crond.logrotate "$pkgdir/etc/logrotate.d/crond" + install -D -m644 extra/crontab.vim "$pkgdir/usr/share/vim/vimfiles/ftplugin/crontab.vim" + sed -i -e 's=/var/spool/cron/cronstamps=/var/spool/cronstamps=' extra/prune-cronstamps + install -D -m755 extra/prune-cronstamps "$pkgdir/etc/cron.d/prune-cronstamps" } diff --git a/testing/gcc/PKGBUILD b/testing/gcc/PKGBUILD deleted file mode 100644 index 939c84053..000000000 --- a/testing/gcc/PKGBUILD +++ /dev/null @@ -1,255 +0,0 @@ -# $Id: PKGBUILD 121304 2011-04-30 13:23:58Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc -# NOTE: libtool requires rebuilt with each new gcc version - -pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go') -pkgver=4.6.0 -pkgrel=4 -_snapshot=4.6-20110429 -_libstdcppmanver=20110201 # Note: check source directory name when updating this -pkgdesc="The GNU Compiler Collection" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL' 'custom') -url="http://gcc.gnu.org" -makedepends=('binutils>=2.21' 'libmpc' 'cloog' 'ppl' 'gcc-ada' 'dejagnu') -options=('!libtool' '!emptydirs') -source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran,objc,ada,go,testsuite}-${pkgver}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-{core,g++,fortran,objc,ada,go,testsuite}-${_snapshot}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 - gcc_pure64.patch - gcc-hash-style-both.patch) -md5sums=('fa586a5634ae3b462c5fb2d55160b14f' - '2591b1fad977f7bd6136c9ac1298ef04' - '366f93c1867f35c8860b42965efde955' - '21779792ef7e0ed7abef611160b0099c' - 'cf518c56b968925a2eca3aa2b4cdbd7b' - 'f66ef8597b99961eda7573df505ea354' - '3d89dd233ceb6a837d14ee6b940a43ed' - '1e9fd2eaf0ee47ea64e82c48998f1999' - '4030ee1c08dd1e843c0225b772360e76' - '4df25b623799b148a0703eaeec8fdf3f') - -if [ -n "${_snapshot}" ]; then - _basedir="${srcdir}/gcc-${_snapshot}" -else - _basedir="${srcdir}/gcc-${pkgver}" -fi - -build() { - cd ${_basedir} - - # 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 -Np1 -i ${srcdir}/gcc_pure64.patch - fi - patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch - - echo ${pkgver} > gcc/BASE-VER - - cd ${srcdir} - mkdir gcc-build && cd gcc-build - - ${_basedir}/configure --prefix=/usr \ - --libdir=/usr/lib --libexecdir=/usr/lib \ - --mandir=/usr/share/man --infodir=/usr/share/info \ - --with-bugurl=https://bugs.archlinux.org/ \ - --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \ - --enable-shared --enable-threads=posix \ - --with-system-zlib --enable-__cxa_atexit \ - --disable-libunwind-exceptions --enable-clocale=gnu \ - --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-libstdcxx-pch \ - --enable-checking=release - make -} - -check() { - cd gcc-build - - # 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 -k check || true - ${_basedir}/contrib/test_summary -} - -package_gcc-libs() -{ - pkgdesc="Runtime libraries shipped by GCC" - groups=('base') - depends=('glibc>=2.11.1-2') - install=gcc-libs.install - - cd gcc-build - make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared - for lib in libmudflap libgomp libssp libstdc++-v3/src; do - make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES - done - make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install - make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info - - make -j1 DESTDIR=${pkgdir} install-target-libquadmath - make -j1 DESTDIR=${pkgdir} install-target-libgfortran - make -j1 DESTDIR=${pkgdir} install-target-libobjc - - # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc} - rm -rf ${pkgdir}/usr/lib/{gcc/,libgfortran.spec} - - # remove static libraries - find ${pkgdir} -name *.a -delete - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc() -{ - pkgdesc="The GNU Compiler Collection - C and C++ frontends" - depends=('binutils>=2.20.1' 'libmpc>=0.8.1-2' 'cloog' 'ppl') - groups=('base-devel') - install=gcc.install - - cd gcc-build - - # unfortunately it is much, much easier to install the lot and clean-up the mess... - make -j1 DESTDIR=${pkgdir} install - rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*} - rm $pkgdir/usr/lib/*.so* - rm $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},objc,quadmath}.a - rm $pkgdir/usr/lib/libgfortran.spec - rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,libgfortranbegin.a} - rm -r $pkgdir/usr/lib/go - rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info - rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo - rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1 - rm $pkgdir/usr/share/man/man3/ffi* - - # many packages require these symlinks - install -dm755 ${pkgdir}/lib - ln -sf /usr/bin/cpp ${pkgdir}/lib/cpp - ln -sf gcc ${pkgdir}/usr/bin/cc - ln -sf g++ ${pkgdir}/usr/bin/c++ - - # POSIX conformance launcher scripts for c89 and c99 - cat > $pkgdir/usr/bin/c89 <<"EOF" -#!/bin/sh -fl="-std=c89" -for opt; do - case "$opt" in - -ansi|-std=c89|-std=iso9899:1990) fl="";; - -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2 - exit 1;; - esac -done -exec gcc $fl ${1+"$@"} -EOF - - cat > $pkgdir/usr/bin/c99 <<"EOF" -#!/bin/sh -fl="-std=c99" -for opt; do - case "$opt" in - -std=c99|-std=iso9899:1999) fl="";; - -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2 - exit 1;; - esac -done -exec gcc $fl ${1+"$@"} -EOF - - chmod 755 $pkgdir/usr/bin/c{8,9}9 - - # install the libstdc++ man pages - install -dm755 ${pkgdir}/usr/share/man/man3 - install -m644 ${srcdir}/man/man3/* ${pkgdir}/usr/share/man/man3/ - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-fortran() -{ - pkgdesc="Fortran front-end for GCC" - depends=("gcc=$pkgver-$pkgrel") - install=gcc-fortran.install - - cd gcc-build - make -j1 DESTDIR=${pkgdir} install-target-libquadmath - make -j1 DESTDIR=$pkgdir install-target-libgfortran - make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS - make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info} - install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951 - - # remove libraries included in gcc-libs - rm ${pkgdir}/usr/lib/lib{gfortran,quadmath}.so* - rm ${pkgdir}/usr/share/info/libquadmath.info - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-fortran/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-objc() -{ - pkgdesc="Objective-C front-end for GCC" - depends=("gcc=$pkgver-$pkgrel") - - cd gcc-build - make -j1 DESTDIR=$pkgdir install-target-libobjc - install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ - install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ - - # remove libraries included in gcc-libs - rm ${pkgdir}/usr/lib/libobjc.so* - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-objc/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-ada() -{ - pkgdesc="Ada front-end for GCC (GNAT)" - depends=("gcc=$pkgver-$pkgrel") - install=gcc-ada.install - - cd gcc-build/gcc - make -j1 DESTDIR=$pkgdir ada.install-{common,info} - install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-go() -{ - pkgdesc="Go front-end for GCC" - depends=("gcc=$pkgver-$pkgrel") - install=gcc-go.install - - cd gcc-build - make -j1 DESTDIR=$pkgdir install-target-libgo - make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info} - install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1 - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION -} diff --git a/testing/gcc/gcc-ada.install b/testing/gcc/gcc-ada.install deleted file mode 100644 index df0553a4f..000000000 --- a/testing/gcc/gcc-ada.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(gnat-style.info gnat_rm.info gnat_ugn.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/testing/gcc/gcc-fortran.install b/testing/gcc/gcc-fortran.install deleted file mode 100644 index b15d89a97..000000000 --- a/testing/gcc/gcc-fortran.install +++ /dev/null @@ -1,16 +0,0 @@ -infodir=usr/share/info -file="gfortran.info" - -post_install() { - [ -x usr/bin/install-info ] || return 0 - install-info $infodir/$file.gz $infodir/dir 2> /dev/null -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null -} diff --git a/testing/gcc/gcc-go.install b/testing/gcc/gcc-go.install deleted file mode 100644 index 7dc50dee5..000000000 --- a/testing/gcc/gcc-go.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(gccgo.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/testing/gcc/gcc-hash-style-both.patch b/testing/gcc/gcc-hash-style-both.patch deleted file mode 100644 index 8b59f4535..000000000 --- a/testing/gcc/gcc-hash-style-both.patch +++ /dev/null @@ -1,122 +0,0 @@ ---- 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/testing/gcc/gcc-libs.install b/testing/gcc/gcc-libs.install deleted file mode 100644 index 23553b8f0..000000000 --- a/testing/gcc/gcc-libs.install +++ /dev/null @@ -1,16 +0,0 @@ -infodir=usr/share/info -filelist=(libgomp.info libquadmath.info) - -post_upgrade() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/testing/gcc/gcc.install b/testing/gcc/gcc.install deleted file mode 100644 index 3407a5e1f..000000000 --- a/testing/gcc/gcc.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/testing/gcc/gcc_pure64.patch b/testing/gcc/gcc_pure64.patch deleted file mode 100644 index 8c0baf8e2..000000000 --- a/testing/gcc/gcc_pure64.patch +++ /dev/null @@ -1,26 +0,0 @@ -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/testing/libgcrypt/PKGBUILD b/testing/libgcrypt/PKGBUILD deleted file mode 100644 index 2ccdf36fd..000000000 --- a/testing/libgcrypt/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 121250 2011-04-29 21:23:37Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgname=libgcrypt -pkgver=1.4.6 -pkgrel=3 -pkgdesc="a general purpose crypto library based on the code used" -arch=(i686 x86_64) -url="http://www.gnupg.org" -license=('LGPL') -depends=('libgpg-error>=1.9') -options=('!libtool' '!emptydirs') -install=$pkgname.install -source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - #ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/libgcrypt/${pkgname}-${pkgver}.tar.bz2 -) -md5sums=('dbf99425a4fe9217c84ce3a35d938634') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --disable-static \ - --disable-padlock-support - make -} - -check() { - cd ${srcdir}/${pkgname}-${pkgver} - make check -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - - # Move dynamic libraries to /lib - install -d -m755 "${pkgdir}"/lib/ - mv "${pkgdir}"/usr/lib/libgcrypt.so* "${pkgdir}"/lib/ - ln -sf /lib/libgcrypt.so "${pkgdir}"/usr/lib/libgcrypt.so -} diff --git a/testing/libgcrypt/libgcrypt.install b/testing/libgcrypt/libgcrypt.install deleted file mode 100644 index 83e0dcb27..000000000 --- a/testing/libgcrypt/libgcrypt.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=/usr/share/info -filelist=(gcrypt.info.gz) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} diff --git a/testing/libtool/PKGBUILD b/testing/libtool/PKGBUILD deleted file mode 100644 index ffc562974..000000000 --- a/testing/libtool/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 116987 2011-03-27 06:40:02Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -# NOTE: requires rebuilt with each new gcc version - -pkgname=libtool -pkgver=2.4 -pkgrel=3 -pkgdesc="A generic library support script" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.gnu.org/software/libtool" -license=('GPL') -depends=('sh' 'tar' 'texinfo') -groups=('base-devel') -options=('!libtool') -install=libtool.install -source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz) -md5sums=('4e6144439d95d7332dc50ace6dd24c55') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr - make - make check -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/testing/libtool/libtool.install b/testing/libtool/libtool.install deleted file mode 100644 index 424c8cb88..000000000 --- a/testing/libtool/libtool.install +++ /dev/null @@ -1,22 +0,0 @@ -infodir=/usr/share/info -filelist=(libtool.info libtool.info-1 libtool.info-2) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/lzo2/PKGBUILD b/testing/lzo2/PKGBUILD new file mode 100644 index 000000000..b9aa75ad5 --- /dev/null +++ b/testing/lzo2/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 122309 2011-05-03 18:52:51Z tpowa $ +# Contributor: Low Kian Seong <fastmail_low@speedymail.org> +# Maintainer: dorphell <dorphell@archlinux.org> +pkgname=lzo2 +pkgver=2.05 +pkgrel=1 +pkgdesc="Portable lossless data compression library" +arch=('i686' 'x86_64') +url="http://www.oberhumer.com/opensource/lzo" +license=('GPL') +depends=('glibc') +source=(http://www.oberhumer.com/opensource/lzo/download/lzo-${pkgver}.tar.gz) +options=(!libtool) +md5sums=('c67cda5fa191bab761c7cb06fe091e36') + +build() { + cd "${srcdir}/lzo-${pkgver}" + + ./configure --prefix=/usr --enable-shared + make + + # build minilzo + gcc $CFLAGS -fpic -Iinclude/lzo -o minilzo/minilzo.o -c minilzo/minilzo.c + gcc -g -shared -o libminilzo.so.0 -Wl,-soname,libminilzo.so.0 minilzo/minilzo.o +} + +package() { + cd "${srcdir}/lzo-${pkgver}" + make DESTDIR=${pkgdir} install + + # install minilzo + install -m 755 libminilzo.so.0 ${pkgdir}/usr/lib + install -p -m 644 minilzo/minilzo.h ${pkgdir}/usr/include/lzo + cd ${pkgdir}/usr/lib + ln -s libminilzo.so.0 libminilzo.so +} diff --git a/testing/openssh/PKGBUILD b/testing/openssh/PKGBUILD new file mode 100644 index 000000000..68fb3d417 --- /dev/null +++ b/testing/openssh/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 122202 2011-05-03 02:17:44Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Aaron Griffin <aaron@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +pkgname=openssh +pkgver=5.8p2 +pkgrel=1 +pkgdesc='Free version of the SSH connectivity tools' +arch=('i686' 'x86_64') +license=('custom:BSD') +url='http://www.openssh.org/portable.html' +backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd') +depends=('tcp_wrappers' 'heimdal' 'libedit') +source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz" + 'sshd.confd' + 'sshd.pam' + 'sshd') +sha1sums=('e610270e0c5484fb291cd81bbcbefbeb5e391a62' + 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' + '660092c57bde28bed82078f74011f95fc51c2293' + '6b7f8ebf0c1cc37137a7d9a53447ac8a0ee6a2b5') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr --libexecdir=/usr/lib/ssh \ + --sysconfdir=/etc/ssh --with-tcp-wrappers --with-privsep-user=nobody \ + --with-md5-passwords --with-pam --with-mantype=man --mandir=/usr/share/man \ + --with-xauth=/usr/bin/xauth --with-kerberos5=/usr --with-ssl-engine \ + --with-libedit=/usr/lib --disable-strip # stripping is done by makepkg + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd + install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd + install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd + install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE" + + rm "${pkgdir}"/usr/share/man/man1/slogin.1 + ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz + + # additional contrib scripts that we like + install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh + install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id + install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1 + + # PAM is a common, standard feature to have + sed -i -e '/^#ChallengeResponseAuthentication yes$/c ChallengeResponseAuthentication no' \ + -e '/^#UsePAM no$/c UsePAM yes' \ + "$pkgdir"/etc/ssh/sshd_config +} diff --git a/testing/openssh/sshd b/testing/openssh/sshd new file mode 100755 index 000000000..2ee1091f0 --- /dev/null +++ b/testing/openssh/sshd @@ -0,0 +1,48 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/sshd + +PIDFILE=/var/run/sshd.pid +PID=$(cat $PIDFILE 2>/dev/null) +if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd'; then + PID= + rm $PIDFILE 2>/dev/null +fi + +case "$1" in + start) + stat_busy "Starting Secure Shell Daemon" + [ -f /etc/ssh/ssh_host_key ] || { /usr/bin/ssh-keygen -t rsa1 -N "" -f /etc/ssh/ssh_host_key >/dev/null; } + [ -f /etc/ssh/ssh_host_rsa_key ] || { /usr/bin/ssh-keygen -t rsa -N "" -f /etc/ssh/ssh_host_rsa_key >/dev/null; } + [ -f /etc/ssh/ssh_host_dsa_key ] || { /usr/bin/ssh-keygen -t dsa -N "" -f /etc/ssh/ssh_host_dsa_key >/dev/null; } + [ -f /etc/ssh/ssh_host_ecdsa_key ] || { /usr/bin/ssh-keygen -t ecdsa -N "" -f /etc/ssh/ssh_host_ecdsa_key >/dev/null; } + [ -d /var/empty ] || mkdir -p /var/empty + [ -z "$PID" ] && /usr/sbin/sshd $SSHD_ARGS + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon sshd + stat_done + fi + ;; + stop) + stat_busy "Stopping Secure Shell Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon sshd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/openssh/sshd.confd b/testing/openssh/sshd.confd new file mode 100644 index 000000000..5ce7c0079 --- /dev/null +++ b/testing/openssh/sshd.confd @@ -0,0 +1,4 @@ +# +# Parameters to be passed to sshd +# +SSHD_ARGS="" diff --git a/testing/openssh/sshd.pam b/testing/openssh/sshd.pam new file mode 100644 index 000000000..ae028ceb5 --- /dev/null +++ b/testing/openssh/sshd.pam @@ -0,0 +1,10 @@ +#%PAM-1.0 +#auth required pam_securetty.so #Disable remote root +auth required pam_unix.so +auth required pam_env.so +account required pam_nologin.so +account required pam_unix.so +account required pam_time.so +password required pam_unix.so +session required pam_unix_session.so +session required pam_limits.so diff --git a/testing/php-apc/PKGBUILD b/testing/php-apc/PKGBUILD new file mode 100644 index 000000000..b13f84bc4 --- /dev/null +++ b/testing/php-apc/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 122195 2011-05-02 19:06:00Z pierre $ +# Maintainer: Pierre Schmitz <pierre@archlinux.de> + +pkgname=php-apc +pkgver=3.1.8 +pkgrel=1 +arch=('i686' 'x86_64') +pkgdesc='A free, open, and robust framework for caching and optimizing PHP intermediate code' +url='http://pecl.php.net/package/APC' +depends=('php') +license="PHP" +source=("http://pecl.php.net/get/APC-${pkgver}.tgz") +backup=('etc/php/conf.d/apc.ini') +md5sums=('bb1147933a61aa70ceffe53cc6f2920f') + +build() { + cd $srcdir/APC-$pkgver + phpize + ./configure --prefix=/usr + make +} + +package() { + cd $srcdir/APC-$pkgver + make INSTALL_ROOT=$pkgdir install + echo ';extension=apc.so' > apc.ini + install -D -m644 apc.ini $pkgdir/etc/php/conf.d/apc.ini + install -D -m644 apc.php $pkgdir/usr/share/php-apc/apc.php + install -D -m644 INSTALL $pkgdir/usr/share/doc/php-apc/install.txt +} diff --git a/testing/tzdata/Makefile.patch b/testing/tzdata/Makefile.patch deleted file mode 100644 index e88f9d907..000000000 --- a/testing/tzdata/Makefile.patch +++ /dev/null @@ -1,140 +0,0 @@ -diff -Naur src/Makefile src-p/Makefile ---- src/Makefile 2007-08-20 16:47:41.000000000 +0200 -+++ src-p/Makefile 2007-10-02 04:07:44.000000000 +0200 -@@ -34,17 +34,17 @@ - - # Everything gets put in subdirectories of. . . - --TOPDIR= /usr/local -+TOPDIR= $(DESTDIR)/usr - - # "Compiled" time zone information is placed in the "TZDIR" directory - # (and subdirectories). - # Use an absolute path name for TZDIR unless you're just testing the software. - --TZDIR= $(TOPDIR)/etc/zoneinfo -+TZDIR= $(TOPDIR)/share/zoneinfo - - # The "tzselect", "zic", and "zdump" commands get installed in. . . - --ETCDIR= $(TOPDIR)/etc -+SBINDIR= $(TOPDIR)/sbin - - # If you "make INSTALL", the "date" command gets installed in. . . - -@@ -52,7 +52,7 @@ - - # Manual pages go in subdirectories of. . . - --MANDIR= $(TOPDIR)/man -+MANDIR= $(TOPDIR)/share/man - - # Library functions are put in an archive in LIBDIR. - -@@ -83,7 +83,7 @@ - - # Non-default libraries needed to link. - # Add -lintl if you want to use `gettext' on Solaris. --LDLIBS= -+LDLIBS=$(LDFLAGS) - - # Add the following to the end of the "CFLAGS=" line as needed. - # -Dconst= if `const' does not work (SunOS 4.x cc, OSF1 V5.0 cc) -@@ -211,7 +211,7 @@ - # before the first Monday in January when a "%V" format is used and January 1 - # falls on a Friday, Saturday, or Sunday. - --CFLAGS= -+CFLAGS += -std=gnu99 - - # If you want zic's -s option used when installing, uncomment the next line - # ZFLAGS= -s -@@ -220,7 +220,7 @@ - ZIC= $(zic) $(ZFLAGS) - - # The name of a Posix-compliant `awk' on your system. --AWK= nawk -+AWK= awk - - # The path where SGML DTDs are kept. - SGML_SEARCH_PATH= $(TOPDIR)/share/doc/sgml-lib/REC-html401-19991224/ -@@ -241,8 +241,10 @@ - - ############################################################################### - --cc= cc --CC= $(cc) -DTZDIR=\"$(TZDIR)\" -+CC+= -DTZDIR=\"$(TZDIR)\" -+ifeq ($(NLS),1) -+CC += -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\" -+endif - - TZCSRCS= zic.c localtime.c asctime.c scheck.c ialloc.c - TZCOBJS= zic.o localtime.o asctime.o scheck.o ialloc.o -@@ -282,14 +284,16 @@ - - ALL: all date - --install: all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA) -+install: all $(DATA) $(REDO) $(MANS) $(TABDATA) - $(ZIC) -y $(YEARISTYPE) \ - -d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES) - -rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab - cp iso3166.tab zone.tab $(TZDIR)/. -- -mkdir $(TOPDIR) $(ETCDIR) -- cp tzselect zic zdump $(ETCDIR)/. -- -mkdir $(TOPDIR) $(MANDIR) \ -+ -mkdir -p $(TOPDIR) $(SBINDIR) -+ cp zic zdump $(SBINDIR)/. -+ -mkdir -p $(TOPDIR) $(BINDIR) -+ cp tzselect $(BINDIR)/. -+ -mkdir -p $(TOPDIR) $(MANDIR) \ - $(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8 - -rm -f $(MANDIR)/man3/newctime.3 \ - $(MANDIR)/man3/newtzset.3 \ -@@ -298,13 +302,11 @@ - $(MANDIR)/man8/zdump.8 \ - $(MANDIR)/man8/zic.8 - cp newctime.3 newtzset.3 $(MANDIR)/man3/. -- cp tzfile.5 $(MANDIR)/man5/. -- cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/. - - INSTALL: ALL install date.1 -- -mkdir $(TOPDIR) $(BINDIR) -+ -mkdir -p $(TOPDIR) $(BINDIR) - cp date $(BINDIR)/. -- -mkdir $(TOPDIR) $(MANDIR) $(MANDIR)/man1 -+ -mkdir -p $(TOPDIR) $(MANDIR) $(MANDIR)/man1 - -rm -f $(MANDIR)/man1/date.1 - cp date.1 $(MANDIR)/man1/. - -@@ -334,9 +336,9 @@ - # You must replace all of $(TZDIR) to switch from not using leap seconds - # to using them, or vice versa. - other_two: zic leapseconds $(TDATA) -- $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L /dev/null $(TDATA) -+ $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA) - $(ZIC) -y $(YEARISTYPE) \ -- -d $(TZDIR)-leaps -L leapseconds $(TDATA) -+ -d $(TZDIR)/right -L leapseconds $(TDATA) - - posix_right: posix_only other_two - -@@ -367,7 +369,7 @@ - <$? >$@ - chmod +x $@ - --check: check_tables check_web -+check: check_tables - - check_tables: checktab.awk $(PRIMARY_YDATA) - $(AWK) -f checktab.awk $(PRIMARY_YDATA) -diff -Naur src/tzselect.ksh src-p/tzselect.ksh ---- src/tzselect.ksh 2007-08-20 16:47:42.000000000 +0200 -+++ src-p/tzselect.ksh 2007-10-02 04:07:44.000000000 +0200 -@@ -1,4 +1,4 @@ --#! /bin/ksh -+#! /bin/bash - - # '@(#)tzselect.ksh 8.1' - diff --git a/testing/tzdata/PKGBUILD b/testing/tzdata/PKGBUILD deleted file mode 100644 index b09c6c637..000000000 --- a/testing/tzdata/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 121182 2011-04-29 06:58:28Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgname=tzdata -pkgver=2011g -pkgrel=1 -_tzcode=2011g -_tzdata=2011g -pkgdesc="Sources for time zone and daylight saving time data" -arch=('i686' 'x86_64') -url="http://www.twinsun.com/tz/tz-link.htm" -license=('GPL') -depends=() -makedepends=() -optdepends=('bash: required by tzselect') -options=('!emptydirs') -source=(ftp://elsie.nci.nih.gov/pub/tzcode${_tzcode}.tar.gz \ - ftp://elsie.nci.nih.gov/pub/${pkgname}${_tzdata}.tar.gz \ - Makefile.patch) -md5sums=('ecb564279b28c5b184421c525d997d6c' - 'a068c27e7e426fdb12ab0c88506df20d' - 'a64ed97d1fc03c66ee8612c0d9f40507') - -build() { - cd ${srcdir} - - tar -xf tzcode${_tzcode}.tar.gz - tar -xf ${pkgname}${_tzdata}.tar.gz - - patch -Np1 -i "${srcdir}/Makefile.patch" - - make -} - -check() { - cd ${srcdir} - make check -} - -package() { - cd ${srcdir} - make DESTDIR="${pkgdir}" install - - rm "${pkgdir}/usr/share/zoneinfo/localtime" -} diff --git a/testing/xfsprogs/PKGBUILD b/testing/xfsprogs/PKGBUILD deleted file mode 100644 index 6751be9ec..000000000 --- a/testing/xfsprogs/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 118982 2011-04-09 21:14:21Z tpowa $ -# Maintainer: Paul Mattal <paul@archlinux.org> -pkgname=xfsprogs -pkgver=3.1.5 -pkgrel=1 -pkgdesc="XFS filesystem utilities" -arch=('i686' 'x86_64' 'mips64el') -license=('LGPL') -url="http://oss.sgi.com/projects/xfs/" -groups=('base') -depends=('util-linux-ng>=2.16') -options=('!makeflags' '!libtool') -# We mirror the sources as upstream tends to move them once a new release is out -source=("ftp://ftp.archlinux.org/other/xfsprogs/${pkgname}-${pkgver}.tar.gz") -md5sums=('b1db37749e2b4149a0dd178abff956be') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - export OPTIMIZER="-march=${CARCH/_/-} -O1" - export DEBUG=-DNDEBUG - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DIST_ROOT="${pkgdir}" install install-dev - chown -R root $pkgdir - chgrp -R root $pkgdir -} |