diff options
59 files changed, 1246 insertions, 148 deletions
diff --git a/community-staging/motion/PKGBUILD b/community-staging/motion/PKGBUILD new file mode 100644 index 000000000..8387624c0 --- /dev/null +++ b/community-staging/motion/PKGBUILD @@ -0,0 +1,81 @@ +# $Id: PKGBUILD 72669 2012-06-18 22:08:51Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=motion +pkgver=3.2.12 +pkgrel=5 +pkgdesc="A software motion detector which grabs images from video4linux devices and/or from webcams" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome" +depends=('libjpeg' 'v4l-utils') + +# ffmpeg workaround +depends=(${depends[@]} speex libpulse bzip2 lame xvidcore opencore-amr libvpx libva sdl openjpeg rtmpdump gsm schroedinger libtheora x264) +makedepends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg + rtmpdump schroedinger sdl speex x264 xvidcore zlib yasm libvdpau) + +backup=('etc/motion/motion.conf') +options=('!makeflags') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz + rc.motion + ffmpeg-0.8.patch + linux-headers.patch + ftp://ftp.archlinux.org/other/ffmpeg/ffmpeg-20120509.tar.xz) +md5sums=('1ba0065ed50509aaffb171594c689f46' + '2e8c53c4980edddd420f08fdd572c9be' + 'd36687710837d69fbce4608b1345fa34' + 'd8c3c4fdded5cfbd729710475559a21d' + 'a35359e424608f369d380f03e4dc9966') + +build() { + cd $srcdir/ffmpeg + ./configure \ + --prefix=$srcdir/ffmpeg \ + --enable-libmp3lame \ + --enable-libvorbis \ + --enable-libxvid \ + --enable-libx264 \ + --enable-libvpx \ + --enable-libtheora \ + --enable-libgsm \ + --enable-libspeex \ + --enable-postproc \ + --enable-x11grab \ + --enable-libopencore_amrnb \ + --enable-libopencore_amrwb \ + --enable-libschroedinger \ + --enable-libopenjpeg \ + --enable-librtmp \ + --enable-libpulse \ + --enable-gpl \ + --enable-version3 \ + --enable-runtime-cpudetect \ + --disable-debug \ + --enable-static \ + --disable-shared + make + make install + + + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i $srcdir/ffmpeg-0.8.patch + patch -Np1 -i $srcdir/linux-headers.patch + + # ffmpeg workaround + export LDFLAGS="-ldl -lX11 -lXext -lXfixes -lva -lasound -lSDL -lpthread -lxvidcore -lx264 -lvpx -lvpx -lvorbisenc -lvorbis -logg -ltheoraenc -ltheoradec -logg -lspeex -lschroedinger-1.0 -lrtmp -lz -lssl -lcrypto -lpulse-simple -lpulse -lopenjpeg -lopencore-amrwb -lopencore-amrnb -lmp3lame -lgsm -lm -pthread -lbz2 -lz" + + ./configure --prefix=/usr \ + --without-pgsql \ + --without-mysql \ + --sysconfdir=/etc/motion \ + --with-ffmpeg=$srcdir/ffmpeg + make +} + +package(){ + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + mv "${pkgdir}/etc/motion/motion-dist.conf" "${pkgdir}/etc/motion/motion.conf" + install -Dm755 "${srcdir}/rc.motion" "${pkgdir}/etc/rc.d/motion" +} diff --git a/community-staging/motion/ffmpeg-0.8.patch b/community-staging/motion/ffmpeg-0.8.patch new file mode 100644 index 000000000..5dcc6e686 --- /dev/null +++ b/community-staging/motion/ffmpeg-0.8.patch @@ -0,0 +1,112 @@ +diff -aur motion-3.2.12/ffmpeg.c motion-3.2.12.new/ffmpeg.c +--- motion-3.2.12/ffmpeg.c 2010-06-01 08:48:23.000000000 +0200 ++++ motion-3.2.12.new/ffmpeg.c 2011-10-31 17:25:03.000000000 +0100 +@@ -14,7 +14,7 @@ + + #include "ffmpeg.h" + #include "motion.h" +- ++#include <libavformat/avformat.h> + #if LIBAVCODEC_BUILD > 4680 + /* FFmpeg after build 4680 doesn't have support for mpeg1 videos with + * non-standard framerates. Previous builds contained a broken hack +@@ -228,10 +228,12 @@ + mpeg1_file_protocol.url_close = file_protocol.url_close; + + /* Register the append file protocol. */ +-#if LIBAVFORMAT_BUILD >= (52<<16 | 31<<8) +- av_register_protocol(&mpeg1_file_protocol); ++#ifdef have_av_register_protocol2 ++ av_register_protocol2(&mpeg1_file_protocol, sizeof(mpeg1_file_protocol)); ++#elif defined have_av_register_protocol ++ av_register_protocol(&mpeg1_file_protocol); + #else +- register_protocol(&mpeg1_file_protocol); ++# warning av_register_protocolXXX missing + #endif + } + +@@ -244,7 +246,7 @@ + const char *ext; + AVOutputFormat *of = NULL; + +- /* Here, we use guess_format to automatically setup the codec information. ++ /* Here, we use av_guess_format to automatically setup the codec information. + * If we are using msmpeg4, manually set that codec here. + * We also dynamically add the file extension to the filename here. This was + * done to support both mpeg1 and mpeg4 codecs since they have different extensions. +@@ -258,7 +260,7 @@ + /* We use "mpeg1video" for raw mpeg1 format. Using "mpeg" would + * result in a muxed output file, which isn't appropriate here. + */ +- of = guess_format("mpeg1video", NULL, NULL); ++ of = av_guess_format("mpeg1video", NULL, NULL); + if (of) { + /* But we want the trailer to be correctly written. */ + of->write_trailer = mpeg1_write_trailer; +@@ -270,24 +272,24 @@ + #endif + } else if (strcmp(codec, "mpeg4") == 0) { + ext = ".avi"; +- of = guess_format("avi", NULL, NULL); ++ of = av_guess_format("avi", NULL, NULL); + } else if (strcmp(codec, "msmpeg4") == 0) { + ext = ".avi"; +- of = guess_format("avi", NULL, NULL); ++ of = av_guess_format("avi", NULL, NULL); + if (of) { + /* Manually override the codec id. */ + of->video_codec = CODEC_ID_MSMPEG4V2; + } + } else if (strcmp(codec, "swf") == 0) { + ext = ".swf"; +- of = guess_format("swf", NULL, NULL); ++ of = av_guess_format("swf", NULL, NULL); + } else if (strcmp(codec, "flv") == 0) { + ext = ".flv"; +- of = guess_format("flv", NULL, NULL); ++ of = av_guess_format("flv", NULL, NULL); + of->video_codec = CODEC_ID_FLV1; + } else if (strcmp(codec, "ffv1") == 0) { + ext = ".avi"; +- of = guess_format("avi", NULL, NULL); ++ of = av_guess_format("avi", NULL, NULL); + if (of) { + /* Use the FFMPEG Lossless Video codec (experimental!). + Requires strict_std_compliance to be <= -2 */ +@@ -295,7 +297,7 @@ + } + } else if (strcmp(codec, "mov") == 0) { + ext = ".mov"; +- of = guess_format("mov", NULL, NULL); ++ of = av_guess_format("mov", NULL, NULL); + } else { + motion_log(LOG_ERR, 0, "ffmpeg_video_codec option value %s is not supported", codec); + return NULL; +@@ -377,7 +379,7 @@ + + ffmpeg->c = c = AVSTREAM_CODEC_PTR(ffmpeg->video_st); + c->codec_id = ffmpeg->oc->oformat->video_codec; +- c->codec_type = CODEC_TYPE_VIDEO; ++ c->codec_type = AVMEDIA_TYPE_VIDEO; + is_mpeg1 = c->codec_id == CODEC_ID_MPEG1VIDEO; + + if (strcmp(ffmpeg_video_codec, "ffv1") == 0) +@@ -646,7 +648,7 @@ + if (ffmpeg->oc->oformat->flags & AVFMT_RAWPICTURE) { + /* raw video case. The API will change slightly in the near future for that */ + #ifdef FFMPEG_AVWRITEFRAME_NEWAPI +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + pkt.data = (uint8_t *)pic; + pkt.size = sizeof(AVPicture); + ret = av_write_frame(ffmpeg->oc, &pkt); +@@ -667,7 +669,7 @@ + #ifdef FFMPEG_AVWRITEFRAME_NEWAPI + pkt.pts = AVSTREAM_CODEC_PTR(ffmpeg->video_st)->coded_frame->pts; + if (AVSTREAM_CODEC_PTR(ffmpeg->video_st)->coded_frame->key_frame) { +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + } + pkt.data = ffmpeg->video_outbuf; + pkt.size = out_size; diff --git a/community-staging/motion/linux-headers.patch b/community-staging/motion/linux-headers.patch new file mode 100644 index 000000000..795c8aec5 --- /dev/null +++ b/community-staging/motion/linux-headers.patch @@ -0,0 +1,35 @@ +diff -urN motion-3.2.12-OLD/motion.h motion-3.2.12-NEW/motion.h +--- motion-3.2.12-OLD/motion.h 2010-05-31 23:48:23.000000000 -0700 ++++ motion-3.2.12-NEW/motion.h 2011-08-30 02:11:08.000000000 -0700 +@@ -40,7 +40,7 @@ + + #define _LINUX_TIME_H 1 + #if !defined(WITHOUT_V4L) && !defined(BSD) +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + #endif + + #include <pthread.h> +diff -urN motion-3.2.12-OLD/track.c motion-3.2.12-NEW/track.c +--- motion-3.2.12-OLD/track.c 2010-05-31 23:48:23.000000000 -0700 ++++ motion-3.2.12-NEW/track.c 2011-08-30 23:05:09.000000000 -0700 +@@ -11,6 +11,7 @@ + #include "motion.h" + + #ifndef WITHOUT_V4L ++#include <linux/videodev2.h> + #include "pwc-ioctl.h" + #endif + +diff -urN motion-3.2.12-OLD/video.h motion-3.2.12-NEW/video.h +--- motion-3.2.12-OLD/video.h 2010-05-31 23:48:23.000000000 -0700 ++++ motion-3.2.12-NEW/video.h 2011-08-30 02:11:12.000000000 -0700 +@@ -12,7 +12,7 @@ + + #define _LINUX_TIME_H 1 + #ifndef WITHOUT_V4L +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + #include <sys/mman.h> + #include "pwc-ioctl.h" + #endif diff --git a/community-staging/motion/rc.motion b/community-staging/motion/rc.motion new file mode 100644 index 000000000..5b4c65500 --- /dev/null +++ b/community-staging/motion/rc.motion @@ -0,0 +1,37 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/bin/motion` +case "$1" in + start) + stat_busy "Starting Motion" + mkdir -p /var/run/motion + [ -z "$PID" ] && /usr/bin/motion 1>/dev/null 2>&1 + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon motion + stat_done + fi + ;; + stop) + stat_busy "Stopping Motion" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon motion + stat_done + fi + ;; + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/nginx/PKGBUILD b/community-staging/nginx/PKGBUILD index d80079ac9..ad83f970c 100644 --- a/community-staging/nginx/PKGBUILD +++ b/community-staging/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72617 2012-06-17 14:06:19Z bpiotrowski $ +# $Id: PKGBUILD 72652 2012-06-18 15:34:27Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Bartłomiej Piotrowski <barthalion@gmal.com> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> diff --git a/community/ecryptfs-utils/PKGBUILD b/community/ecryptfs-utils/PKGBUILD index f6fbf591c..f566c9b71 100644 --- a/community/ecryptfs-utils/PKGBUILD +++ b/community/ecryptfs-utils/PKGBUILD @@ -1,28 +1,24 @@ -# $Id: PKGBUILD 71565 2012-05-29 11:01:34Z tredaelli $ +# $Id: PKGBUILD 72650 2012-06-18 12:31:36Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: Richard Murri <admin@richardmurri.com> # Contributor: Michal Krenek <mikos@sg1.cz> pkgname=ecryptfs-utils -pkgver=96 -pkgrel=3 +pkgver=97 +pkgrel=1 arch=('i686' 'x86_64') pkgdesc="Enterprise-class stacked cryptographic filesystem for Linux" url="https://launchpad.net/ecryptfs" license=('GPL') makedepends=('swig' 'intltool' 'gettext') depends=('keyutils' 'nss' 'python2') -source=("http://launchpad.net/ecryptfs/trunk/${pkgver}/+download/${pkgname}_${pkgver}.orig.tar.gz" - symlinked_mtab.patch) +source=("http://launchpad.net/ecryptfs/trunk/${pkgver}/+download/${pkgname}_${pkgver}.orig.tar.gz") options=(!libtool) -md5sums=('4f92c9f6e8f62ac00ca7e2c4e480f1d7' - '7740ed69601cfc75bb96c9ad072dfdb4') +md5sums=('74e8cacd5fa641075419ec02f6312421') build() { cd "$srcdir/${pkgname}-${pkgver}" ./configure --prefix=/usr --with-pamdir=/usr/lib/security PYTHON=python2 - # Apply patch to detect if /etc/mtab is a symlink. - patch src/libecryptfs/main.c < "$srcdir/symlinked_mtab.patch" make } diff --git a/community/geany-plugins/PKGBUILD b/community/geany-plugins/PKGBUILD index 5efc9f951..ec2a6626a 100644 --- a/community/geany-plugins/PKGBUILD +++ b/community/geany-plugins/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 57822 2011-11-03 10:07:17Z arodseth $ +# $Id: PKGBUILD 72667 2012-06-18 20:30:29Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: djgera # Contributor: Patrick Melo <patrick@patrickmelo.eti.br> + pkgname=geany-plugins -pkgver=0.21 +pkgver=0.21.1 pkgrel=2 pkgdesc="Combined plugins release for Geany" arch=('x86_64' 'i686') url="http://plugins.geany.org/" license=('GPL') -depends=('geany' 'lua' 'gtkspell' 'libwebkit' 'hicolor-icon-theme' 'ctpl' 'gpgme') +depends=('geany=1.22' 'lua' 'gtkspell' 'libwebkit' 'hicolor-icon-theme' 'ctpl' 'gpgme') makedepends=('intltool') optdepends=('hspell: hebrew spell checker') -conflicts=('geany-plugins-svn') install=geany-plugins.install source=("http://plugins.geany.org/geany-plugins/$pkgname-$pkgver.tar.bz2") -md5sums=('22e106d7a026e720dd91feb79e44456f') +sha256sums=('3a4bd29e690067ca5b97c11a74ea95ad0c960e5d45b205756c1f9e1f0f2847a6') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/geany-plugins/geany-plugins.install b/community/geany-plugins/geany-plugins.install index c5a602e43..f26807673 100644 --- a/community/geany-plugins/geany-plugins.install +++ b/community/geany-plugins/geany-plugins.install @@ -1,5 +1,3 @@ -pkgname=geany-plugins - post_upgrade() { gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor } diff --git a/community/geany/PKGBUILD b/community/geany/PKGBUILD index 017d718b2..cfce909ce 100644 --- a/community/geany/PKGBUILD +++ b/community/geany/PKGBUILD @@ -1,12 +1,13 @@ -# $Id: PKGBUILD 57809 2011-11-03 09:42:30Z arodseth $ +# $Id: PKGBUILD 72665 2012-06-18 19:58:17Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Ionut Biru <ibiru@archlinux.ro> # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Allan McRae <mcrae_allan@hotmail.com> + pkgname=geany -pkgver=0.21 -pkgrel=2 +pkgver=1.22 +pkgrel=1 pkgdesc="Fast and lightweight IDE" arch=('x86_64' 'i686') url="http://www.geany.org/" @@ -15,9 +16,9 @@ depends=('gtk2' 'hicolor-icon-theme' 'desktop-file-utils' 'python2') makedepends=('perlxml' 'intltool') optdepends=("vte: for terminal support") install=geany.install -source=("http://download.geany.org/$pkgname-$pkgver.tar.gz") +source=("http://download.geany.org/$pkgname-$pkgver.tar.bz2") options=('!libtool') -md5sums=('d2734776badc3f5f9a778814ed56fb8a') +sha256sums=('901a35a7395ef10a80fb10b3ab63bae3871693a4e82d56388e9521a27877577e') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/geany/geany.install b/community/geany/geany.install index 4cd573a65..661157760 100644 --- a/community/geany/geany.install +++ b/community/geany/geany.install @@ -1,5 +1,3 @@ -pkgname=geany - post_upgrade() { gtk-update-icon-cache -q -t -f usr/share/icons/hicolor update-desktop-database -q diff --git a/community/libcec/PKGBUILD b/community/libcec/PKGBUILD index e14ac932e..8d0d849df 100644 --- a/community/libcec/PKGBUILD +++ b/community/libcec/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71688 2012-06-01 13:05:00Z dreisner $ +# $Id: PKGBUILD 72656 2012-06-18 17:44:25Z idevolder $ # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> # Contributor: Philippe Cherel <philippe.cherel@mayenne.org> pkgname=libcec -pkgver=1.6.3 +pkgver=1.7.0 pkgrel=1 pkgdesc="Pulse-Eight's libcec for the Pulse-Eight USB-CEC adapter" arch=('i686' 'x86_64') @@ -11,8 +11,8 @@ url="https://github.com/Pulse-Eight/libcec" license=('GPL') depends=('udev' 'lockdev') source=("$pkgname-$pkgver.tar.gz::https://github.com/Pulse-Eight/libcec/tarball/$pkgname-$pkgver") -_srcfolder=Pulse-Eight-libcec-ab37938 -sha256sums=('964fb7ad2281b44dacddd57e5cfc16750271492cbbf48291ee487644d69bcb61') +_srcfolder=Pulse-Eight-libcec-b9761e8 +sha256sums=('28ed8c326bbe1c181f4f4c41660e2f1f6097494647f05a51b30a6034b8171b30') options=(!libtool) build() { diff --git a/community/mashup/PKGBUILD b/community/mashup/PKGBUILD index 6228acf07..6dfd64c16 100644 --- a/community/mashup/PKGBUILD +++ b/community/mashup/PKGBUILD @@ -3,7 +3,7 @@ pkgname=mashup pkgver=3.5 -pkgrel=1 +pkgrel=2 pkgdesc="Adjusting images on a sheet of paper for printing" url="http://kornelix.squarespace.com/$pkgname" arch=('i686' 'x86_64') @@ -11,11 +11,12 @@ license=('GPL3') depends=('gtk3') replaces=('printoxx') source=("http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz") -md5sums=('9ce1e5b734a149e84e4dae366dc2c1c1') +md5sums=('454b08e5589f93b3bdd4577c2578ae36') build() { cd $srcdir/$pkgname-$pkgver sed -i 's+xdg-deskto+#xdg-deskto+' Makefile + sed -i 's/--libs gtk+-3.0/--libs gtk+-3.0 gthread-2.0/' Makefile make PREFIX=/usr } @@ -26,3 +27,4 @@ package() { rm $pkgdir/usr/share/applications/kornelix-$pkgname.desktop rm $pkgdir/usr/share/doc/$pkgname/$pkgname.man } + diff --git a/community/opendkim/PKGBUILD b/community/opendkim/PKGBUILD index bc1001946..99255fa97 100644 --- a/community/opendkim/PKGBUILD +++ b/community/opendkim/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71559 2012-05-29 09:12:52Z spupykin $ +# $Id: PKGBUILD 72633 2012-06-18 09:23:25Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thomas Jost <schnouki@schnouki.net> pkgname=opendkim -pkgver=2.5.2 +pkgver=2.6.0 pkgrel=1 pkgdesc="An open source implementation of the DKIM sender authentication system. Based on a fork of dkim-milter." arch=(i686 x86_64) @@ -17,9 +17,9 @@ install=opendkim.install source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz opendkim.conf opendkim.rc) -md5sums=('3c2a71372ee279b627e3f39c87a0d457' +md5sums=('ad4eb5131642cadd778dc26ed7daacf0' '3e2bb1058ac0662f01e675aa6ac7ee8f' - '1176f086d36e79a834dba1bed0ded397') + '093f5c098a45cc68753f97e45a5b374c') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/opendkim/opendkim.rc b/community/opendkim/opendkim.rc index a3e0790a7..f87bfcfc9 100644 --- a/community/opendkim/opendkim.rc +++ b/community/opendkim/opendkim.rc @@ -1,8 +1,8 @@ #!/bin/bash +. /etc/rc.conf . /etc/rc.d/functions . /etc/conf.d/opendkim -. /etc/rc.conf PID=`pidof -o %PPID /usr/sbin/opendkim` case "$1" in diff --git a/community/remmina/PKGBUILD b/community/remmina/PKGBUILD index f432614c5..3aba94c01 100644 --- a/community/remmina/PKGBUILD +++ b/community/remmina/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72477 2012-06-15 12:20:16Z spupykin $ +# $Id: PKGBUILD 72637 2012-06-18 09:24:39Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=remmina pkgver=1.0.0 -pkgrel=8 -pkgdesc="Remmina is a remote desktop client written in GTK+. " +pkgrel=9 +pkgdesc="remote desktop client written in GTK+" arch=(i686 x86_64) url="http://remmina.sourceforge.net/" license=('GPL') @@ -18,19 +18,38 @@ optdepends=('libxkbfile' replaces=('remmina-plugins') provides=('remmina-plugins') install=remmina.install -source=(https://github.com/downloads/FreeRDP/Remmina/Remmina-$pkgver.tar.gz - 'https://github.com/FreeRDP/Remmina/commit/569d9bb702d06c061dfbbf3c590d57ea83a04369.diff' - 'https://github.com/FreeRDP/Remmina/commit/f7d1038ba358a295fb46c681db5c47e4ead97306.diff' - 'https://github.com/FreeRDP/Remmina/commit/1aebfc027507607d5f061ba9072eb952e07214d1.diff') +source=("https://github.com/downloads/FreeRDP/Remmina/Remmina-$pkgver.tar.gz" + 'https://github.com/FreeRDP/Remmina/commit/569d9bb7.patch' + 'https://github.com/FreeRDP/Remmina/commit/f7d1038b.patch' + 'https://github.com/FreeRDP/Remmina/commit/1aebfc02.patch' + 'https://github.com/FreeRDP/Remmina/commit/3ebdd6e7.patch' + 'https://github.com/FreeRDP/Remmina/commit/97c2af8c.patch' + 'https://github.com/FreeRDP/Remmina/commit/84327f81.patch' + 'https://github.com/FreeRDP/Remmina/commit/c1ef3a16.patch' + 'https://github.com/FreeRDP/Remmina/commit/6ee20289.patch' + 'https://github.com/FreeRDP/Remmina/commit/b2277827.patch' + 'https://github.com/FreeRDP/Remmina/commit/cb0b209b.patch') md5sums=('701c540acaab961bc3adf130a2ddb8b1' - 'a979c898d5e53446cec9d01912ad9243' - 'b2a9c0e80ac7b0c8a26935bbe289aa3b' - 'd7db32f63996df1ea661c7fff24262d4') + '23927a584c23d0da7a893c1f39d53857' + '40f5ce2f30c8ce8ae8a4ebcee52874ab' + 'c842ba295c2327ab4d0819fc4a5bc03f' + '9312b5bf953a63e6203f0d0be6cb8134' + '65bfcc39ae51343b90928ea329cc4900' + '42b971116f887657fc210da70c3afba5' + '04b5bc1190b53211747e097897d1d19c' + 'ce0b538ff850556b2ad8fc4e4736039e' + '3bc1a4e50cdd864c0e2d7c91a1e02e32' + 'b9023ea4f36c31c3d4e98cfc472c1a09') build() { cd ${srcdir}/FreeRDP-Remmina-*/ - patch -p1 -i "${srcdir}/569d9bb702d06c061dfbbf3c590d57ea83a04369.diff" - patch -p1 -i "${srcdir}/f7d1038ba358a295fb46c681db5c47e4ead97306.diff" + + for i in ${source[@]}; do + if [ ${i:(-6)} == ".patch" ]; then + patch -p1 -i "${srcdir}/${i:(-14)}" + fi + done + export LDFLAGS="-lX11 -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lpthread -lgnutls" cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_APPINDICATOR=OFF . make diff --git a/community/soundkonverter/PKGBUILD b/community/soundkonverter/PKGBUILD index 4e14296cf..ed8abccc5 100644 --- a/community/soundkonverter/PKGBUILD +++ b/community/soundkonverter/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 72096 2012-06-08 16:40:09Z stativ $ +# $Id: PKGBUILD 72654 2012-06-18 16:27:25Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Darwin Bautista <djclue917@gmail.com> pkgname=soundkonverter -pkgver=1.6.1 +pkgver=1.6.2 pkgrel=1 pkgdesc="Front-end to various audio converters" arch=('i686' 'x86_64') @@ -31,7 +31,7 @@ optdepends=('cdrkit: cdda2wav backend' 'wavpack: wavpack backend') install=$pkgname.install source=("http://kde-apps.org/CONTENT/content-files/29024-${pkgname}-${pkgver}.tar.gz") -md5sums=('7a92fef5efc67b40358d3a11030bae1f') +md5sums=('268a2620f3e0352bd94eb1f1d668d59f') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/community/xboard/PKGBUILD b/community/xboard/PKGBUILD index 934b0caa3..35eb41181 100644 --- a/community/xboard/PKGBUILD +++ b/community/xboard/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 69790 2012-04-23 09:38:52Z spupykin $ +# $Id: PKGBUILD 72645 2012-06-18 12:05:37Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jason Chu <jason@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=xboard pkgver=4.6.2 -pkgrel=1 +pkgrel=3 pkgdesc="Graphical user interfaces for chess" arch=('i686' 'x86_64') url="http://www.gnu.org/software/xboard/" @@ -13,6 +13,7 @@ license=('GPL3') depends=('libxaw' 'gnuchess' 'texinfo' 'xdg-utils' 'xorg-fonts-75dpi' 'xorg-fonts-100dpi') makedepends=('gendesk') +optdepends=('perl') install=${pkgname}.install source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") md5sums=('6e6d119fac60d68139d7836426212efb') @@ -35,4 +36,6 @@ package() { ${pkgdir}/usr/share/applications/${pkgname}.desktop install -Dm644 ${srcdir}/${pkgname}.png \ ${pkgdir}/usr/share/pixmaps/${pkgname}.png + install -Dm755 ${srcdir}/${pkgname}-${pkgver}/cmail \ + ${pkgdir}/usr/bin/cmail } diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD index cc63ead8b..0d1b43b77 100644 --- a/extra/doxygen/PKGBUILD +++ b/extra/doxygen/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 159263 2012-05-19 22:02:41Z dan $ +# $Id: PKGBUILD 162028 2012-06-19 01:01:27Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgbase=doxygen pkgname=('doxygen' 'doxygen-docs') -pkgver=1.8.1 +pkgver=1.8.1.1 pkgrel=1 license=('GPL') arch=(i686 x86_64) url="http://www.doxygen.org/" makedepends=('gcc-libs' 'flex' 'qt' 'texlive-core' 'ghostscript' 'texlive-latexextra') source=(ftp://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz) -md5sums=('d79e54453b313c3200d2c2bf677edd7d') -sha1sums=('239ae65b521ce09a36a68a48d85a84217233be87') +md5sums=('a08c43c5675f79e0787e700c2d39ee33') +sha1sums=('51184af9f27d6572826581de0da5b6b044e34d94') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 9935cff89..a4902fdd5 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 160963 2012-06-07 14:20:24Z dan $ +# $Id: PKGBUILD 162030 2012-06-19 01:03:02Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.7.10.4 +pkgver=1.7.11 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) @@ -78,7 +78,8 @@ package() { # scripts are for python 2.x sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' \ $(find "$pkgdir" -name '*.py') \ - "$pkgdir"/usr/share/git/{fast-import/git-p4,gitview/gitview} + "$pkgdir"/usr/lib/git-core/git-p4 \ + "$pkgdir"/usr/share/git/gitview/gitview # emacs interface cd contrib/emacs @@ -99,7 +100,7 @@ package() { install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf } -sha1sums=('ddc305ab520246790faa72bbaab4b9bf5bcf23fa' - '0769f6ff48d89df908cfe2af85fb4072b4178746' +sha1sums=('15abe2c5b6b7cf9b738e3fb57ab9234ae02a1e61' + '9f963243dfdbf5d77049e5fbb1e8e571effa4285' 'f2b41828bd912b72e2cb3e14677739c4f370de66' '149e2da1ecb48872ddb31c0945afeaad1f9653d7') diff --git a/extra/ktorrent/PKGBUILD b/extra/ktorrent/PKGBUILD index 96e1b476d..4098d33b7 100644 --- a/extra/ktorrent/PKGBUILD +++ b/extra/ktorrent/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 152453 2012-03-07 14:53:25Z andrea $ +# $Id: PKGBUILD 161994 2012-06-18 07:33:57Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Travis Willard <travisw@wmpub.ca> # Contributor: Georg Grabler <ggrabler@gmail.com> pkgname=ktorrent -pkgver=4.2.0 +pkgver=4.2.1 pkgrel=1 pkgdesc="A powerful BitTorrent client for KDE" arch=('i686' 'x86_64') @@ -15,8 +15,8 @@ makedepends=('automoc4' 'cmake' 'boost') source=("http://ktorrent.org/downloads/${pkgver}/${pkgname}-${pkgver}.tar.bz2" 'httpserver.patch') install=${pkgname}.install -md5sums=('01aa25e1339ffd84776f3c9c27bd4a72' - '1f25b94615b0bbfa0457c99fb20de3e6') +sha1sums=('3f52c4a10011a49d304c08a3bb1290a022e0c53f' + 'cef22b24af540e1bfcf13da60e4846ade106c303') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libidn/PKGBUILD b/extra/libidn/PKGBUILD index 4449c1008..42aaa0949 100644 --- a/extra/libidn/PKGBUILD +++ b/extra/libidn/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 147970 2012-01-29 09:56:25Z ronald $ +# $Id: PKGBUILD 162005 2012-06-18 08:51:29Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Jan de Groot <jgc.archlinux.org> # Contributor: Eric Johnson <eric.archlinux.org> pkgname=libidn -pkgver=1.24 +pkgver=1.25 pkgrel=1 pkgdesc="Implementation of the Stringprep, Punycode and IDNA specifications" url="http://www.gnu.org/software/libidn/" @@ -15,7 +15,7 @@ makedepends=('pkgconfig') options=('!libtool') source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) install=libidn.install -sha1sums=('4251c108966375ede4df15d76a1bd9a4440f44ee') +sha1sums=('92e64fd5a6428bda6ade2c3cde475b76455cd7dd') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/libktorrent/PKGBUILD b/extra/libktorrent/PKGBUILD index bfb489513..1f288045d 100644 --- a/extra/libktorrent/PKGBUILD +++ b/extra/libktorrent/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 152452 2012-03-07 14:52:08Z andrea $ +# $Id: PKGBUILD 161992 2012-06-18 07:10:44Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libktorrent -pkgver=1.2.0 +pkgver=1.2.1 pkgrel=1 pkgdesc="A BitTorrent protocol implementation" arch=('i686' 'x86_64') @@ -11,14 +11,14 @@ url="http://ktorrent.org/" license=('GPL2') depends=('kdelibs') makedepends=('automoc4' 'cmake' 'boost' 'doxygen') -source=("http://ktorrent.org/downloads/4.2.0/${pkgname}-${pkgver}.tar.bz2") -md5sums=('3bd38fc221fe2177dd17b14e2baf60c0') +source=("http://ktorrent.org/downloads/4.2.1/${pkgname}-${pkgver}-2.tar.bz2") +sha1sums=('857e4227c4bba685755d66581d881f893f6311ae') build() { cd "${srcdir}" mkdir build cd build - cmake ../${pkgname}-${pkgver} \ + cmake ../${pkgname}-${pkgver}-2 \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr make diff --git a/extra/miro/PKGBUILD b/extra/miro/PKGBUILD index e177e9d9a..feccf3a3a 100644 --- a/extra/miro/PKGBUILD +++ b/extra/miro/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 158653 2012-05-05 12:58:13Z ronald $ +# $Id: PKGBUILD 161990 2012-06-18 07:02:41Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=miro -pkgver=5.0 +pkgver=5.0.1 pkgrel=1 pkgdesc="The free and open source internet TV platform" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ makedepends=('pkg-config' 'boost') install=miro.install options=('!makeflags') source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz") -sha1sums=('64350e658ac427378b84ff1356adce668ddbd521') +sha1sums=('d8e08c691958c250c990b45f2c8448c478d0f0fa') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD index c61a5e354..3b1ad5813 100644 --- a/extra/nspr/PKGBUILD +++ b/extra/nspr/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 151239 2012-02-25 09:44:23Z ibiru $ +# $Id: PKGBUILD 162022 2012-06-18 22:10:00Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=nspr -pkgver=4.9 +pkgver=4.9.1 pkgrel=1 pkgdesc="Netscape Portable Runtime" arch=(i686 x86_64) @@ -13,7 +13,7 @@ makedepends=('zip') options=(!emptydirs) source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz nspr.pc.in) -md5sums=('aa0c960b23a9d66a3c30c3e6ba80a99a' +md5sums=('d36d7b65a38f5b43ebd50ad3ad227120' 'bce1611f3117b53fc904cab549c09967') build() { diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD index 7193c9d8a..77bc6efca 100644 --- a/extra/nss/PKGBUILD +++ b/extra/nss/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 158536 2012-05-04 10:15:27Z foutrelis $ +# $Id: PKGBUILD 162023 2012-06-18 22:10:13Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=nss -pkgver=3.13.4 -pkgrel=2 +pkgver=3.13.5 +pkgrel=1 pkgdesc="Mozilla Network Security Services" arch=(i686 x86_64) url="http://www.mozilla.org/projects/security/pki/nss/" license=('MPL' 'GPL') -_nsprver=4.9 +_nsprver=4.9.1 depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh') makedepends=('perl') options=('!strip') @@ -18,7 +18,7 @@ source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/s nss-config.in add_spi+cacert_ca_certs.patch ssl-renegotiate-transitional.patch) -sha1sums=('c5a829c3bd56aa743457faf21469065f87c2db75' +sha1sums=('22cfe2cbccc93189699e6eed283eca288b45f6cb' 'c8fcdb153af9d39689243119adb475905a657284' 'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd' 'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c' diff --git a/extra/xf86-video-nouveau/PKGBUILD b/extra/xf86-video-nouveau/PKGBUILD index 9c58482b4..25aa4265e 100644 --- a/extra/xf86-video-nouveau/PKGBUILD +++ b/extra/xf86-video-nouveau/PKGBUILD @@ -1,41 +1,30 @@ -# $Id: PKGBUILD 161904 2012-06-16 12:11:34Z ibiru $ +# $Id: PKGBUILD 162034 2012-06-19 01:44:22Z ibiru $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: buddabrod <buddabrod@gmail.com> pkgname=xf86-video-nouveau -_gitdate=20120615 -pkgver=0.0.16_git${_gitdate} # see configure.ac +pkgver=1.0.1 pkgrel=1 -pkgdesc="Open Source 2D acceleration driver for nVidia cards (experimental)" +pkgdesc="Open Source 2D acceleration driver for nVidia cards" arch=('i686' 'x86_64') -url="http://nouveau.freedesktop.org/wiki/" -license=('GPL') #and MIT, not yet a license file, see http://nouveau.freedesktop.org/wiki/FAQ#head-09f75d03eb30011c754038a3893119a70745de4e +url="http://nouveau.freedesktop.org/" +license=('GPL') depends=('libdrm' 'udev') -optdepends=('nouveau-dri: experimental gallium3d features') +optdepends=('nouveau-dri: experimental gallium3d features') makedepends=('xorg-server-devel' 'xf86driproto') conflicts=('xorg-server<1.11.99.902') options=('!libtool') install=$pkgname.install -source=(ftp://ftp.archlinux.org/other/$pkgname/xf86-video-nouveau-${_gitdate}.tar.bz2) -md5sums=('9ceb49ff436c9a00536490fb1c8bf6d1') - -# source PKGBUILD && mksource -mksource() { - mkdir /tmp/$pkgname-${_gitdate} - pushd /tmp/$pkgname-${_gitdate} - git clone -v --depth 1 git://anongit.freedesktop.org/nouveau/xf86-video-nouveau - cd xf86-video-nouveau - git archive --prefix=xf86-video-nouveau-${_gitdate}/ --format=tar HEAD | bzip2 > /tmp/$pkgname-${_gitdate}/$pkgname-${_gitdate}.tar.bz2 - popd -} +source=($url/release/$pkgname-$pkgver.tar.bz2) +md5sums=('d120bdd4ee9fc3581f3b93e3b31c4574') build() { - cd xf86-video-nouveau-${_gitdate} - ./autogen.sh --prefix=/usr + cd $pkgname-$pkgver + ./configure --prefix=/usr make } package() { - cd xf86-video-nouveau-${_gitdate} + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/xf86-video-nouveau/xf86-video-nouveau.install b/extra/xf86-video-nouveau/xf86-video-nouveau.install index 027154ff3..23cc4cd5b 100644 --- a/extra/xf86-video-nouveau/xf86-video-nouveau.install +++ b/extra/xf86-video-nouveau/xf86-video-nouveau.install @@ -4,13 +4,3 @@ post_install () { ==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more _EOF } - -post_upgrade() { - if [ "`vercmp $2 0.0.15_git20100117-1`" -lt 0 ]; then - cat << _EOF - ==> ATTENTION: Usermode support has been dropped - ==> make sure you use KernelModeSetting (KMS) - ==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more -_EOF - fi -} diff --git a/kde-unstable/libkgapi/PKGBUILD b/kde-unstable/libkgapi/PKGBUILD index 48296bcce..d214bb73a 100644 --- a/kde-unstable/libkgapi/PKGBUILD +++ b/kde-unstable/libkgapi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 161489 2012-06-11 21:02:52Z andrea $ +# $Id: PKGBUILD 162021 2012-06-18 21:49:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkgapi -pkgver=0.4.0 +pkgver=0.4.1 pkgrel=1 pkgdesc="A KDE-based library for accessing various Google services via their public API" url='https://projects.kde.org/projects/kdereview/libkgoogle' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4' 'boost') replaces=('akonadi-google' 'libkgoogle') conflicts=('akonadi-google' 'libkgoogle') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('90c44fd9456a6e34a8375f98250ad7cc') +md5sums=('b4cefa643e95f5670997b5001547988f') build() { cd "${srcdir}" diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD index 3443dacb4..bc59eabdc 100644 --- a/libre/filesystem/PKGBUILD +++ b/libre/filesystem/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 160797 2012-06-06 10:14:15Z dreisner $ +# $Id: PKGBUILD 162078 2012-06-19 14:17:35Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> -# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar> -# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgname=filesystem pkgver=2012.6 -pkgrel=2 +pkgrel=3 pkgdesc='Base filesystem for Parabola' arch=('any') license=('GPL') @@ -19,24 +19,6 @@ backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf' 'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'os-release' 'resolv.conf' 'shells' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first') -md5sums=('772fe869b921698cc3e6fde73c4ac85a' - '6be47d893fd49b2e4a8c0e811b350861' - '13753e4e0964f3652b0cc60a28528bdf' - '4c4540eeb748bf1f71d631b8c1dcf0b3' - 'f28150d4c0b22a017be51b9f7f9977ed' - '6e488ffecc8ba142c0cf7e2d7aeb832e' - '8a9042a2cedf6b6b47eb8973f14289cb' - 'b8355d9d2782f424f4cedcf682651be0' - 'ca716f853860199c1286e7939b2f2666' - 'e5d8323a4dbee7a6d0d2a19cbf4b819f' - '7bc65f234dfb6abf24e7c3b03e86f4ff' - 'd41d8cd98f00b204e9800998ecf8427e' - '0e145e18fea8fd190b30d45764f5707c' - '6f48288b6fcaf0065fcb7b0e525413e0' - '22518e922891f9359f971f4f5b4e793c' - 'd2dc4e39dbdea75b107f91789e3274ab' - 'f3b6ae7db8adffaaa4bffc6099dcbd50' - 'a8a962370cd0128465d514e6a1f74130') package() { cd ${pkgdir} @@ -96,3 +78,21 @@ package() { done ln -s ../man usr/local/share/man } +md5sums=('45940618da782cc391c59f88ab3333c3' + '6be47d893fd49b2e4a8c0e811b350861' + '13753e4e0964f3652b0cc60a28528bdf' + '4c4540eeb748bf1f71d631b8c1dcf0b3' + 'f28150d4c0b22a017be51b9f7f9977ed' + '6e488ffecc8ba142c0cf7e2d7aeb832e' + '8a9042a2cedf6b6b47eb8973f14289cb' + 'b8355d9d2782f424f4cedcf682651be0' + 'ca716f853860199c1286e7939b2f2666' + 'e5d8323a4dbee7a6d0d2a19cbf4b819f' + '7bc65f234dfb6abf24e7c3b03e86f4ff' + 'd41d8cd98f00b204e9800998ecf8427e' + '0e145e18fea8fd190b30d45764f5707c' + '6f48288b6fcaf0065fcb7b0e525413e0' + '22518e922891f9359f971f4f5b4e793c' + 'd2dc4e39dbdea75b107f91789e3274ab' + 'f3b6ae7db8adffaaa4bffc6099dcbd50' + 'a8a962370cd0128465d514e6a1f74130') diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install index f880b6496..c8717f01b 100644 --- a/libre/filesystem/filesystem.install +++ b/libre/filesystem/filesystem.install @@ -40,9 +40,10 @@ post_upgrade() { _adduser http -u 33 -d /srv/http -g http -s /bin/false _addgroup scanner -g 96 _addgroup rfkill -g 24 + _addgroup lock -g 54 # sync gshadow to group (fixes FS#19869 - if ! grep -q '^rfkill:' etc/gshadow; then + if ! grep -q '^lock:' etc/gshadow; then grpconv >/dev/null fi diff --git a/libre/filesystem/group b/libre/filesystem/group index 261746d9e..6e8e773d8 100644 --- a/libre/filesystem/group +++ b/libre/filesystem/group @@ -19,6 +19,7 @@ rfkill:x:24: smmsp:x:25: http:x:33: games:x:50: +lock:x:54: network:x:90: video:x:91: audio:x:92: diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 0ddf606ec..fed954896 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 160936 2012-06-07 06:38:07Z andrea $ +# $Id: PKGBUILD 162049 2012-06-19 08:17:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> -# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdelibs pkgname=kdelibs-libre pkgver=4.8.4 -pkgrel=1 +pkgrel=3 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -24,10 +24,12 @@ install=${_pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kde-applications-menu.patch' 'use-pythondontwritebytecode.patch' + 'fix-application-crashes.patch' 'khtml-fsdg.diff') sha1sums=('35cd199a30d84eb37b2b213fed5ee3adf810ea49' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' 'bbacbbe2194f3961cd7557d98a9ddef158ca11aa' + 'c271c712bf202f517015b597d61cfe1aed0db82b' 'a1502a964081ad583a00cf90c56e74bf60121830') build() { @@ -39,6 +41,8 @@ build() { # Set PYTHONDONTWRITEBYTECODE (KDEBUG#276151) patch -p0 -i "${srcdir}"/use-pythondontwritebytecode.patch + # KDEBUG 301453 + patch -p1 -i "${srcdir}"/fix-application-crashes.patch # Don't ask the user to download a plugin, it's probably nonfree. patch -p1 -i "${srcdir}"/khtml-fsdg.diff diff --git a/libre/kdelibs-libre/fix-application-crashes.patch b/libre/kdelibs-libre/fix-application-crashes.patch new file mode 100644 index 000000000..8ac385483 --- /dev/null +++ b/libre/kdelibs-libre/fix-application-crashes.patch @@ -0,0 +1,49 @@ +From: Vishesh Handa <me@vhanda.in> +Date: Wed, 13 Jun 2012 21:26:31 +0000 +Subject: Revert "Always rec-connect if forced (ie. when Nepomuk server restarts)" +X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=bde5aad1e9f7bfb6f8d5c60197797de4a315158d +--- +Revert "Always rec-connect if forced (ie. when Nepomuk server restarts)" + +This reverts commit a43824a200ed76cef48a90bd3aee8547698b7c91. + +This is done so that 4.8.x works with Soprano 2.7.6 +--- + + +--- a/nepomuk/core/nepomukmainmodel.cpp ++++ b/nepomuk/core/nepomukmainmodel.cpp +@@ -94,7 +94,7 @@ public: + + // we may get disconnected from the server but we don't want to try + // to connect every time the model is requested +- if ( forced || (!m_socketConnectFailed && !localSocketClient.isConnected()) ) { ++ if ( !m_socketConnectFailed && !localSocketClient.isConnected() ) { + delete localSocketModel; + localSocketModel = 0; + QString socketName = KGlobal::dirs()->locateLocal( "socket", "nepomuk-socket" ); + +From: Vishesh Handa <me@vhanda.in> +Date: Wed, 13 Jun 2012 21:25:32 +0000 +Subject: Revert "Disconnect before re-connecting. Soprano does not do that for us." +X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=76e0376d7582cfe5b898c56bf3779ca2279dace8 +--- +Revert "Disconnect before re-connecting. Soprano does not do that for us." + +This reverts commit 3708be2d09700b21f934c2129218e1c7ea44efdf. + +This is being done so that KDE 4.8.x works with Soprano 2.7.6 +--- + + +--- a/nepomuk/core/nepomukmainmodel.cpp ++++ b/nepomuk/core/nepomukmainmodel.cpp +@@ -97,7 +97,6 @@ public: + if ( forced || (!m_socketConnectFailed && !localSocketClient.isConnected()) ) { + delete localSocketModel; + localSocketModel = 0; +- localSocketClient.disconnect(); + QString socketName = KGlobal::dirs()->locateLocal( "socket", "nepomuk-socket" ); + kDebug() << "Connecting to local socket" << socketName; + if ( localSocketClient.connect( socketName ) ) { + diff --git a/testing/e2fsprogs/MIT-LICENSE b/testing/e2fsprogs/MIT-LICENSE new file mode 100644 index 000000000..d849b28f2 --- /dev/null +++ b/testing/e2fsprogs/MIT-LICENSE @@ -0,0 +1,25 @@ +Copyright (c) 2003-2007 Theodore Ts'o <tytso@mit.edu> +Copyright (c) 1997-2003 Yann Dirson <dirson@debian.org> +Copyright (c) 2001 Alcove <http://www.alcove.com/> +Copyright (c) 1997 Klee Dienes +Copyright (c) 1995-1996 Michael Nonweiler <mrn20@cam.ac.uk> + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject +to the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY +KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR +IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/testing/e2fsprogs/PKGBUILD b/testing/e2fsprogs/PKGBUILD new file mode 100644 index 000000000..6f1085a0c --- /dev/null +++ b/testing/e2fsprogs/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 162001 2012-06-18 08:47:34Z ronald $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +pkgname=e2fsprogs +pkgver=1.42.4 +pkgrel=1 +pkgdesc="Ext2/3/4 filesystem utilities" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'MIT') +url="http://e2fsprogs.sourceforge.net" +groups=('base') +depends=('sh' 'util-linux') +makedepends=('bc') +source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'MIT-LICENSE') +backup=('etc/mke2fs.conf') +install=${pkgname}.install +sha1sums=('944002c1f8f1f87e7d2d53263346b001962bc1f9' + 'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Remove unnecessary init.d directory + sed -i '/init\.d/s|^|#|' misc/Makefile.in + + ./configure --prefix=/usr --with-root-prefix="" --libdir=/usr/lib \ + --enable-elf-shlibs --disable-fsck --disable-uuidd \ + --disable-libuuid --disable-libblkid + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install install-libs + + sed -i -e 's/^AWK=.*/AWK=awk/' "${pkgdir}/usr/bin/compile_et" + + # remove references to build directory + sed -i -e 's#^SS_DIR=.*#SS_DIR="/usr/share/ss"#' "${pkgdir}/usr/bin/mk_cmds" + sed -i -e 's#^ET_DIR=.*#ET_DIR="/usr/share/et"#' "${pkgdir}/usr/bin/compile_et" + + # install MIT license + install -Dm644 "${srcdir}/MIT-LICENSE" \ + "${pkgdir}/usr/share/licenses/${pkgname}/MIT-LICENSE" +} diff --git a/testing/e2fsprogs/e2fsprogs.install b/testing/e2fsprogs/e2fsprogs.install new file mode 100644 index 000000000..1a7fe20d7 --- /dev/null +++ b/testing/e2fsprogs/e2fsprogs.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(libext2fs.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/e2fsprogs/mke2fs.conf b/testing/e2fsprogs/mke2fs.conf new file mode 100644 index 000000000..92464e3b4 --- /dev/null +++ b/testing/e2fsprogs/mke2fs.conf @@ -0,0 +1,26 @@ +[defaults] + base_features = sparse_super,filetype,resize_inode,dir_index,ext_attr + blocksize = 4096 + inode_size = 128 + inode_ratio = 16384 + +[fs_types] + small = { + blocksize = 1024 + inode_size = 128 + inode_ratio = 4096 + } + floppy = { + blocksize = 1024 + inode_size = 128 + inode_ratio = 8192 + } + news = { + inode_ratio = 4096 + } + largefile = { + inode_ratio = 1048576 + } + largefile4 = { + inode_ratio = 4194304 + } diff --git a/testing/iproute2/PKGBUILD b/testing/iproute2/PKGBUILD new file mode 100644 index 000000000..2c3ec8aae --- /dev/null +++ b/testing/iproute2/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 162010 2012-06-18 15:22:32Z ronald $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Judd Vinet <jvinet@zeroflux.org> + +pkgname=iproute2 +pkgver=3.4.0 +pkgrel=2 +pkgdesc="IP Routing Utilities" +arch=('i686' 'x86_64') +license=('GPL2') +url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2" +depends=('glibc' 'db') +makedepends=('linux-atm') +optdepends=('linux-atm: ATM support') +provides=('iproute') +conflicts=('iproute') +replaces=('iproute') +options=('!makeflags') +backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \ + 'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables') +source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz + iproute2-fhs.patch) +sha1sums=('fcea492dea2f3ecf9d35f279e2f1a7ea6ca0d527' + '35b8cf2dc94b73eccad427235c07596146cd6f6c') + +build() { + cd $srcdir/$pkgname-$pkgver + + # set correct fhs structure + patch -Np1 -i "$srcdir/iproute2-fhs.patch" + + ./configure + + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + + make DESTDIR="$pkgdir" install + + # allow loopback to be started before /usr is mounted, this may not be supported in the future + mkdir -p "$pkgdir/sbin" + mv "$pkgdir/usr/sbin/ip" "$pkgdir/sbin/ip" + ln -s /sbin/ip "$pkgdir/usr/sbin/ip" + + # libnetlink isn't installed, install it FS#19385 + install -Dm644 include/libnetlink.h "$pkgdir/usr/include/libnetlink.h" + install -Dm644 lib/libnetlink.a "$pkgdir/usr/lib/libnetlink.a" +} diff --git a/testing/iproute2/iproute2-fhs.patch b/testing/iproute2/iproute2-fhs.patch new file mode 100644 index 000000000..add3635ca --- /dev/null +++ b/testing/iproute2/iproute2-fhs.patch @@ -0,0 +1,75 @@ +diff -Naur iproute2-3.4.0/Makefile iproute2-3.4.0.new/Makefile +--- iproute2-3.4.0/Makefile 2012-05-21 23:12:19.000000000 +0200 ++++ iproute2-3.4.0.new/Makefile 2012-06-18 10:23:53.896760158 +0200 +@@ -1,7 +1,8 @@ + ROOTDIR=$(DESTDIR) + PREFIX=/usr + LIBDIR=$(PREFIX)/lib +-SBINDIR=/sbin ++SBINDIR=/usr/sbin ++SHAREDIR=/usr/share + CONFDIR=/etc/iproute2 + DATADIR=$(PREFIX)/share + DOCDIR=$(DATADIR)/doc/iproute2 +diff -Naur iproute2-3.4.0/netem/Makefile iproute2-3.4.0.new/netem/Makefile +--- iproute2-3.4.0/netem/Makefile 2012-05-21 23:12:19.000000000 +0200 ++++ iproute2-3.4.0.new/netem/Makefile 2012-06-18 10:23:53.896760158 +0200 +@@ -20,9 +20,9 @@ + $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm + + install: all +- mkdir -p $(DESTDIR)$(LIBDIR)/tc ++ mkdir -p $(DESTDIR)$(SHAREDIR)/tc + for i in $(DISTDATA); \ +- do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \ ++ do install -m 644 $$i $(DESTDIR)$(SHAREDIR)/tc; \ + done + + clean: +diff -Naur iproute2-3.4.0/tc/Makefile iproute2-3.4.0.new/tc/Makefile +--- iproute2-3.4.0/tc/Makefile 2012-05-21 23:12:19.000000000 +0200 ++++ iproute2-3.4.0.new/tc/Makefile 2012-06-18 10:23:53.893426840 +0200 +@@ -105,18 +105,11 @@ + $(AR) rcs $@ $(TCLIB) + + install: all +- mkdir -p $(MODDESTDIR) ++ mkdir -p $(DESTDIR)$(LIBDIR)/tc + install -m 0755 tc $(DESTDIR)$(SBINDIR) + for i in $(TCSO); \ +- do install -m 755 $$i $(MODDESTDIR); \ ++ do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \ + done +- if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \ +- if [ -f $(MODDESTDIR)/m_xt.so ]; \ +- then ln -s m_xt.so $(MODDESTDIR)/m_ipt.so ; \ +- elif [ -f $(MODDESTDIR)/m_xt_old.so ]; \ +- then ln -s m_xt_old.so $(MODDESTDIR)/m_ipt.so ; \ +- fi; \ +- fi + + clean: + rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.so emp_ematch.yacc.h; \ +diff -Naur iproute2-3.4.0/tc/tc_util.c iproute2-3.4.0.new/tc/tc_util.c +--- iproute2-3.4.0/tc/tc_util.c 2012-05-21 23:12:19.000000000 +0200 ++++ iproute2-3.4.0.new/tc/tc_util.c 2012-06-18 10:23:53.893426840 +0200 +@@ -24,8 +24,8 @@ + #include "utils.h" + #include "tc_util.h" + +-#ifndef LIBDIR +-#define LIBDIR "/usr/lib" ++#ifndef SHAREDIR ++#define SHAREDIR "/usr/share" + #endif + + const char *get_tc_lib(void) +@@ -34,7 +34,7 @@ + + lib_dir = getenv("TC_LIB_DIR"); + if (!lib_dir) +- lib_dir = LIBDIR "/tc/"; ++ lib_dir = SHAREDIR "/tc/"; + + return lib_dir; + } diff --git a/testing/iptables/PKGBUILD b/testing/iptables/PKGBUILD new file mode 100644 index 000000000..5d61d0022 --- /dev/null +++ b/testing/iptables/PKGBUILD @@ -0,0 +1,74 @@ +# $Id: PKGBUILD 162003 2012-06-18 08:49:36Z ronald $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Thomas Baechler <thomas@archlinux.org> + +pkgname=iptables +pkgver=1.4.14 +pkgrel=1 +pkgdesc='Linux kernel packet control tool' +arch=('i686' 'x86_64') +license=('GPL2') +url='http://www.netfilter.org/projects/iptables/index.html' +depends=('glibc' 'bash') +makedepends=('linux-api-headers') +options=('!libtool') +source=("http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2" + iptables + ip6tables + empty.rules + simple_firewall.rules + iptables.conf.d + empty-filter.rules + empty-mangle.rules + empty-nat.rules + empty-raw.rules + empty-security.rules) +backup=(etc/conf.d/iptables) +sha1sums=('daf2972b81e52f562a644798013e946c88319ea3' + '5bb6fa526665cdd728c26f0f282f5a51f220cf88' + '2db68906b603e5268736f48c8e251f3a49da1d75' + '83b3363878e3660ce23b2ad325b53cbd6c796ecf' + '9907f9e815592837abc7fa3264a401567b7606ab' + 'cdb830137192bbe002c6d01058656bd053ed0ddd' + 'd9f9f06b46b4187648e860afa0552335aafe3ce4' + 'c45b738b5ec4cfb11611b984c21a83b91a2d58f3' + '1694d79b3e6e9d9d543f6a6e75fed06066c9a6c6' + '7db53bb882f62f6c677cc8559cff83d8bae2ef73' + 'ebbd1424a1564fd45f455a81c61ce348f0a14c2e') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # http://bugs.archlinux.org/task/17046 + sed -i '87 i libxt_RATEEST.so: libxt_RATEEST.oo' extensions/GNUmakefile.in + sed -i '88 i \\t${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -lm -shared ${LDFLAGS} -o $@ $<;\n' extensions/GNUmakefile.in + + # use system one + rm include/linux/types.h + + ./configure --prefix=/usr \ + --libexecdir=/usr/lib/iptables --sysconfdir=/etc \ + --with-xtlibdir=/usr/lib/iptables \ + --enable-devel --enable-libipq \ + --enable-shared --enable-static +# build fails when not enabling static, see if we can remove it on next build +# 1.4.13 still fails + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + cd "${srcdir}" + install -D -m755 iptables "${pkgdir}"/etc/rc.d/iptables + install -D -m755 ip6tables "${pkgdir}"/etc/rc.d/ip6tables + install -D -m644 empty.rules "${pkgdir}"/etc/iptables/empty.rules + install -D -m644 simple_firewall.rules "${pkgdir}"/etc/iptables/simple_firewall.rules + install -D -m644 iptables.conf.d "${pkgdir}"/etc/conf.d/iptables + + mkdir -p "${pkgdir}"/var/lib/iptables + install -m644 empty-{filter,mangle,nat,raw,security}.rules "${pkgdir}"/var/lib/iptables +} diff --git a/testing/iptables/empty-filter.rules b/testing/iptables/empty-filter.rules new file mode 100644 index 000000000..5a4de4876 --- /dev/null +++ b/testing/iptables/empty-filter.rules @@ -0,0 +1,6 @@ +# Empty iptables filter table rule file +*filter +:INPUT ACCEPT [0:0] +:FORWARD ACCEPT [0:0] +:OUTPUT ACCEPT [0:0] +COMMIT diff --git a/testing/iptables/empty-mangle.rules b/testing/iptables/empty-mangle.rules new file mode 100644 index 000000000..49d493c4d --- /dev/null +++ b/testing/iptables/empty-mangle.rules @@ -0,0 +1,8 @@ +# Empty iptables mangle table rules file +*mangle +:PREROUTING ACCEPT [0:0] +:INPUT ACCEPT [0:0] +:FORWARD ACCEPT [0:0] +:OUTPUT ACCEPT [0:0] +:POSTROUTING ACCEPT [0:0] +COMMIT diff --git a/testing/iptables/empty-nat.rules b/testing/iptables/empty-nat.rules new file mode 100644 index 000000000..437e96411 --- /dev/null +++ b/testing/iptables/empty-nat.rules @@ -0,0 +1,7 @@ +# Empty iptables nat table rules file +*nat +:PREROUTING ACCEPT [0:0] +:INPUT ACCEPT [0:0] +:OUTPUT ACCEPT [0:0] +:POSTROUTING ACCEPT [0:0] +COMMIT diff --git a/testing/iptables/empty-raw.rules b/testing/iptables/empty-raw.rules new file mode 100644 index 000000000..8dc50d23e --- /dev/null +++ b/testing/iptables/empty-raw.rules @@ -0,0 +1,5 @@ +# Empty iptables raw table rules file +*raw +:PREROUTING ACCEPT [0:0] +:OUTPUT ACCEPT [0:0] +COMMIT diff --git a/testing/iptables/empty-security.rules b/testing/iptables/empty-security.rules new file mode 100644 index 000000000..4531fa13f --- /dev/null +++ b/testing/iptables/empty-security.rules @@ -0,0 +1,6 @@ +# Empty iptables security table rules file +*security +:INPUT ACCEPT [0:0] +:FORWARD ACCEPT [0:0] +:OUTPUT ACCEPT [0:0] +COMMIT diff --git a/testing/iptables/empty.rules b/testing/iptables/empty.rules new file mode 100644 index 000000000..e24e1aa30 --- /dev/null +++ b/testing/iptables/empty.rules @@ -0,0 +1,6 @@ +# Empty iptables rule file +*filter +:INPUT ACCEPT [0:0] +:FORWARD ACCEPT [0:0] +:OUTPUT ACCEPT [0:0] +COMMIT diff --git a/testing/iptables/ip6tables b/testing/iptables/ip6tables new file mode 100755 index 000000000..2d119e3ed --- /dev/null +++ b/testing/iptables/ip6tables @@ -0,0 +1,69 @@ +#!/bin/bash + +# source application-specific settings +[ -f /etc/conf.d/iptables ] && . /etc/conf.d/iptables + +# Set defaults if settings are missing +[ -z "$IP6TABLES_CONF" ] && IP6TABLES_CONF=/etc/iptables/ip6tables.rules + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + if [ ! -f "$IP6TABLES_CONF" ]; then + echo "Cannot load ip6tables rules: $IP6TABLES_CONF is missing!" >&2 + exit 1 + fi + stat_busy "Starting IP6 Tables" + if [ "$IPTABLES_FORWARD" = "1" ]; then + echo 1 >/proc/sys/net/ipv6/conf/default/forwarding + echo 1 >/proc/sys/net/ipv6/conf/all/forwarding + fi + if ck_daemon ip6tables; then + /usr/sbin/ip6tables-restore < $IP6TABLES_CONF + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon ip6tables + stat_done + fi + else + stat_fail + fi + ;; + stop) + stat_busy "Stopping IP6 Tables" + if ! ck_daemon ip6tables; then + fail=0 + for table in $(cat /proc/net/ip6_tables_names); do + ip6tables-restore < /var/lib/iptables/empty-$table.rules + [ $? -gt 0 ] && fail=1 + done + if [ $fail -gt 0 ]; then + stat_fail + else + rm_daemon ip6tables + stat_done + fi + else + stat_fail + fi + ;; + restart) + $0 stop + $0 start + ;; + save) + stat_busy "Saving IP6 Tables" + /usr/sbin/ip6tables-save >$IP6TABLES_CONF + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + fi + ;; + *) + echo "usage: $0 {start|stop|restart|save}" +esac +exit 0 diff --git a/testing/iptables/iptables b/testing/iptables/iptables new file mode 100755 index 000000000..fbb02face --- /dev/null +++ b/testing/iptables/iptables @@ -0,0 +1,68 @@ +#!/bin/bash + +# source application-specific settings +[ -f /etc/conf.d/iptables ] && . /etc/conf.d/iptables + +# Set defaults if settings are missing +[ -z "$IPTABLES_CONF" ] && IPTABLES_CONF=/etc/iptables/iptables.rules + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + if [ ! -f "$IPTABLES_CONF" ]; then + echo "Cannot load iptables rules: $IPTABLES_CONF is missing!" >&2 + exit 1 + fi + stat_busy "Starting IP Tables" + if [ "$IPTABLES_FORWARD" = "1" ]; then + echo 1 >/proc/sys/net/ipv4/ip_forward + fi + if ck_daemon iptables; then + /usr/sbin/iptables-restore < $IPTABLES_CONF + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon iptables + stat_done + fi + else + stat_fail + fi + ;; + stop) + stat_busy "Stopping IP Tables" + if ! ck_daemon iptables; then + fail=0 + for table in $(cat /proc/net/ip_tables_names); do + iptables-restore < /var/lib/iptables/empty-$table.rules + [ $? -gt 0 ] && fail=1 + done + if [ $fail -gt 0 ]; then + stat_fail + else + rm_daemon iptables + stat_done + fi + else + stat_fail + fi + ;; + restart) + $0 stop + $0 start + ;; + save) + stat_busy "Saving IP Tables" + /usr/sbin/iptables-save >$IPTABLES_CONF + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + fi + ;; + *) + echo "usage: $0 {start|stop|restart|save}" +esac +exit 0 diff --git a/testing/iptables/iptables.conf.d b/testing/iptables/iptables.conf.d new file mode 100644 index 000000000..1c6cc7b5d --- /dev/null +++ b/testing/iptables/iptables.conf.d @@ -0,0 +1,12 @@ +# Configuration for iptables rules +IPTABLES_CONF=/etc/iptables/iptables.rules +IP6TABLES_CONF=/etc/iptables/ip6tables.rules + +# Enable IP forwarding (both IPv4 and IPv6) +# NOTE: this is not the recommended way to do this, and is supported only for +# backward compatibility. Instead, use /etc/sysctl.conf and set the following +# options: +# * net.ipv4.ip_forward=1 +# * net.ipv6.conf.default.forwarding=1 +# * net.ipv6.conf.all.forwarding=1 +#IPTABLES_FORWARD=0 diff --git a/testing/iptables/simple_firewall.rules b/testing/iptables/simple_firewall.rules new file mode 100644 index 000000000..e1604cc36 --- /dev/null +++ b/testing/iptables/simple_firewall.rules @@ -0,0 +1,11 @@ +*filter +:INPUT DROP [0:0] +:FORWARD DROP [0:0] +:OUTPUT ACCEPT [0:0] +-A INPUT -p icmp -j ACCEPT +-A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT +-A INPUT -i lo -j ACCEPT +-A INPUT -p tcp -j REJECT --reject-with tcp-reset +-A INPUT -p udp -j REJECT --reject-with icmp-port-unreachable +-A INPUT -j REJECT --reject-with icmp-proto-unreachable +COMMIT diff --git a/testing/iputils/PKGBUILD b/testing/iputils/PKGBUILD new file mode 100644 index 000000000..f5c5d4e3c --- /dev/null +++ b/testing/iputils/PKGBUILD @@ -0,0 +1,66 @@ +# $Id: PKGBUILD 162019 2012-06-18 20:29:20Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Aaron Griffin <aaron@archlinux.org> + +pkgname=iputils +pkgver=20101006 +pkgrel=3 +pkgdesc="IP Configuration Utilities (and Ping)" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.linuxfoundation.org/en/Net:Iputils" +groups=('base') +depends=('openssl' 'sysfsutils' 'libcap') +optdepends=('xinetd: for tftpd') +makedepends=('docbook2x' 'opensp') +conflicts=('netkit-base' 'arping' 'netkit-tftpd') +replaces=('netkit-base') +backup=(etc/xinetd.d/tftp) +install=${pkgname}.install +source=(http://www.skbuff.net/${pkgname}/${pkgname}-s${pkgver}.tar.bz2 tftp.xinetd) +sha1sums=('a08cc5423a7bf940205f2353fe3d129cd39ff242' + 'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd') + +build() { + cd "${srcdir}/${pkgname}-s${pkgver}" + + # Use our CFLAGS + sed -i -e "/^CCOPT=/s|-O2|${CFLAGS}|" Makefile + + make + + cd doc + for file in *.sgml; do + xf=${file/.sgml/.xml} + osx -xlower -xno-nl-in-tag $file > $xf || true + sed -i "s|<refname>\(.*\), \(.*\)</refname>|<refname>\1</refname>, <refname>\2</refname>|g" $xf + docbook2man $xf + done +} + +package() { + cd "${srcdir}/${pkgname}-s${pkgver}" + + install -dm755 "${pkgdir}"/usr/{bin,sbin} "${pkgdir}"/bin + + install -m755 arping clockdiff rarpd rdisc tftpd tracepath tracepath6 \ + "${pkgdir}"/usr/sbin/ + + install -m755 ping{,6} "${pkgdir}"/usr/bin/ + ln -sf /usr/bin/ping{,6} "${pkgdir}"/bin/ + + install -dm755 "${pkgdir}"/usr/share/man/man8 + install -m644 doc/{arping,clockdiff,ping,rarpd,rdisc,tftpd,tracepath}.8 \ + "${pkgdir}"/usr/share/man/man8/ + + cd "${pkgdir}"/usr/share/man/man8 + ln -sf ping.8.gz ping6.8.gz + ln -sf tracepath.8.gz tracepath6.8.gz + + # FS#24768 + install -dm755 "${pkgdir}"/etc/xinetd.d/ + install -m644 "${srcdir}"/tftp.xinetd "${pkgdir}"/etc/xinetd.d/tftp +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/iputils/iputils.install b/testing/iputils/iputils.install new file mode 100644 index 000000000..2481fb396 --- /dev/null +++ b/testing/iputils/iputils.install @@ -0,0 +1,11 @@ +post_install() { + setcap cap_net_raw=ep usr/bin/ping + setcap cap_net_raw=ep usr/bin/ping6 + echo " >> Traceroute is now provided by core/traceroute" +} + +post_upgrade() { + post_install "$1" +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/iputils/tftp.xinetd b/testing/iputils/tftp.xinetd new file mode 100644 index 000000000..26041a3f9 --- /dev/null +++ b/testing/iputils/tftp.xinetd @@ -0,0 +1,10 @@ +service tftp +{ + socket_type = dgram + protocol = udp + wait = yes + user = nobody + server = /usr/sbin/tftpd + server_args = /var/tftpboot + disable = yes +} diff --git a/testing/logrotate/PKGBUILD b/testing/logrotate/PKGBUILD new file mode 100644 index 000000000..99a621b50 --- /dev/null +++ b/testing/logrotate/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 162025 2012-06-18 22:17:58Z pierre $ +# Maintainer: Pierre Schmitz <pierre@archlinux.de> + +pkgname=logrotate +pkgver=3.8.1 +pkgrel=2 +pkgdesc="Rotates system logs automatically" +arch=('i686' 'x86_64') +url="https://fedorahosted.org/logrotate/" +license=('GPL') +groups=('base') +depends=('popt' 'cron' 'gzip') +backup=('etc/logrotate.conf') +source=("https://fedorahosted.org/releases/l/o/logrotate/logrotate-${pkgver}.tar.gz" + 'logrotate-3.8.1-noasprintf.patch' + 'logrotate.conf' + 'logrotate.cron.daily') +md5sums=('bd2e20d8dc644291b08f9215397d28a5' + 'fc8e4e15211d8aefd431d0e2e96223c4' + '462a5f364717461537eb2ae6394ad23e' + 'aa8ac8283908b6114483a293adcb650f') + +build() { + cd "$srcdir/${pkgname}-${pkgver}" + + patch -p1 -i "$srcdir"/logrotate-3.8.1-noasprintf.patch + + sed -e 's|#define DEFAULT_MAIL_COMMAND .*|#define DEFAULT_MAIL_COMMAND "/usr/bin/mail"|'\ + -e 's|#define COMPRESS_COMMAND .*|#define COMPRESS_COMMAND "/usr/bin/gzip"|'\ + -e 's|#define UNCOMPRESS_COMMAND .*|#define UNCOMPRESS_COMMAND "/usr/bin/gunzip"|'\ + -i config.h + + make RPM_OPT_FLAGS="$CFLAGS" EXTRA_LDFLAGS="$LDFLAGS" +} + +check() { + cd "$srcdir/${pkgname}-${pkgver}" + make test +} + +package() { + cd "$srcdir/${pkgname}-${pkgver}" + make PREFIX="$pkgdir" MANDIR="usr/share/man" install + + install -Dm644 "$srcdir/logrotate.conf" "$pkgdir/etc/logrotate.conf" + install -Dm744 "$srcdir/logrotate.cron.daily" "$pkgdir/etc/cron.daily/logrotate" +} diff --git a/testing/logrotate/logrotate-3.8.1-noasprintf.patch b/testing/logrotate/logrotate-3.8.1-noasprintf.patch new file mode 100644 index 000000000..be0c08062 --- /dev/null +++ b/testing/logrotate/logrotate-3.8.1-noasprintf.patch @@ -0,0 +1,53 @@ +--- logrotate-3.8.0.orig/config.c 2011-06-21 04:12:02.000000000 -0400 ++++ logrotate-3.8.0/config.c 2011-07-12 13:47:36.274319050 -0400 +@@ -41,39 +41,6 @@ + #include "asprintf.c" + #endif + +-#if !defined(asprintf) +-#include <stdarg.h> +- +-int asprintf(char **string_ptr, const char *format, ...) +-{ +- va_list arg; +- char *str; +- int size; +- int rv; +- +- va_start(arg, format); +- size = vsnprintf(NULL, 0, format, arg); +- size++; +- va_start(arg, format); +- str = malloc(size); +- if (str == NULL) { +- va_end(arg); +- /* +- * Strictly speaking, GNU asprintf doesn't do this, +- * but the caller isn't checking the return value. +- */ +- fprintf(stderr, "failed to allocate memory\\n"); +- exit(1); +- } +- rv = vsnprintf(str, size, format, arg); +- va_end(arg); +- +- *string_ptr = str; +- return (rv); +-} +- +-#endif +- + #if !defined(strndup) + char *strndup(const char *s, size_t n) + { +--- logrotate-3.8.0.orig/logrotate.h 2011-06-21 04:12:02.000000000 -0400 ++++ logrotate-3.8.0/logrotate.h 2011-07-12 13:47:38.949285608 -0400 +@@ -66,8 +66,5 @@ extern int numLogs; + extern int debug; + + int readAllConfigPaths(const char **paths); +-#if !defined(asprintf) +-int asprintf(char **string_ptr, const char *format, ...); +-#endif + + #endif diff --git a/testing/logrotate/logrotate.conf b/testing/logrotate/logrotate.conf new file mode 100644 index 000000000..88b4935cd --- /dev/null +++ b/testing/logrotate/logrotate.conf @@ -0,0 +1,31 @@ +# see "man logrotate" for details +# rotate log files weekly +weekly + +# keep 4 weeks worth of backlogs +rotate 4 + +# restrict maximum size of log files +#size 20M + +# create new (empty) log files after rotating old ones +create + +# uncomment this if you want your log files compressed +#compress + +# Logs are moved into directory for rotation +# olddir /var/log/archive + +# Ignore pacman saved files +tabooext + .pacorig .pacnew .pacsave + +# Arch packages drop log rotation information into this directory +include /etc/logrotate.d + +/var/log/wtmp { + monthly + create 0664 root root + rotate 1 +} + diff --git a/testing/logrotate/logrotate.cron.daily b/testing/logrotate/logrotate.cron.daily new file mode 100755 index 000000000..ee0eeeb48 --- /dev/null +++ b/testing/logrotate/logrotate.cron.daily @@ -0,0 +1,24 @@ +#!/bin/sh + +# nicenesses range from -20 (most favorable scheduling) to 19 (least favorable) +NICE=19 + +# 0 for none, 1 for real time, 2 for best-effort, 3 for idle +IONICE_CLASS=2 + +# 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest +IONICE_PRIORITY=7 + +CMD_LOGROTATE="/usr/sbin/logrotate /etc/logrotate.conf" + +if [ -x /usr/bin/nice ]; then + CMD_LOGROTATE="/usr/bin/nice -n ${NICE:-19} ${CMD_LOGROTATE}" +fi + +if [ -x /usr/bin/ionice ]; then + CMD_LOGROTATE="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} ${CMD_LOGROTATE}" +fi + +${CMD_LOGROTATE} + +exit 0 diff --git a/testing/psmisc/PKGBUILD b/testing/psmisc/PKGBUILD index 9d560be15..95529b6a4 100644 --- a/testing/psmisc/PKGBUILD +++ b/testing/psmisc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 160929 2012-06-07 03:03:32Z eric $ +# $Id: PKGBUILD 162032 2012-06-19 01:20:04Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=psmisc -pkgver=22.17 +pkgver=22.18 pkgrel=1 pkgdesc="Miscellaneous procfs tools" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('GPL') groups=('base') depends=('ncurses') source=(http://downloads.sourceforge.net/psmisc/${pkgname}-${pkgver}.tar.gz) -sha1sums=('5d400710cf030bf7396aec40f53e933942ec8b4a') +sha1sums=('964f6daa0950b128a0840d9df4dc0b671730a83c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/traceroute/PKGBUILD b/testing/traceroute/PKGBUILD new file mode 100644 index 000000000..fd64bbb31 --- /dev/null +++ b/testing/traceroute/PKGBUILD @@ -0,0 +1,23 @@ +# $Id: PKGBUILD 162017 2012-06-18 20:22:03Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> + +pkgname=traceroute +pkgver=2.0.18 +pkgrel=1 +pkgdesc="Tracks the route taken by packets over an IP network" +arch=('i686' 'x86_64') +url="http://traceroute.sourceforge.net/" +license=('GPL2') +depends=('glibc') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) +sha1sums=('6bdccfd12f93b89aea53728b3c365db5a4362b6d') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make prefix=/usr DESTDIR="${pkgdir}" install +} |