diff options
Diffstat (limited to 'extra')
35 files changed, 142 insertions, 847 deletions
diff --git a/extra/bmp/0.9.7.1-visualization.patch b/extra/bmp/0.9.7.1-visualization.patch deleted file mode 100644 index ac03323f6..000000000 --- a/extra/bmp/0.9.7.1-visualization.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- beep/vis.c 2004-12-04 10:04:29.000000000 +0100 -+++ beep/vis.c 2005-02-17 12:02:25.391044008 +0100 -@@ -223,7 +223,8 @@ vis_draw(Widget * w) - /* FIXME: The check "shouldn't" be neccessary? */ - /* if (GTK_IS_WINDOW(vis->vs_window)) { */ - GDK_THREADS_ENTER(); -- gdk_draw_indexed_image(vis->vs_window, vis->vs_widget.gc, -+ if (GDK_IS_DRAWABLE(vis->vs_window)) -+ gdk_draw_indexed_image(vis->vs_window, vis->vs_widget.gc, - vis->vs_widget.x, vis->vs_widget.y, - vis->vs_widget.width, vis->vs_widget.height, - GDK_RGB_DITHER_NORMAL, (guchar *) rgb_data, diff --git a/extra/bmp/PKGBUILD b/extra/bmp/PKGBUILD deleted file mode 100644 index 0cf018e71..000000000 --- a/extra/bmp/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 148682 2012-02-05 11:46:44Z ibiru $ -# Maintainer: Kevin Piche <kevin@archlinux.org> -# Contributor: Ben <contrasutra@myrealbox.com> - -pkgname=bmp -pkgver=0.9.7.1 -pkgrel=9 -pkgdesc="gtk2 port of xmms" -arch=('i686' 'x86_64') -url="http://sourceforge.net/projects/beepmp/" -license=('GPL') -depends=('id3lib' 'libglade' 'libsm' 'libvorbis' 'alsa-lib' 'unzip' 'desktop-file-utils') -makedepends=('libxt') -options=('!libtool') -install=bmp.install -source=(http://downloads.sourceforge.net/sourceforge/beepmp/${pkgname}-${pkgver}.tar.gz \ - ${pkgver}-visualization.patch bmp-${pkgver}-crossfade-0.3.9.patch) -md5sums=('c25d5a8d49cc5851d13d525a20023c4c' - 'fa1bdf5a8d03e8539a6bed5caa471176' - '42ad4109ddb66024d4c6d1f3e572ab86') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 -i ../${pkgver}-visualization.patch - patch -p1 -i ../${pkgname}-${pkgver}-crossfade-0.3.9.patch - LIBS+="-lm" ./configure --prefix=/usr --mandir=/usr/share/man - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} -# vim: ts=2 sw=2 et ft=sh diff --git a/extra/bmp/bmp-0.9.7.1-crossfade-0.3.9.patch b/extra/bmp/bmp-0.9.7.1-crossfade-0.3.9.patch deleted file mode 100644 index 4c1e46da9..000000000 --- a/extra/bmp/bmp-0.9.7.1-crossfade-0.3.9.patch +++ /dev/null @@ -1,108 +0,0 @@ -Patch taken from xmms-crossfade 3.10 tarball. Required for crossfade to -work. http://www.eisenlohr.org/xmms-crossfade/ - -diff -ur bmp-0.9.7.1/beep/mainwin.c bmp-0.9.7.1.patched/beep/mainwin.c ---- bmp-0.9.7.1/beep/mainwin.c 2005-05-09 10:45:39.000000000 +0200 -+++ bmp-0.9.7.1.patched/beep/mainwin.c 2005-11-25 00:03:59.000000000 +0100 -@@ -655,9 +655,11 @@ - mainwin_set_shade(!cfg.player_shaded); - } - -+gboolean is_quitting = FALSE; - void - mainwin_quit_cb(void) - { -+ is_quitting = TRUE; - gtk_widget_hide(equalizerwin); - gtk_widget_hide(playlistwin); - gtk_widget_hide(mainwin); -@@ -1318,7 +1320,7 @@ - change_song(guint pos) - { - if (bmp_playback_get_playing()) -- bmp_playback_stop(); -+ bmp_playback_stop_for_restart(); - - playlist_set_position(pos); - bmp_playback_initiate(); -diff -ur bmp-0.9.7.1/beep/playback.c bmp-0.9.7.1.patched/beep/playback.c ---- bmp-0.9.7.1/beep/playback.c 2005-01-26 06:56:15.000000000 +0100 -+++ bmp-0.9.7.1.patched/beep/playback.c 2005-11-25 00:03:59.000000000 +0100 -@@ -89,7 +89,7 @@ - return; - - if (bmp_playback_get_playing()) -- bmp_playback_stop(); -+ bmp_playback_stop_for_restart(); - - vis_clear_data(mainwin_vis); - vis_clear_data(playlistwin_vis); -@@ -135,6 +135,15 @@ - get_current_input_plugin()->pause(ip_data.paused); - } - -+gboolean input_stopped_for_restart = FALSE; -+void -+bmp_playback_stop_for_restart(void) -+{ -+ input_stopped_for_restart = TRUE; -+ bmp_playback_stop(); -+ input_stopped_for_restart = FALSE; -+} -+ - void - bmp_playback_stop(void) - { -diff -ur bmp-0.9.7.1/beep/playback.h bmp-0.9.7.1.patched/beep/playback.h ---- bmp-0.9.7.1/beep/playback.h 2004-12-04 10:04:26.000000000 +0100 -+++ bmp-0.9.7.1.patched/beep/playback.h 2005-11-25 00:03:59.000000000 +0100 -@@ -26,6 +26,7 @@ - void bmp_playback_initiate(void); - void bmp_playback_pause(void); - void bmp_playback_stop(void); -+void bmp_playback_stop_for_restart(void); - gboolean bmp_playback_play_file(const gchar * filename); - gboolean bmp_playback_get_playing(void); - gboolean bmp_playback_get_paused(void); -diff -ur bmp-0.9.7.1/beep/playlist.c bmp-0.9.7.1.patched/beep/playlist.c ---- bmp-0.9.7.1/beep/playlist.c 2005-08-11 09:25:51.000000000 +0200 -+++ bmp-0.9.7.1.patched/beep/playlist.c 2005-11-25 00:03:59.000000000 +0100 -@@ -817,7 +817,7 @@ - if (bmp_playback_get_playing()) { - /* We need to stop before changing playlist_position */ - PLAYLIST_UNLOCK(); -- bmp_playback_stop(); -+ bmp_playback_stop_for_restart(); - PLAYLIST_LOCK(); - restart_playing = TRUE; - } -@@ -868,7 +868,7 @@ - if (bmp_playback_get_playing()) { - /* We need to stop before changing playlist_position */ - PLAYLIST_UNLOCK(); -- bmp_playback_stop(); -+ bmp_playback_stop_for_restart(); - PLAYLIST_LOCK(); - restart_playing = TRUE; - } -@@ -1018,7 +1018,7 @@ - if (bmp_playback_get_playing()) { - /* We need to stop before changing playlist_position */ - PLAYLIST_UNLOCK(); -- bmp_playback_stop(); -+ bmp_playback_stop_for_restart(); - PLAYLIST_LOCK(); - restart_playing = TRUE; - } -@@ -1047,7 +1047,10 @@ - { - GList *plist_pos_list; - -- bmp_playback_stop(); -+ if (cfg.repeat) -+ bmp_playback_stop_for_restart(); -+ else -+ bmp_playback_stop(); - - PLAYLIST_LOCK(); - plist_pos_list = find_playlist_position_list(); diff --git a/extra/bmp/bmp.install b/extra/bmp/bmp.install deleted file mode 100644 index 2eaa60550..000000000 --- a/extra/bmp/bmp.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/extra/cifs-utils/PKGBUILD b/extra/cifs-utils/PKGBUILD index 90456699b..9ef539758 100644 --- a/extra/cifs-utils/PKGBUILD +++ b/extra/cifs-utils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 182654 2013-04-12 07:11:03Z tpowa $ +# $Id: PKGBUILD 185803 2013-05-19 09:33:05Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=cifs-utils pkgver=6.0 -pkgrel=1 +pkgrel=2 pkgdesc="CIFS filesystem user-space tools" arch=(i686 x86_64) url="http://wiki.samba.org/index.php/LinuxCIFS_utils" @@ -14,7 +14,7 @@ build() { cd "$srcdir/$pkgname-$pkgver" # systemd support is broken in mount.cifs # https://bugs.archlinux.org/task/30958 - ./configure --prefix=/usr --disable-systemd + ./configure --prefix=/usr --sbindir=/usr/bin --disable-systemd make } diff --git a/extra/dmidecode/PKGBUILD b/extra/dmidecode/PKGBUILD index 3c5fe030d..d36f8c5e7 100644 --- a/extra/dmidecode/PKGBUILD +++ b/extra/dmidecode/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183308 2013-04-21 10:54:50Z giovanni $ +# $Id: PKGBUILD 185822 2013-05-19 13:06:30Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=dmidecode pkgver=2.12 -pkgrel=1 +pkgrel=2 pkgdesc="Desktop Management Interface table related utilities" arch=('i686' 'x86_64') url="http://www.nongnu.org/dmidecode" @@ -16,11 +16,12 @@ md5sums=('a406f3cbb27736491698697beeddb781') build() { cd "${srcdir}/${pkgname}-${pkgver}" + sed -i "s:sbin:bin:g" Makefile make prefix=/usr } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make prefix=/usr DESTDIR=${pkgdir} install + make prefix=/usr DESTDIR="${pkgdir}" install } diff --git a/extra/dosfstools/PKGBUILD b/extra/dosfstools/PKGBUILD index 4cdbe9f10..a1641db1c 100644 --- a/extra/dosfstools/PKGBUILD +++ b/extra/dosfstools/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179303 2013-03-05 10:42:06Z tpowa $ +# $Id: PKGBUILD 185832 2013-05-19 14:15:45Z tpowa $ # Maintainer: dorphell <dorphell@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=dosfstools pkgver=3.0.16 -pkgrel=1 +pkgrel=2 pkgdesc="DOS filesystem utilities" arch=(i686 x86_64) depends=('glibc') @@ -20,7 +20,7 @@ build() { package () { cd $srcdir/$pkgname-$pkgver - make PREFIX=$pkgdir MANDIR=$pkgdir/usr/share/man DOCDIR=$pkgdir/usr/share/doc install + make PREFIX=$pkgdir SBINDIR=$pkgdir/usr/bin MANDIR=$pkgdir/usr/share/man DOCDIR=$pkgdir/usr/share/doc install } md5sums=('27aca18aeb8bb0851ccaeb47e7416a6e' 'e8b460ab9c27279e652ddbd1ce7fa4b2') diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD index 77a9c6614..519423761 100644 --- a/extra/doxygen/PKGBUILD +++ b/extra/doxygen/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 178954 2013-03-01 10:20:02Z andrea $ +# $Id: PKGBUILD 185936 2013-05-19 21:23:57Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgbase=doxygen pkgname=('doxygen' 'doxygen-docs') -pkgver=1.8.3.1 -pkgrel=2 +pkgver=1.8.4 +pkgrel=1 license=('GPL') arch=(i686 x86_64) url="http://www.doxygen.org/" makedepends=('gcc-libs' 'flex' 'qt4' 'texlive-core' 'ghostscript' 'texlive-latexextra' 'graphviz') source=(http://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz) -md5sums=('31b0aaab51c5cab7db9f0ebbe9f85530') -sha1sums=('289fc809f44b8025d45279deefbaee7680efd88f') +md5sums=('5f460b91c0d8c34a76173cf22015c2fc') +sha1sums=('a363811b932e44d479addbadffcc8257cde60b44') build() { - . /etc/profile.d/qt4.sh + export PATH=$PATH:/usr/lib/qt4/bin cd "${srcdir}/${pkgbase}-${pkgver}" QTDIR=/usr ./configure --prefix /usr --with-doxywizard make diff --git a/extra/efibootmgr/PKGBUILD b/extra/efibootmgr/PKGBUILD index d97c9587f..c538a4a96 100755 --- a/extra/efibootmgr/PKGBUILD +++ b/extra/efibootmgr/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 176067 2013-01-27 09:30:54Z tpowa $ +# $Id: PKGBUILD 185838 2013-05-19 14:37:47Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor : Murtuza Akhtari <inxsible at gmail dot com> # Contributor: Keshav P R <skodabenz at rocketmail dot com> pkgname=efibootmgr pkgver=0.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="Tool to modify UEFI Firmware Boot Manager Variables." arch=('i686' 'x86_64') url="http://linux.dell.com/efibootmgr/" @@ -34,12 +34,12 @@ build () { package() { - mkdir -p ${pkgdir}/usr/sbin/ + mkdir -p ${pkgdir}/usr/bin/ mkdir -p ${pkgdir}/usr/share/man/man8/ cd ${srcdir}/efibootmgr-${pkgver}_build/ - install -D -m755 ${srcdir}/efibootmgr-${pkgver}_build/src/efibootmgr/efibootmgr ${pkgdir}/usr/sbin/efibootmgr + install -D -m755 ${srcdir}/efibootmgr-${pkgver}_build/src/efibootmgr/efibootmgr ${pkgdir}/usr/bin/efibootmgr install -D -m644 ${srcdir}/efibootmgr-${pkgver}_build/src/man/man8/efibootmgr.8 ${pkgdir}/usr/share/man/man8/efibootmgr.8 } diff --git a/extra/fping/PKGBUILD b/extra/fping/PKGBUILD index 01300dc14..27bfde990 100644 --- a/extra/fping/PKGBUILD +++ b/extra/fping/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166333 2012-09-06 15:45:17Z giovanni $ +# $Id: PKGBUILD 185814 2013-05-19 12:00:14Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=fping pkgver=3.4 -pkgrel=1 +pkgrel=2 pkgdesc="A utility to ping multiple hosts at once" arch=('i686' 'x86_64') url="http://www.fping.org/" @@ -17,6 +17,7 @@ build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --mandir=/usr/share/man \ --enable-ipv4 \ --enable-ipv6 @@ -30,5 +31,5 @@ package() { # install license install -D -m644 COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" - chmod 4555 ${pkgdir}/usr/sbin/fping + chmod 4555 ${pkgdir}/usr/bin/fping } diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD index 326342c20..eaf8f656a 100644 --- a/extra/gparted/PKGBUILD +++ b/extra/gparted/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184007 2013-04-30 18:49:43Z giovanni $ +# $Id: PKGBUILD 185866 2013-05-19 16:28:55Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Andrew Simmons <andrew.simmons@gmail.com> # Contributor: György Balló <ballogy@freestart.hu> pkgname=gparted pkgver=0.16.1 -pkgrel=1 +pkgrel=3 pkgdesc="A Partition Magic clone, frontend to GNU Parted" arch=('i686' 'x86_64') url="http://gparted.sourceforge.net" @@ -14,6 +14,9 @@ depends=('parted' 'gtkmm' 'hicolor-icon-theme') makedepends=('intltool' 'pkg-config' 'gnome-doc-utils') optdepends=('dosfstools: for FAT16 and FAT32 partitions' 'jfsutils: for jfs partitions' + 'f2fs-tools: for Flash-Friendly File System' + 'btrfs-progs: for btrfs partitions' + 'exfat-utils: for exFAT partitions' 'ntfs-3g: for ntfs partitions' 'reiserfsprogs: for reiser partitions' 'xfsprogs: for xfs partitions' @@ -25,12 +28,14 @@ install=gparted.install source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2" 'org.archlinux.pkexec.gparted.policy') md5sums=('3f399bff031b5ce14d11a8c346f4b89c' - 'c031d7d2b845ccb025b9f83e0ddd5653') + '122ed3120c846376bead22b25f6a3b19') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + sed -i "s:@gksuprog@ @installdir@/gparted %f:@installdir@/gparted_polkit %f:g" gparted.desktop.in.in + ./configure --prefix=/usr \ + --sbindir=/usr/bin make } @@ -42,11 +47,12 @@ package() { # Install policy file install -Dm644 "${srcdir}/org.archlinux.pkexec.gparted.policy" "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.gparted.policy" - # We need rename the original script - mv "${pkgdir}/usr/sbin/gparted" "${pkgdir}/usr/sbin/gparted.elf" - # Install launcher script - echo '#!/bin/sh' > ${pkgdir}/usr/sbin/gparted - echo 'pkexec --disable-internal-agent "/usr/sbin/gparted.elf" "$@"' >> ${pkgdir}/usr/sbin/gparted - chmod 755 ${pkgdir}/usr/sbin/gparted + echo '#!/bin/sh' > ${pkgdir}/usr/bin/gparted_polkit + echo 'if [ $(which pkexec) ]; then' >> ${pkgdir}/usr/bin/gparted_polkit + echo ' pkexec --disable-internal-agent "/usr/bin/gparted" "$@"' >> ${pkgdir}/usr/bin/gparted_polkit + echo 'else' >> ${pkgdir}/usr/bin/gparted_polkit + echo ' /usr/bin/gparted "$@"' >> ${pkgdir}/usr/bin/gparted_polkit + echo 'fi' >> ${pkgdir}/usr/bin/gparted_polkit + chmod 755 ${pkgdir}/usr/bin/gparted_polkit } diff --git a/extra/gparted/org.archlinux.pkexec.gparted.policy b/extra/gparted/org.archlinux.pkexec.gparted.policy index 65894a0cc..4305e5e16 100644 --- a/extra/gparted/org.archlinux.pkexec.gparted.policy +++ b/extra/gparted/org.archlinux.pkexec.gparted.policy @@ -12,7 +12,7 @@ <allow_inactive>auth_admin</allow_inactive> <allow_active>auth_admin</allow_active> </defaults> - <annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/gparted.elf</annotate> + <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/gparted</annotate> <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate> </action> diff --git a/extra/gutenprint/PKGBUILD b/extra/gutenprint/PKGBUILD index e327af6ae..4a8c6e516 100644 --- a/extra/gutenprint/PKGBUILD +++ b/extra/gutenprint/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163174 2012-07-08 10:42:54Z andyrtr $ +# $Id: PKGBUILD 185818 2013-05-19 12:13:34Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=gutenprint pkgver=5.2.9 -pkgrel=1 +pkgrel=2 pkgdesc="Top quality printer drivers for POSIX systems" arch=('i686' 'x86_64') license=('GPL') @@ -23,7 +23,16 @@ md5sums=('aefbec27b96dd404d9ac9811e17d58ce') build() { cd ${srcdir}/${pkgname}-${pkgver} + + # sbindir is not properly taken over there + sed -i "s:cups_sbindir=\"\/usr\/sbin\":cups_sbindir=\"\/usr\/bin\":g" m4/stp_cups.m4 + sed -i "s:cups_sbindir=\"\${cups_prefix}\/sbin\":cups_sbindir=\"\${cups_prefix}\/bin\":" m4/stp_cups.m4 + + sed -i "s:m4local:m4extra:" Makefile.am + autoreconf -vfi + ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --enable-samples \ --enable-cups-ppds \ --enable-cups-ppds-at-top-level \ diff --git a/extra/gutenprint/gutenprint.install b/extra/gutenprint/gutenprint.install index 05e8bec38..1a042e97a 100644 --- a/extra/gutenprint/gutenprint.install +++ b/extra/gutenprint/gutenprint.install @@ -1,5 +1,5 @@ post_install() { - echo ">>please run /usr/sbin/cups-genppdupdate" + echo ">>please run /usr/bin/cups-genppdupdate" echo ">>and restart cups deamon" } diff --git a/extra/icu/PKGBUILD b/extra/icu/PKGBUILD index d2b74f769..ec349be67 100644 --- a/extra/icu/PKGBUILD +++ b/extra/icu/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180805 2013-03-26 11:49:34Z foutrelis $ +# $Id: PKGBUILD 185844 2013-05-19 15:04:46Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Art Gramlich <art@gramlich-net.com> pkgname=icu pkgver=51.1 -pkgrel=1 +pkgrel=2 pkgdesc="International Components for Unicode library" arch=(i686 x86_64) url="http://www.icu-project.org/" @@ -25,7 +25,8 @@ build() { ./configure --prefix=/usr \ --sysconfdir=/etc \ - --mandir=/usr/share/man + --mandir=/usr/share/man \ + --sbindir=/usr/bin make } diff --git a/extra/isapnptools/PKGBUILD b/extra/isapnptools/PKGBUILD index 56d573eb5..fb0005b72 100644 --- a/extra/isapnptools/PKGBUILD +++ b/extra/isapnptools/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136974 2011-09-04 11:49:36Z pierre $ +# $Id: PKGBUILD 185816 2013-05-19 12:09:03Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=isapnptools pkgver=1.27 -pkgrel=3 +pkgrel=4 pkgdesc="Allow ISA Plug-And-Play devices to be configured on a Linux machine" url="http://www.roestock.demon.co.uk/isapnptools/" depends=('glibc') @@ -14,11 +14,14 @@ md5sums=('b997ba56583dc850fce9b93d658dfa0c') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + + ./configure --prefix=/usr \ + --sbindir=/usr/bin make } package() { cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/kexec-tools/PKGBUILD b/extra/kexec-tools/PKGBUILD index 2e2c6a688..740569631 100644 --- a/extra/kexec-tools/PKGBUILD +++ b/extra/kexec-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 182155 2013-04-08 13:04:10Z tpowa $ +# $Id: PKGBUILD 185799 2013-05-19 09:24:25Z tpowa $ # Contributor: Camille Moncelier <pix@devlife.org>, simo <simo@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=kexec-tools pkgver=2.0.4 -pkgrel=1 +pkgrel=2 pkgdesc="Load another kernel from the currently executing Linux kernel" arch=('i686' 'x86_64') url="http://kernel.org/pub/linux/utils/kernel/kexec/" @@ -18,16 +18,13 @@ license=('GPL2') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --without-lzma + ./configure --prefix=/usr --sbindir=/usr/bin --without-lzma make } package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install - - mv $pkgdir/usr/sbin $pkgdir/sbin - install -D -m644 kexec/kexec.8 $pkgdir/usr/share/man/man8/kexec.8 } md5sums=('4713026758923f5f3968905291b991ee') diff --git a/extra/networkmanager-vpnc/PKGBUILD b/extra/networkmanager-vpnc/PKGBUILD index b65ae3f3c..a50731449 100644 --- a/extra/networkmanager-vpnc/PKGBUILD +++ b/extra/networkmanager-vpnc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179572 2013-03-07 11:54:29Z foutrelis $ +# $Id: PKGBUILD 185909 2013-05-19 18:47:29Z dreisner $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-vpnc pkgver=0.9.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="NetworkManager VPN plugin for vpnc" arch=('i686' 'x86_64') license=('GPL') @@ -13,8 +13,15 @@ makedepends=('intltool') optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') options=('!libtool') install=networkmanager-vpnc.install -source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz) -sha256sums=('e4504c569315c20f2468995f073123a787cdb66695d321f20f994abd1d7eb1c1') +source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz + "vpnc-paths.patch") +sha256sums=('e4504c569315c20f2468995f073123a787cdb66695d321f20f994abd1d7eb1c1' + '0b07abc21823b316bfd9a9faf7bf34ded35d66e904d081c5e285f8dc8ce30a54') + +prepare() { + cd NetworkManager-vpnc-${pkgver} + patch -Np1 <"$srcdir/vpnc-paths.patch" +} build() { cd NetworkManager-vpnc-${pkgver} diff --git a/extra/networkmanager-vpnc/vpnc-paths.patch b/extra/networkmanager-vpnc/vpnc-paths.patch new file mode 100644 index 000000000..eccdf65b2 --- /dev/null +++ b/extra/networkmanager-vpnc/vpnc-paths.patch @@ -0,0 +1,10 @@ +--- a/src/nm-vpnc-service.c 2013-05-19 14:21:35.465816746 -0400 ++++ b/src/nm-vpnc-service.c 2013-05-19 14:23:57.554908088 -0400 +@@ -54,6 +54,7 @@ + + static const char *vpnc_binary_paths[] = + { ++ "/usr/bin/vpnc", + "/usr/sbin/vpnc", + "/sbin/vpnc", + "/usr/local/sbin/vpnc", diff --git a/extra/parted/PKGBUILD b/extra/parted/PKGBUILD index 7a9416441..a27cb8962 100644 --- a/extra/parted/PKGBUILD +++ b/extra/parted/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 151858 2012-03-03 14:28:32Z giovanni $ +# $Id: PKGBUILD 185834 2013-05-19 14:21:08Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=parted pkgver=3.1 -pkgrel=1 +pkgrel=2 pkgdesc="A program for creating, destroying, resizing, checking and copying partitions" arch=('i686' 'x86_64') license=('GPL3') @@ -20,6 +20,7 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --disable-debug \ --disable-rpath make diff --git a/extra/parted/linux.c.patch b/extra/parted/linux.c.patch deleted file mode 100644 index c9feea142..000000000 --- a/extra/parted/linux.c.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/libparted/arch/linux.c 2011-05-27 14:52:37.000000000 +0200 -+++ b/libparted/arch/linux.c 2011-07-29 20:25:38.000000000 +0200 -@@ -601,17 +601,17 @@ - static int kver = -1; - - struct utsname uts; -- int major; -- int minor; -- int teeny; -+ int major = 0; -+ int minor = 0; -+ int teeny = 0; - - if (kver != -1) - return kver; - - if (uname (&uts)) - return kver = 0; -- if (sscanf (uts.release, "%u.%u.%u", &major, &minor, &teeny) != 3) -- return kver = 0; -+ int n = sscanf (uts.release, "%u.%u.%u", &major, &minor, &teeny); -+ assert (n == 2 || n == 3); - - return kver = KERNEL_VERSION (major, minor, teeny); - } diff --git a/extra/parted/parted.install b/extra/parted/parted.install index 5e00699e8..752a6871b 100644 --- a/extra/parted/parted.install +++ b/extra/parted/parted.install @@ -8,7 +8,7 @@ post_install() { } post_upgrade() { - post_install $1 + post_install } pre_remove() { diff --git a/extra/python-m2crypto/PKGBUILD b/extra/python-m2crypto/PKGBUILD deleted file mode 100644 index 010da5c82..000000000 --- a/extra/python-m2crypto/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 140196 2011-10-09 08:27:16Z angvp $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: Sergej Pupykin <sergej@aur.archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=python-m2crypto -pkgver=0.21.1 -pkgrel=1 -pkgdesc="A crypto and SSL toolkit for Python" -arch=('i686' 'x86_64') -url="http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto" -license=('BSD') -depends=('python2' 'openssl') -makedepends=('swig') -source=("http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz") -md5sums=('f93d8462ff7646397a9f77a2fe602d17') - -build() { - cd "${srcdir}/M2Crypto-${pkgver}" - python2 setup.py build -} - -package() { - cd "${srcdir}/M2Crypto-${pkgver}" - python2 setup.py install --root="${pkgdir}/" --optimize=1 - - install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/extra/python-m2crypto/openssl1.patch b/extra/python-m2crypto/openssl1.patch deleted file mode 100644 index 59dba554d..000000000 --- a/extra/python-m2crypto/openssl1.patch +++ /dev/null @@ -1,531 +0,0 @@ -Index: tests/test_ssl.py -=================================================================== ---- tests/test_ssl.py (revision 698) -+++ tests/test_ssl.py (working copy) -@@ -405,8 +405,11 @@ - try: - ctx = SSL.Context('sslv23', weak_crypto=1) - s = SSL.Connection(ctx) -- s.connect(self.srv_addr) -- self.failUnlessEqual(s.get_version(), 'SSLv2') -+ if m2.OPENSSL_VERSION_NUMBER < 0x10000000: # SSLv2 ciphers disabled by default in newer OpenSSL -+ s.connect(self.srv_addr) -+ self.failUnlessEqual(s.get_version(), 'SSLv2') -+ else: -+ self.assertRaises(SSL.SSLError, s.connect, self.srv_addr) - s.close() - finally: - self.stop_server(pid) -Index: tests/test_x509.py -=================================================================== ---- tests/test_x509.py (revision 698) -+++ tests/test_x509.py (working copy) -@@ -142,7 +142,7 @@ - cn.set_data("Hello There!") - assert cn.get_data().as_text() == "Hello There!", cn.get_data().as_text() - -- assert n.as_hash() == 1697185131 -+ self.assertEquals(n.as_hash(), 1697185131) - - self.assertRaises(IndexError, lambda: n[100]) - self.assert_(n[10]) -Index: tests/test_smime.py -=================================================================== ---- tests/test_smime.py (revision 698) -+++ tests/test_smime.py (working copy) -@@ -6,7 +6,7 @@ - """ - - import unittest --from M2Crypto import SMIME, BIO, Rand, X509, EVP -+from M2Crypto import SMIME, BIO, Rand, X509, EVP, Err - - class SMIMETestCase(unittest.TestCase): - cleartext = 'some text to manipulate' -@@ -213,7 +213,7 @@ - - self.filenameSmime = 'tests/sig.p7s' - f = BIO.openfile(self.filenameSmime, 'wb') -- assert s.write(f, p7, BIO.MemoryBuffer('some text')) == 1 -+ assert s.write(f, p7, BIO.MemoryBuffer('some text')) == 1, Err.get_error() - f.close() - - def test_write_pkcs7_der(self): -Index: SWIG/_evp.i -=================================================================== ---- SWIG/_evp.i (revision 695) -+++ SWIG/_evp.i (working copy) -@@ -180,7 +180,7 @@ - - PKCS5_PBKDF2_HMAC_SHA1(passbuf, passlen, saltbuf, saltlen, iter, - keylen, key); -- ret = PyString_FromStringAndSize(key, keylen); -+ ret = PyString_FromStringAndSize((char*)key, keylen); - OPENSSL_cleanse(key, keylen); - return ret; - } -@@ -339,7 +339,7 @@ - klen = EVP_BytesToKey(cipher, md, (unsigned char *)sbuf, - (unsigned char *)dbuf, dlen, iter, - key, NULL); /* Since we are not returning IV no need to derive it */ -- ret = PyString_FromStringAndSize(key, klen); -+ ret = PyString_FromStringAndSize((char*)key, klen); - return ret; - } - -@@ -435,7 +435,7 @@ - PyErr_SetString(_evp_err, ERR_reason_error_string(ERR_get_error())); - return NULL; - } -- ret = PyString_FromStringAndSize(sigbuf, siglen); -+ ret = PyString_FromStringAndSize((char*)sigbuf, siglen); - OPENSSL_cleanse(sigbuf, siglen); - OPENSSL_free(sigbuf); - return ret; -@@ -513,7 +513,7 @@ - PyErr_SetString(PyExc_ValueError, "EVP_PKEY as DER failed"); - return NULL; - } -- der = PyString_FromStringAndSize(pp, len); -+ der = PyString_FromStringAndSize((char*)pp, len); - OPENSSL_free(pp); - return der; - } -Index: SWIG/_ssl.i -=================================================================== ---- SWIG/_ssl.i (revision 695) -+++ SWIG/_ssl.i (working copy) -@@ -17,13 +17,17 @@ - %apply Pointer NONNULL { SSL_CTX * }; - %apply Pointer NONNULL { SSL * }; - %apply Pointer NONNULL { SSL_CIPHER * }; --%apply Pointer NONNULL { STACK * }; -+%apply Pointer NONNULL { STACK_OF(SSL_CIPHER) * }; -+%apply Pointer NONNULL { STACK_OF(X509) * }; - %apply Pointer NONNULL { BIO * }; - %apply Pointer NONNULL { DH * }; - %apply Pointer NONNULL { RSA * }; - %apply Pointer NONNULL { EVP_PKEY *}; - %apply Pointer NONNULL { PyObject *pyfunc }; - -+%rename(ssl_get_ciphers) SSL_get_ciphers; -+extern STACK_OF(SSL_CIPHER) *SSL_get_ciphers(const SSL *ssl); -+ - %rename(ssl_get_version) SSL_get_version; - extern const char *SSL_get_version(CONST SSL *); - %rename(ssl_get_error) SSL_get_error; -@@ -668,29 +672,25 @@ - return SSL_CIPHER_get_bits(c, NULL); - } - --STACK *ssl_get_ciphers(SSL *ssl) { -- return (STACK *)SSL_get_ciphers(ssl); -+int sk_ssl_cipher_num(STACK_OF(SSL_CIPHER) *stack) { -+ return sk_SSL_CIPHER_num(stack); - } - --int sk_ssl_cipher_num(STACK *stack) { -- return sk_num(stack); -+SSL_CIPHER *sk_ssl_cipher_value(STACK_OF(SSL_CIPHER) *stack, int idx) { -+ return sk_SSL_CIPHER_value(stack, idx); - } - --SSL_CIPHER *sk_ssl_cipher_value(STACK *stack, int idx) { -- return (SSL_CIPHER *)sk_value(stack, idx); -+STACK_OF(X509) *ssl_get_peer_cert_chain(SSL *ssl) { -+ return SSL_get_peer_cert_chain(ssl); - } - --STACK *ssl_get_peer_cert_chain(SSL *ssl) { -- return (STACK *)SSL_get_peer_cert_chain(ssl); -+int sk_x509_num(STACK_OF(X509) *stack) { -+ return sk_X509_num(stack); - } - --int sk_x509_num(STACK *stack) { -- return sk_num(stack); -+X509 *sk_x509_value(STACK_OF(X509) *stack, int idx) { -+ return sk_X509_value(stack, idx); - } -- --X509 *sk_x509_value(STACK *stack, int idx) { -- return (X509 *)sk_value(stack, idx); --} - %} - - %threadallow i2d_ssl_session; -Index: SWIG/_x509.i -=================================================================== ---- SWIG/_x509.i (revision 695) -+++ SWIG/_x509.i (working copy) -@@ -148,8 +148,15 @@ - extern int X509_NAME_print_ex(BIO *, X509_NAME *, int, unsigned long); - %rename(x509_name_print_ex_fp) X509_NAME_print_ex_fp; - extern int X509_NAME_print_ex_fp(FILE *, X509_NAME *, int, unsigned long); -+ -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+%rename(x509_name_hash) X509_NAME_hash_old; -+extern unsigned long X509_NAME_hash_old(X509_NAME *); -+#else - %rename(x509_name_hash) X509_NAME_hash; - extern unsigned long X509_NAME_hash(X509_NAME *); -+#endif -+ - %rename(x509_name_get_index_by_nid) X509_NAME_get_index_by_NID; - extern int X509_NAME_get_index_by_NID(X509_NAME *, int, int); - -@@ -171,7 +178,7 @@ - if (PyString_Check($input)) { - Py_ssize_t len; - -- $1 = PyString_AsString($input); -+ $1 = (unsigned char *)PyString_AsString($input); - len = PyString_Size($input); - if (len > INT_MAX) { - PyErr_SetString(PyExc_ValueError, "object too large"); -@@ -184,7 +191,7 @@ - } - } - %rename(x509_name_entry_set_data) X509_NAME_ENTRY_set_data; --extern int X509_NAME_ENTRY_set_data( X509_NAME_ENTRY *, int, CONST unsigned char *, int); -+extern int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *, int, CONST unsigned char *, int); - %typemap(in) (CONST unsigned char *, int); - - %rename(x509_req_new) X509_REQ_new; -@@ -230,7 +237,7 @@ - %rename(x509_store_ctx_free) X509_STORE_CTX_free; - extern void X509_STORE_CTX_free(X509_STORE_CTX *); - %rename(x509_store_ctx_get1_chain) X509_STORE_CTX_get1_chain; --extern STACK *X509_STORE_CTX_get1_chain(X509_STORE_CTX *); -+extern STACK_OF(X509) *X509_STORE_CTX_get1_chain(X509_STORE_CTX *); - - %rename(x509_extension_get_critical) X509_EXTENSION_get_critical; - extern int X509_EXTENSION_get_critical(X509_EXTENSION *); -@@ -348,7 +355,7 @@ - PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error())); - } - else { -- ret = PyString_FromStringAndSize(buf, len); -+ ret = PyString_FromStringAndSize((char*)buf, len); - OPENSSL_free(buf); - } - return ret; -@@ -435,12 +442,12 @@ - } - - int x509_name_set_by_nid(X509_NAME *name, int nid, PyObject *obj) { -- return X509_NAME_add_entry_by_NID(name, nid, MBSTRING_ASC, PyString_AsString(obj), -1, -1, 0); -+ return X509_NAME_add_entry_by_NID(name, nid, MBSTRING_ASC, (unsigned char *)PyString_AsString(obj), -1, -1, 0); - } - - /* x509_name_add_entry_by_txt */ - int x509_name_add_entry_by_txt(X509_NAME *name, char *field, int type, char *bytes, int len, int loc, int set) { -- return X509_NAME_add_entry_by_txt(name, field, type, bytes, len, loc, set); -+ return X509_NAME_add_entry_by_txt(name, field, type, (unsigned char *)bytes, len, loc, set); - } - - PyObject *x509_name_get_der(X509_NAME *name) -@@ -450,23 +457,23 @@ - } - - /* sk_X509_new_null() is a macro returning "STACK_OF(X509) *". */ --STACK *sk_x509_new_null(void) { -- return (STACK *)sk_X509_new_null(); -+STACK_OF(X509) *sk_x509_new_null(void) { -+ return sk_X509_new_null(); - } - - /* sk_X509_free() is a macro. */ --void sk_x509_free(STACK *stack) { -- sk_X509_free((STACK_OF(X509) *)stack); -+void sk_x509_free(STACK_OF(X509) *stack) { -+ sk_X509_free(stack); - } - - /* sk_X509_push() is a macro. */ --int sk_x509_push(STACK *stack, X509 *x509) { -- return sk_X509_push((STACK_OF(X509) *)stack, x509); -+int sk_x509_push(STACK_OF(X509) *stack, X509 *x509) { -+ return sk_X509_push(stack, x509); - } - - /* sk_X509_pop() is a macro. */ --X509 *sk_x509_pop(STACK *stack) { -- return sk_X509_pop((STACK_OF(X509) *)stack); -+X509 *sk_x509_pop(STACK_OF(X509) *stack) { -+ return sk_X509_pop(stack); - } - - int x509_store_load_locations(X509_STORE *store, const char *file) { -@@ -493,21 +500,29 @@ - return X509_REQ_set_version(x, version); - } - --int x509_req_add_extensions(X509_REQ *req, STACK *exts) { -- return X509_REQ_add_extensions(req, (STACK_OF(X509_EXTENSION) *)exts); -+int x509_req_add_extensions(X509_REQ *req, STACK_OF(X509_EXTENSION) *exts) { -+ return X509_REQ_add_extensions(req, exts); - } - --X509_NAME_ENTRY *x509_name_entry_create_by_txt( X509_NAME_ENTRY **ne, char *field, int type, char *bytes, int len) { -- return X509_NAME_ENTRY_create_by_txt( ne, field, type, bytes, len); -+X509_NAME_ENTRY *x509_name_entry_create_by_txt(X509_NAME_ENTRY **ne, char *field, int type, char *bytes, int len) { -+ return X509_NAME_ENTRY_create_by_txt( ne, field, type, (unsigned char *)bytes, len); - } - --LHASH * --x509v3_lhash(){ -- return lh_new(NULL,NULL); -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+LHASH_OF(CONF_VALUE) -+#else -+LHASH -+#endif -+*x509v3_lhash() { -+ return lh_new(NULL, NULL); /* Should probably be lh_CONF_VALUE_new but won't compile. */ - } - - X509V3_CTX * --x509v3_set_conf_lhash(LHASH * lhash){ -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+x509v3_set_conf_lhash(LHASH_OF(CONF_VALUE) * lhash) { -+#else -+x509v3_set_conf_lhash(LHASH * lhash) { -+#endif - X509V3_CTX * ctx; - if (!(ctx=(X509V3_CTX *)PyMem_Malloc(sizeof(X509V3_CTX)))) { - PyErr_SetString(PyExc_MemoryError, "x509v3_set_conf_lhash"); -@@ -517,11 +532,20 @@ - return ctx; - } - --X509_EXTENSION *x509v3_ext_conf(LHASH *conf, X509V3_CTX *ctx, char *name, char *value) { -+X509_EXTENSION * -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+x509v3_ext_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx, char *name, char *value) { -+#else -+x509v3_ext_conf(LHASH *conf, X509V3_CTX *ctx, char *name, char *value) { -+#endif - X509_EXTENSION * ext = NULL; - ext = X509V3_EXT_conf(conf, ctx, name, value); - PyMem_Free(ctx); -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ lh_CONF_VALUE_free(conf); -+#else - lh_free(conf); -+#endif - return ext; - } - -@@ -543,33 +567,33 @@ - } - - /* sk_X509_EXTENSION_new_null is a macro. */ --STACK *sk_x509_extension_new_null(void) { -- return (STACK *)sk_X509_EXTENSION_new_null(); -+STACK_OF(X509_EXTENSION) *sk_x509_extension_new_null(void) { -+ return sk_X509_EXTENSION_new_null(); - } - - /* sk_X509_EXTENSION_free() is a macro. */ --void sk_x509_extension_free(STACK *stack) { -- sk_X509_EXTENSION_free((STACK_OF(X509_EXTENSION) *)stack); -+void sk_x509_extension_free(STACK_OF(X509_EXTENSION) *stack) { -+ sk_X509_EXTENSION_free(stack); - } - - /* sk_X509_EXTENSION_push() is a macro. */ --int sk_x509_extension_push(STACK *stack, X509_EXTENSION *x509_ext) { -- return sk_X509_EXTENSION_push((STACK_OF(X509_EXTENSION) *)stack, x509_ext); -+int sk_x509_extension_push(STACK_OF(X509_EXTENSION) *stack, X509_EXTENSION *x509_ext) { -+ return sk_X509_EXTENSION_push(stack, x509_ext); - } - - /* sk_X509_EXTENSION_pop() is a macro. */ --X509_EXTENSION *sk_x509_extension_pop(STACK *stack) { -- return sk_X509_EXTENSION_pop((STACK_OF(X509_EXTENSION) *)stack); -+X509_EXTENSION *sk_x509_extension_pop(STACK_OF(X509_EXTENSION) *stack) { -+ return sk_X509_EXTENSION_pop(stack); - } - - /* sk_X509_EXTENSION_num() is a macro. */ --int sk_x509_extension_num(STACK *stack) { -- return sk_X509_EXTENSION_num((STACK_OF(X509_EXTENSION) *)stack); -+int sk_x509_extension_num(STACK_OF(X509_EXTENSION) *stack) { -+ return sk_X509_EXTENSION_num(stack); - } - - /* sk_X509_EXTENSION_value() is a macro. */ --X509_EXTENSION *sk_x509_extension_value(STACK *stack, int i) { -- return sk_X509_EXTENSION_value((STACK_OF(X509_EXTENSION) *)stack, i); -+X509_EXTENSION *sk_x509_extension_value(STACK_OF(X509_EXTENSION) *stack, int i) { -+ return sk_X509_EXTENSION_value(stack, i); - } - - /* X509_STORE_CTX_get_app_data is a macro. */ -@@ -590,7 +614,7 @@ - #define I2DTYPE int (*)() - #endif - --STACK * -+STACK_OF(X509) * - make_stack_from_der_sequence(PyObject * pyEncodedString){ - STACK_OF(X509) *certs; - Py_ssize_t encoded_string_len; -@@ -606,7 +630,7 @@ - return NULL; - } - -- certs = ASN1_seq_unpack((unsigned char *)encoded_string, encoded_string_len, (D2ITYPE)d2i_X509, (void(*)())X509_free ); -+ certs = ASN1_seq_unpack_X509((unsigned char *)encoded_string, encoded_string_len, d2i_X509, X509_free ); - if (!certs) { - PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error())); - return NULL; -@@ -616,13 +640,13 @@ - } - - PyObject * --get_der_encoding_stack(STACK * stack){ -+get_der_encoding_stack(STACK_OF(X509) *stack){ - PyObject * encodedString; - - unsigned char * encoding; - int len; - -- encoding = ASN1_seq_pack((STACK_OF(X509)*) stack, (I2DTYPE)i2d_X509, NULL, &len); -+ encoding = ASN1_seq_pack_X509(stack, i2d_X509, NULL, &len); - if (!encoding) { - PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error())); - return NULL; -Index: SWIG/_aes.i -=================================================================== ---- SWIG/_aes.i (revision 695) -+++ SWIG/_aes.i (working copy) -@@ -76,7 +76,7 @@ - AES_encrypt((const unsigned char *)in, out, key); - else - AES_decrypt((const unsigned char *)in, out, key); -- return PyString_FromStringAndSize(out, outlen); -+ return PyString_FromStringAndSize((char*)out, outlen); - } - - int AES_type_check(AES_KEY *key) { -Index: SWIG/_util.i -=================================================================== ---- SWIG/_util.i (revision 695) -+++ SWIG/_util.i (working copy) -@@ -48,7 +48,7 @@ - PyErr_SetString(_util_err, ERR_reason_error_string(ERR_get_error())); - return NULL; - } -- obj = PyString_FromStringAndSize(ret, len); -+ obj = PyString_FromStringAndSize((char*)ret, len); - OPENSSL_free(ret); - return obj; - } -Index: SWIG/_m2crypto.i -=================================================================== ---- SWIG/_m2crypto.i (revision 695) -+++ SWIG/_m2crypto.i (working copy) -@@ -38,6 +38,19 @@ - #define CONST098 - #endif - -+/* Bring in STACK_OF macro definition */ -+%include <openssl/safestack.h> -+ -+/* Bring in LHASH_OF macro definition */ -+/* XXX Can't include lhash.h where LHASH_OF is defined, because it includes -+ XXX stdio.h etc. which we fail to include. So we have to (re)define -+ XXX LHASH_OF here instead. -+%include <openssl/lhash.h> -+*/ -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+#define LHASH_OF(type) struct lhash_st_##type -+#endif -+ - %include constraints.i - %include _threads.i - %include _lib.i -Index: SWIG/_rand.i -=================================================================== ---- SWIG/_rand.i (revision 695) -+++ SWIG/_rand.i (working copy) -@@ -87,7 +87,7 @@ - Py_INCREF(Py_None); - return Py_None; - } else { -- PyTuple_SET_ITEM(tuple, 0, PyString_FromStringAndSize(blob, n)); -+ PyTuple_SET_ITEM(tuple, 0, PyString_FromStringAndSize((char*)blob, n)); - PyMem_Free(blob); - PyTuple_SET_ITEM(tuple, 1, PyInt_FromLong((long)ret)); - return tuple; -Index: SWIG/_pkcs7.i -=================================================================== ---- SWIG/_pkcs7.i (revision 695) -+++ SWIG/_pkcs7.i (working copy) -@@ -12,7 +12,7 @@ - %apply Pointer NONNULL { EVP_CIPHER * }; - %apply Pointer NONNULL { EVP_PKEY * }; - %apply Pointer NONNULL { PKCS7 * }; --%apply Pointer NONNULL { STACK * }; -+%apply Pointer NONNULL { STACK_OF(X509) * }; - %apply Pointer NONNULL { X509 * }; - - %rename(pkcs7_new) PKCS7_new; -@@ -54,8 +54,8 @@ - - %threadallow pkcs7_encrypt; - %inline %{ --PKCS7 *pkcs7_encrypt(STACK *stack, BIO *bio, EVP_CIPHER *cipher, int flags) { -- return PKCS7_encrypt((STACK_OF(X509) *)stack, bio, cipher, flags); -+PKCS7 *pkcs7_encrypt(STACK_OF(X509) *stack, BIO *bio, EVP_CIPHER *cipher, int flags) { -+ return PKCS7_encrypt(stack, bio, cipher, flags); - } - - PyObject *pkcs7_decrypt(PKCS7 *pkcs7, EVP_PKEY *pkey, X509 *cert, int flags) { -@@ -96,14 +96,14 @@ - - %threadallow pkcs7_sign1; - %inline %{ --PKCS7 *pkcs7_sign1(X509 *x509, EVP_PKEY *pkey, STACK *stack, BIO *bio, int flags) { -- return PKCS7_sign(x509, pkey, (STACK_OF(X509) *)stack, bio, flags); -+PKCS7 *pkcs7_sign1(X509 *x509, EVP_PKEY *pkey, STACK_OF(X509) *stack, BIO *bio, int flags) { -+ return PKCS7_sign(x509, pkey, stack, bio, flags); - } - %} - - %threadallow pkcs7_verify1; - %inline %{ --PyObject *pkcs7_verify1(PKCS7 *pkcs7, STACK *stack, X509_STORE *store, BIO *data, int flags) { -+PyObject *pkcs7_verify1(PKCS7 *pkcs7, STACK_OF(X509) *stack, X509_STORE *store, BIO *data, int flags) { - int outlen; - char *outbuf; - BIO *bio; -@@ -113,7 +113,7 @@ - PyErr_SetString(PyExc_MemoryError, "pkcs7_verify1"); - return NULL; - } -- if (!PKCS7_verify(pkcs7, (STACK_OF(X509) *)stack, store, data, bio, flags)) { -+ if (!PKCS7_verify(pkcs7, stack, store, data, bio, flags)) { - PyErr_SetString(_pkcs7_err, ERR_reason_error_string(ERR_get_error())); - BIO_free(bio); - return NULL; -@@ -131,7 +131,7 @@ - return ret; - } - --PyObject *pkcs7_verify0(PKCS7 *pkcs7, STACK *stack, X509_STORE *store, int flags) { -+PyObject *pkcs7_verify0(PKCS7 *pkcs7, STACK_OF(X509) *stack, X509_STORE *store, int flags) { - return pkcs7_verify1(pkcs7, stack, store, NULL, flags); - } - %} -@@ -229,7 +229,7 @@ - } - - /* return STACK_OF(X509)* */ --STACK *pkcs7_get0_signers(PKCS7 *p7, STACK *certs, int flags) { -+STACK_OF(X509) *pkcs7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs, int flags) { - return PKCS7_get0_signers(p7, certs, flags); - } - diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD index b37c9e8b1..b73a8d808 100644 --- a/extra/sane/PKGBUILD +++ b/extra/sane/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182410 2013-04-10 07:43:35Z tpowa $ +# $Id: PKGBUILD 185795 2013-05-19 09:05:59Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Simo L. <neotuli@yahoo.com> @@ -6,7 +6,7 @@ pkgname=sane pkgver=1.0.23 -pkgrel=4 +pkgrel=5 pkgdesc="Scanner Access Now Easy" url="http://www.sane-project.org/" arch=('i686' 'x86_64') @@ -34,7 +34,7 @@ prepare() { build() { cd "${srcdir}/${pkgname}-backends-${pkgver}" - ./configure --prefix=/usr \ + ./configure --prefix=/usr --sbindir=/usr/bin \ --sysconfdir=/etc \ --localstatedir=/var \ --with-docdir=/usr/share/doc/sane \ @@ -69,8 +69,8 @@ package () { "${pkgdir}/usr/lib/systemd/system/saned@.service" } md5sums=('e226a89c54173efea80e91e9a5eb6573' - '5f519030392d599e2ad348159ec4c96f' + 'bc2c8b4f7b3012c8936c7da21f60e2ac' 'e57e9e15528f47f5f1b3f1411135ed5d' - 'e44bd4c994a52d6f472463d1eb0a03be' + '3f9fe36b0c4ff0b01b53b1cffa5d9700' 'e65dbefb7c3d69955fb6eb3ace14aa12' '44e77692c52db15b0f530a1d9a8e1296') diff --git a/extra/sane/sane.xinetd b/extra/sane/sane.xinetd index 67f08a656..311ca6202 100644 --- a/extra/sane/sane.xinetd +++ b/extra/sane/sane.xinetd @@ -5,7 +5,7 @@ service sane-port wait = no user = nobody group = scanner - server = /usr/sbin/saned + server = /usr/bin/saned # disabled by default! disable = yes } diff --git a/extra/sane/saned.service b/extra/sane/saned.service index 69e833e7e..6b2a3f7a7 100644 --- a/extra/sane/saned.service +++ b/extra/sane/saned.service @@ -3,6 +3,6 @@ Description=Scanner Service [Service] Group=scanner -ExecStart=/usr/sbin/saned +ExecStart=/usr/bin/saned StandardInput=socket StandardError=syslog diff --git a/extra/smartmontools/PKGBUILD b/extra/smartmontools/PKGBUILD index 09337c78a..10eb11338 100644 --- a/extra/smartmontools/PKGBUILD +++ b/extra/smartmontools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183306 2013-04-21 10:49:31Z giovanni $ +# $Id: PKGBUILD 185826 2013-05-19 13:29:06Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: Jani Talikka <jani.talikka@gmail.com> @@ -6,7 +6,7 @@ pkgname=smartmontools pkgver=6.1 -pkgrel=2 +pkgrel=3 pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives" url="http://smartmontools.sourceforge.net" license=('GPL') @@ -24,6 +24,7 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --sysconfdir=/etc \ --enable-drivedb \ --with-libcap-ng=yes \ diff --git a/extra/tcpdump/PKGBUILD b/extra/tcpdump/PKGBUILD index 9dd06afab..9fe48df7c 100644 --- a/extra/tcpdump/PKGBUILD +++ b/extra/tcpdump/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184005 2013-04-30 18:42:55Z giovanni $ +# $Id: PKGBUILD 185812 2013-05-19 11:54:46Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=tcpdump pkgver=4.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="A tool for network monitoring and data acquisition" arch=('i686' 'x86_64') url="http://www.tcpdump.org" @@ -13,7 +13,7 @@ depends=('libpcap' 'openssl') source=("http://www.tcpdump.org/release/${pkgname}-${pkgver}.tar.gz" 'tcpdump_duplicate_executable.patch') md5sums=('6f75aabcffd012f73bd7c331bb5d8232' - '96c116e5ed51759a029bb6c236d63178') + '01379e4a12a208ce951c6c2abe80300f') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -22,6 +22,7 @@ build() { patch -Np1 -i "${srcdir}/tcpdump_duplicate_executable.patch" ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --enable-ipv6 make } diff --git a/extra/tcpdump/tcpdump_duplicate_executable.patch b/extra/tcpdump/tcpdump_duplicate_executable.patch index bb3e60f1a..f3efb6d40 100644 --- a/extra/tcpdump/tcpdump_duplicate_executable.patch +++ b/extra/tcpdump/tcpdump_duplicate_executable.patch @@ -1,6 +1,6 @@ ---- a/Makefile.in 2012-06-12 18:56:20.000000000 +0200 -+++ b/Makefile.in 2012-06-13 08:41:09.000000000 +0200 -@@ -409,7 +409,6 @@ +--- a/Makefile.in 2013-03-24 22:49:18.000000000 +0100 ++++ b/Makefile.in 2013-05-19 13:44:29.000000000 +0200 +@@ -326,7 +326,6 @@ [ -d $(DESTDIR)$(sbindir) ] || \ (mkdir -p $(DESTDIR)$(sbindir); chmod 755 $(DESTDIR)$(sbindir)) $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG) diff --git a/extra/vamp-plugin-sdk/PKGBUILD b/extra/vamp-plugin-sdk/PKGBUILD index 1e8fc0fff..9b09b1507 100644 --- a/extra/vamp-plugin-sdk/PKGBUILD +++ b/extra/vamp-plugin-sdk/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 164737 2012-08-04 10:47:06Z schiv $ +# $Id: PKGBUILD 185824 2013-05-19 13:06:56Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Orivej Desh <smpuj@bk.ru> pkgname=vamp-plugin-sdk -pkgver=2.4 +pkgver=2.5 +_dir=690 pkgrel=1 pkgdesc="The Vamp audio analysis plug-in system" arch=('i686' 'x86_64') url="http://www.vamp-plugins.org/" license=('BSD') depends=('gcc-libs' 'libsndfile') -#options=('!libtool') -source=("http://code.soundsoftware.ac.uk/attachments/download/517/$pkgname-$pkgver.tar.gz") -md5sums=('4bd75ca4515c141cd8776bdb59066261') +options=('!libtool') +source=("http://code.soundsoftware.ac.uk/attachments/download/$_dir/$pkgname-$pkgver.tar.gz") +md5sums=('199872997f74951f6769b982bf0d0646') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/vpnc/PKGBUILD b/extra/vpnc/PKGBUILD index a181b20b6..45d6b28e1 100644 --- a/extra/vpnc/PKGBUILD +++ b/extra/vpnc/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 164259 2012-07-29 01:13:10Z dreisner $ +# $Id: PKGBUILD 185907 2013-05-19 18:45:48Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=vpnc _vpncver=0.5.3 -_git=1b65c39e3cdebb89ce5c75f05d44a0519a67ede6 -pkgver=$_vpncver.svn516 -pkgrel=3 +_git=d2c5a77f3f0ea6ad80fc59158127d63ede81a6cb +pkgver=$_vpncver.svn527 +pkgrel=1 pkgdesc="VPN client for cisco3000 VPN Concentrators" url="http://www.unix-ag.uni-kl.de/~massar/vpnc/" license=('GPL') @@ -17,8 +17,8 @@ source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz" "http://git.infradead.org/users/dwmw2/vpnc-scripts.git/blob_plain/$_git:/vpnc-script" 'vpnc.conf') backup=('etc/vpnc/default.conf') -md5sums=('2118c5ccc464250c0892be57dbfabdf7' - '6293c15ef6e7a3365ed7add5e336b806' +md5sums=('db1908bc5cf2b70334c9f74a597a4623' + '70198474faf36a84beaa11136f6c4d9c' 'a3f4e0cc682f437e310a1c86ae198e45') mktarball() { @@ -52,7 +52,7 @@ build() { package() { cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" PREFIX=/usr install + make DESTDIR="$pkgdir" PREFIX=/usr SBINDIR=/usr/bin install install -Dm644 "$srcdir"/vpnc.conf "$pkgdir"/etc/vpnc/default.conf install -Dm755 "$srcdir"/vpnc-script "$pkgdir"/etc/vpnc/vpnc-script diff --git a/extra/x2goserver/PKGBUILD b/extra/x2goserver/PKGBUILD index 25d8a829b..92b719de6 100644 --- a/extra/x2goserver/PKGBUILD +++ b/extra/x2goserver/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180593 2013-03-24 09:34:13Z andyrtr $ +# $Id: PKGBUILD 185846 2013-05-19 15:18:38Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Gerhard Brauer <gerbra@archlinux.de> @@ -7,7 +7,7 @@ # Contributor: Milan Knížek <knizek@volny.cz> pkgname=x2goserver -pkgver=4.0.0.1 +pkgver=4.0.0.2 pkgrel=1 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') @@ -20,12 +20,12 @@ options=('emptydirs') install=x2goserver.install backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz x2goserver.service) -md5sums=('85dc2a2d52e82eead744a51007155ff9' - 'b09799f9203150dc1277a56058be48a8') +md5sums=('6b8cecfdd31a8877203f50d3666c265f' + 'f76081c01e40b6206895d194dc949707') build() { cd "${srcdir}/${pkgname}-${pkgver}" - +#return 1 # -r option does not exist in Arch linux # (However, html man pages do not get installed anyway...) for Makefile in $(find . -type f -name Makefile); do @@ -43,7 +43,7 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make -j1 PREFIX=/usr DESTDIR="$pkgdir" install + make -j1 PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" install # systemd service file - only runs x2gocleansessions install -Dm 644 "$srcdir/x2goserver.service" "$pkgdir/usr/lib/systemd/system/x2goserver.service" diff --git a/extra/x2goserver/x2goserver.service b/extra/x2goserver/x2goserver.service index 393d841c5..f06d39499 100644 --- a/extra/x2goserver/x2goserver.service +++ b/extra/x2goserver/x2goserver.service @@ -3,7 +3,7 @@ Description=x2go - remote desktop server After=syslog.target network.target [Service] -ExecStart=/usr/sbin/x2gocleansessions +ExecStart=/usr/bin/x2gocleansessions PIDFile=/run/x2goserver.pid [Install] diff --git a/extra/xsane/PKGBUILD b/extra/xsane/PKGBUILD index 0b0257f22..bc68f6eb5 100644 --- a/extra/xsane/PKGBUILD +++ b/extra/xsane/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184456 2013-05-06 19:40:28Z foutrelis $ +# $Id: PKGBUILD 185793 2013-05-19 08:52:55Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgbase=xsane pkgname=('xsane' 'xsane-gimp') pkgver=0.998 -pkgrel=4 +pkgrel=5 arch=(i686 x86_64) url="http://www.xsane.org" license=('GPL2') @@ -15,11 +15,15 @@ source=(http://www.xsane.org/download/$pkgname-$pkgver.tar.gz md5sums=('936f1cc76b37caa8f285e1e15ac7e0aa' '15541ff0ddc10acfa2059cf99d5478eb') -build() { - cd "$srcdir/$pkgbase-$pkgver" +prepare() { + cd "$srcdir/$pkgname-$pkgver" # fix use "xdg-open" instead of "netscape" to launch help browser - taken from Fedora - patch -Np1 -i "${srcdir}/xsane-0.995-xdg-open.patch" + patch -Np1 -i ${srcdir}/xsane-0.995-xdg-open.patch sed -i -e 's:png_ptr->jmpbuf:png_jmpbuf(png_ptr):' src/xsane-save.c +} + +build() { + cd "$srcdir/$pkgbase-$pkgver" ./configure --prefix=/usr \ --mandir=/usr/share/man \ @@ -29,7 +33,7 @@ build() { # build again with gimp enabled make clean - ./configure --prefix=/usr --mandir=/usr/share/man --disable-gimp + ./configure --prefix=/usr --sbindir=/usr/bin --mandir=/usr/share/man --disable-gimp make } @@ -49,9 +53,10 @@ package_xsane-gimp() { install -D -m755 src/xsane-gimp "${pkgdir}/usr/bin/xsane-gimp" ## For making Gimp Plugin available - /bin/mkdir -p "$pkgdir/usr/lib/gimp/2.0/plug-ins" - cd "$pkgdir/usr/lib/gimp/2.0/plug-ins/" - /bin/ln -s ../../../../bin/xsane-gimp xsane + mkdir -p "$pkgdir/usr/lib/gimp/2.0/plug-ins" + ln -sf /usr/bin/xsane-gimp $pkgdir/usr/lib/gimp/2.0/plug-ins/xsane + #cd "$pkgdir/usr/lib/gimp/2.0/plug-ins/" + #/bin/ln -s ../../../../bin/xsane-gimp xsane # http://cvs.fedoraproject.org/viewvc/rpms/xsane/devel/xsane.spec?revision=1.80&view=markup # when makepkg will allow splitted pkg install file support we might change add a xsane-gimp.install file with the commands that are used by fedora, |