From 8b7b4f2e5a808cb0c1226c23469fa57751eba190 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 4 Sep 2012 00:04:04 +0000 Subject: Tue Sep 4 00:04:04 UTC 2012 --- extra/digikam/PKGBUILD | 6 ++-- extra/gtkmm3/PKGBUILD | 8 +++--- extra/help2man/PKGBUILD | 6 ++-- extra/java7-openjdk/PKGBUILD | 50 ++++++++++++++++----------------- extra/libwebkit/PKGBUILD | 6 ++-- extra/live-media/PKGBUILD | 6 ++-- extra/openjdk6/PKGBUILD | 12 ++++---- extra/openjdk6/disable_Werror.diff | 11 ++++++++ extra/perl-alien-sdl/PKGBUILD | 9 +++--- extra/perl-sdl/PKGBUILD | 4 +-- extra/sdl_gfx/PKGBUILD | 13 +++++---- extra/spamassassin/PKGBUILD | 13 +++++---- extra/spamassassin/spamassassin.install | 16 +---------- extra/spamassassin/spamassassin.service | 14 +++++++++ extra/xf86-video-intel/PKGBUILD | 6 ++-- extra/yp-tools/PKGBUILD | 6 ++-- 16 files changed, 101 insertions(+), 85 deletions(-) create mode 100644 extra/openjdk6/disable_Werror.diff create mode 100644 extra/spamassassin/spamassassin.service (limited to 'extra') diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD index 592b7bf65..85df42f9e 100644 --- a/extra/digikam/PKGBUILD +++ b/extra/digikam/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 165014 2012-08-08 19:37:59Z ronald $ +# $Id: PKGBUILD 165883 2012-09-02 19:21:35Z ronald $ # Maintainer: Ronald van Haren # Contributor: Andrea Scarpino # Contributor: Tobias Powalowski pkgbase=digikam pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki') -pkgver=2.8.0 +pkgver=2.9.0 pkgrel=1 pkgdesc="Digital photo management application for KDE" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr' 'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' 'cmake' 'automoc4' 'doxygen') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('43672f7f46e53f9a71516f79aa700d77143cecf5') +sha1sums=('df4b879a95f4ccac4480c5161d66fb05d6fbefcd') build() { cd "${srcdir}" diff --git a/extra/gtkmm3/PKGBUILD b/extra/gtkmm3/PKGBUILD index 34a32d973..be7d4a14b 100644 --- a/extra/gtkmm3/PKGBUILD +++ b/extra/gtkmm3/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 156878 2012-04-23 09:08:09Z ibiru $ +# $Id: PKGBUILD 165858 2012-09-01 17:47:38Z ibiru $ # Maintainer: Ionut Biru pkgbase=gtkmm3 _pkgbasename=gtkmm pkgname=('gtkmm3' 'gtkmm3-docs') -pkgver=3.4.0 +pkgver=3.4.1 pkgrel=1 arch=('i686' 'x86_64') -makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common') +makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common' 'doxygen' 'libxslt') license=('LGPL') options=('!libtool' '!emptydirs') url="http://www.gtkmm.org/" source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('42ea4e9acdd37fc3fe7026f8249a5427927b51048adff827bc1312900d6b12e9') +sha256sums=('af218681c8ba7b97cafa67419d43be8d1151a541c1aea2a20d76971ef487bdcf') build() { cd "$_pkgbasename-$pkgver" diff --git a/extra/help2man/PKGBUILD b/extra/help2man/PKGBUILD index cd789526c..d8e173d35 100644 --- a/extra/help2man/PKGBUILD +++ b/extra/help2man/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 164784 2012-08-05 10:17:22Z giovanni $ +# $Id: PKGBUILD 165837 2012-08-31 19:58:16Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Paul Mattal pkgname=help2man -pkgver=1.40.11 +pkgver=1.40.12 pkgrel=1 pkgdesc="Conversion tool to create man files" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL') depends=('perl-locale-gettext') install=help2man.install source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('169c7db58f09cfc704c5d953139bb58d') +md5sums=('6a37675ce2b0897cd8c6c19106e510a3') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index 9148b09f6..4ec38ec74 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 161798 2012-06-14 14:46:00Z andyrtr $ +# $Id: PKGBUILD 165850 2012-09-01 14:16:05Z guillaume $ # Maintainer: Andreas Radke # Contributor: Jan de Groot -# Contributor: Guillaume ALAUX +# Maintainer: Guillaume ALAUX pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src') # ToDo -demo -doc packages, see Debian file lists http://packages.debian.org/source/wheezy/openjdk-7 pkgbase=java7-openjdk _java_ver=7 -_updatever=u5 -_openjdk_build=b21 +_updatever=u7 +_openjdk_build=b147 _openjdk_date=27_jun_2011 -_icedtea_ver=2.2.1 +_icedtea_ver=2.3.2 _date=20110922 # check "${srcdir}/icedtea7"/Makefile.am -_CORBA_CHANGESET=38deb372c569 -_HOTSPOT_CHANGESET=889dffcf4a54 -_JAXP_CHANGESET=335fb0b059b7 -_JAXWS_CHANGESET=5471e01ef43b -_JDK_CHANGESET=6c3b742b735d -_LANGTOOLS_CHANGESET=beea46c7086b -_OPENJDK_CHANGESET=0b776ef59474 +_CORBA_CHANGESET=7fae6a3a68c7 +_HOTSPOT_CHANGESET=ea39d76b3bde +_JAXP_CHANGESET=ee4bd94136ec +_JAXWS_CHANGESET=c89c6ac953e7 +_JDK_CHANGESET=f78eb7e08ee1 +_LANGTOOLS_CHANGESET=867d5041bee6 +_OPENJDK_CHANGESET=acba2d30209d _bootstrap=0 # 0/1 for quick build or full bootstrap @@ -30,14 +30,14 @@ arch=('i686' 'x86_64') url="http://icedtea.classpath.org" license=('custom') options=('!emptydirs') -makedepends=('jdk7-openjdk' 'libxp' 'libxslt' +makedepends=('jdk7-openjdk' 'libxp' 'libxslt' 'wget' 'alsa-lib' 'apache-ant>=1.8.1' 'giflib' 'libpng>=1.5.7' 'gtk2' 'java-rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar') # 'inetutils' 'grep') # fastjar`? [ "$_bootstrap" = "1" ] && makedepends=(${makedepends[@]} 'eclipse-ecj') #http://www.java.net/download/openjdk/jdk${_java_ver}/promoted/${_openjdk_build}/openjdk-${_java_ver}-fcs-src-${_openjdk_build}-${_openjdk_date}.zip -_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.2 +_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3 source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz{,.sig} ${_url}/archive/${_OPENJDK_CHANGESET}.tar.gz # openjdk.tar.gz ${_url}/corba/archive/${_CORBA_CHANGESET}.tar.gz # corba.tar.gz @@ -50,25 +50,23 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar fix_corba_cmds_path.diff openjdk7_fix_jdk_cmds_path.diff openjdk7_nonreparenting-wm.diff - disable_Werror.diff jdk7-openjdk.profile jdk7-openjdk.profile.csh jre7-openjdk.profile jre7-openjdk.profile.csh) -sha256sums=('0f5ba163904f7c50374ab345216dd1b66c077fc431592eb3d4801f7ecda200b6' - '0c987bff8e490a57d1e16e328a54665073ef920166342a0a08e5593aa20cd215' - '15a6eab62f5108efbf7937b1de7697bd789971886fc1fc08ee8199e16a5c10fe' - 'b892b0db6f3e4f89fd480d46ecb7c9ce5c71a884ae5bfe953b4bda9eedf7ea93' - 'ff4ab3710fe316b7adc4e57d4d21ff967ca20e2ccc5267ac26b93cd22db8b3fd' - '1ef055749ee46ebf7a5be94403b461d8d32e95c98906da459aeb217a0784ff1d' - '48a513d18c919ec08d44cffdc12ae65f1e8942924c6cfcca5c1ffa8ca38afd0e' - '17055cf1490fab1cccc57bf3aa5b32d655c408859790c7f671bfde180ddf70cb' - 'b29a8929bb4aadbc033e99dca6a381ca6342f0373b9c3f67827bfc025187ba41' +sha256sums=('d7e87de527934fcbb06c162e0e119d9b118069f3f52a1420d303fe19c5d74ef2' + '5d3abf9bd3f628571ca148b55226b2af3c0cce835d51d7215bbe459d0a871513' + 'ae63f88590d4aa82de82322e6bb61b31157e49617a4f8c310fc4c4ab4690f528' + '8d94e9b594e4ae0eff6899cb4ff899ce66db3b4d6ef158e019b7be96e193ec0f' + '26991edc468b7599a332753a60ff861fde78af439d0a5b87d0e5b389d5e53fb5' + 'a411bdde270bb0451b74fc9ba890159ed1f7070bc25f21b3ebd17b79b42805f8' + '74cd8b7c7ed1d80dd4cfa45565584ec1c24cfd5e10a32fc026b92f0ce27ff224' + 'ded69ccf2baea82b7baf9050c64160733ff45c10c0a363de80d795618c494707' + '25733b44590c950adc42a2e9c366b8a3992803c06dedcc16d2bf0d50fed54844' '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f' '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479' 'b742113dc6debc3eb92a246e442595481c04a2a3973e7902b86037acb50050ea' 'fd615f476ef17853ae55b7aee3c92b6738f9ea584e915749b1caa7fdc5ff9ca4' - 'eb4c7f4cf50f5f74b683857f707bd21ec3847267e2e5e3173f42a6910a024f97' '2ec2c6d3a8b62c5743bf8c50c358d98f6a86219d1d8b70645bcc0e1707670410' '3f28f8bfc6dd105a07f747d7135c77a77de433e2b8647dd7520a900135203fbd' 'faf5fbaf24c33c101d58bacf8b93c1dbe08a0cbde4c596d5b4a6e28dd4b18f0a' @@ -103,7 +101,7 @@ build() { . /etc/profile.d/apache-ant.sh cp ${srcdir}/*.diff ${srcdir}/icedtea-${_icedtea_ver}/patches - export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/openjdk7_fix_jdk_cmds_path.diff patches/openjdk7_nonreparenting-wm.diff patches/disable_Werror.diff" + export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/openjdk7_fix_jdk_cmds_path.diff patches/openjdk7_nonreparenting-wm.diff" if [ "$_bootstrap" = "1" ]; then BOOTSTRAPOPT="--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar" diff --git a/extra/libwebkit/PKGBUILD b/extra/libwebkit/PKGBUILD index 451195922..8553daaa4 100644 --- a/extra/libwebkit/PKGBUILD +++ b/extra/libwebkit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 164820 2012-08-06 19:57:10Z andyrtr $ +# $Id: PKGBUILD 165830 2012-08-31 06:45:09Z andyrtr $ # Maintainer: Andreas Radke pkgbase=libwebkit pkgname=(libwebkit libwebkit3) -pkgver=1.8.2 +pkgver=1.8.3 pkgrel=1 pkgdesc="An opensource web content engine" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'gtk3' 'mesa') options=('!libtool' '!emptydirs') source=(http://webkitgtk.org/releases/webkit-$pkgver.tar.xz bison26.diff) -sha256sums=('0cd69b7c4bf4af3442a5e6777a1487cabf14db15baeeed96d0865419f69b81e6' +sha256sums=('ada02d636af61aed38f142d3cded662d141ce71264f624c4eb873621a74cc9e7' '2a9c0c1b9d5259fd1254ebea228fc83313267fbe8cfec1bb43356de1f355b93e') build() { diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index f04d06552..c963f4d3c 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165457 2012-08-20 09:26:27Z giovanni $ +# $Id: PKGBUILD 165835 2012-08-31 19:34:55Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Gilles CHAUVIN pkgname=live-media -pkgver=2012.08.20 +pkgver=2012.08.31 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('0504355e4bb7fa5e2c02c098eb5421b6') +md5sums=('f8d2b0e4809b4dfa97ec2e6b557eb4b4') build() { cd ${srcdir}/live diff --git a/extra/openjdk6/PKGBUILD b/extra/openjdk6/PKGBUILD index 0a4a2428a..9b5f93f4c 100644 --- a/extra/openjdk6/PKGBUILD +++ b/extra/openjdk6/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 161769 2012-06-13 16:55:23Z andyrtr $ +# $Id: PKGBUILD 165879 2012-09-02 13:59:28Z andyrtr $ # Maintainer: Andreas Radke # Contributor: Jan de Groot pkgname=('openjdk6' 'openjdk6-src') pkgbase="openjdk6" _javaver=6 -_icedteaver=1.11.3 +_icedteaver=1.11.4 _openjdk_version=b24 _openjdk_date=14_nov_2011 pkgver=${_javaver}.${_openjdk_version}_${_icedteaver} @@ -26,14 +26,15 @@ source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar fix_corba_cmds_path.diff fontconfig-paths.diff nonreparenting-wm.diff + disable_Werror.diff openjdk6.profile openjdk6.profile.csh) noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz jaxp144_03.zip jdk6-jaxws2_1_6-2011_06_13.zip jdk6-jaf-b20.zip) -sha256sums=('7d91c407b9795bd6f6255bcf0fb808416b36418c57f601dc47cfabff83194cf4' - '31a26872d3f0b96ac075608df13ae635923a0960cdcdb4ecab3fe6482f2ef978' +sha256sums=('7bc0037514aedbbd5e65edcb2fa300a18285688d27b359c2144fcf563174e4fd' + 'c01c178077df395974307d534a4535686cc9ab107df998452b6279abab7cdc2e' 'f84e7f0938f4939660ff8f9c2aa164d301faa8a519f2324ceb05ad34b2e09227' 'c1a5348e17b330a7e4b18431e61a40efd2ba99a7da71102cf2c604478ef96012' '229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3' @@ -42,6 +43,7 @@ sha256sums=('7d91c407b9795bd6f6255bcf0fb808416b36418c57f601dc47cfabff83194cf4' '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479' '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f' '9c3c55c30729ec44fab14c3f3f841c273730c7467d8908a72f018bc9e9f65bd9' + 'eb4c7f4cf50f5f74b683857f707bd21ec3847267e2e5e3173f42a6910a024f97' '26e2cd5a6034f08a685129c9412f487b9931fb0d556f1ccceab17bdb75a372cd' '0c2d9116d6e550021994d6713a93621a9df685d2182996be3249ad812712b007') @@ -63,7 +65,7 @@ build() { autoreconf -i - export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/nonreparenting-wm.diff" + export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/nonreparenting-wm.diff patches/disable_Werror.diff" # export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/nonreparenting-wm.diff" export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}" diff --git a/extra/openjdk6/disable_Werror.diff b/extra/openjdk6/disable_Werror.diff new file mode 100644 index 000000000..fa8887a10 --- /dev/null +++ b/extra/openjdk6/disable_Werror.diff @@ -0,0 +1,11 @@ +--- openjdk/hotspot/make/linux/makefiles/gcc.make 2012-06-07 16:30:51.000000000 +0200 ++++ openjdk/hotspot/make/linux/makefiles/gcc.make.new 2012-06-14 15:32:44.967695139 +0200 +@@ -150,7 +150,7 @@ + endif + + # Compiler warnings are treated as errors +-WARNINGS_ARE_ERRORS = -Werror ++#WARNINGS_ARE_ERRORS = -Werror + + # Except for a few acceptable ones + # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit diff --git a/extra/perl-alien-sdl/PKGBUILD b/extra/perl-alien-sdl/PKGBUILD index 6f6e4b078..4b6bdedd3 100644 --- a/extra/perl-alien-sdl/PKGBUILD +++ b/extra/perl-alien-sdl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 165067 2012-08-09 23:13:02Z heftig $ +# $Id: PKGBUILD 165868 2012-09-01 20:47:49Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Allan McRae # Contributor: Sarah Hay @@ -8,7 +8,7 @@ pkgname=perl-alien-sdl _realname=Alien-SDL -pkgver=1.436 +pkgver=1.438 pkgrel=1 pkgdesc="Building, finding and using SDL binaries" arch=(i686 x86_64) @@ -17,8 +17,9 @@ url="http://search.cpan.org/dist/Alien-SDL/" depends=(sdl=1.2.15 perl-file-sharedir perl-capture-tiny) makedepends=(perl-file-which perl-text-patch) options=(!emptydirs) -source=(http://search.cpan.org/CPAN/authors/id/F/FR/FROGGS/$_realname-$pkgver.tar.gz) -md5sums=('eedfebaf00dca8a8e4806e8dc47bf1ed') +_author=JTPALMER +source=(http://search.cpan.org/CPAN/authors/id/${_author::1}/${_author::2}/$_author/$_realname-$pkgver.tar.gz) +md5sums=('1936ba9e300677151124b62883cedf20') package() { cd "$srcdir/$_realname-$pkgver" diff --git a/extra/perl-sdl/PKGBUILD b/extra/perl-sdl/PKGBUILD index dd3a9b448..0a71a319c 100644 --- a/extra/perl-sdl/PKGBUILD +++ b/extra/perl-sdl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 165069 2012-08-09 23:15:16Z heftig $ +# $Id: PKGBUILD 165864 2012-09-01 20:41:29Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Allan McRae # Contributor: Sarah Hay pkgname=perl-sdl pkgver=2.540 -pkgrel=1 +pkgrel=2 pkgdesc="Simple DirectMedia Layer for Perl" arch=(i686 x86_64) license=(LGPL) diff --git a/extra/sdl_gfx/PKGBUILD b/extra/sdl_gfx/PKGBUILD index b7e0c1b32..6da6577b7 100644 --- a/extra/sdl_gfx/PKGBUILD +++ b/extra/sdl_gfx/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 144350 2011-12-04 22:59:47Z heftig $ -# Maintainer: Allan McRae +# $Id: PKGBUILD 165865 2012-09-01 20:41:32Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Allan McRae # Contributor: Tom Newsom pkgname=sdl_gfx -pkgver=2.0.23 +pkgver=2.0.24 pkgrel=1 pkgdesc="SDL Graphic Primitives" arch=('i686' 'x86_64') @@ -12,10 +13,10 @@ options=(!libtool) url="http://www.ferzkopp.net/joomla/software-mainmenu-14/4-ferzkopps-linux-software/19-sdlgfx" source=(http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-${pkgver}.tar.gz) depends=('sdl') -md5sums=('fcc3c4f2d1b4943409bf7e67dd65d03a') +md5sums=('838514185ff9a3b6377760aaa52fef8a') build() { - cd ${srcdir}/SDL_gfx-${pkgver} + cd SDL_gfx-${pkgver} if [ "${CARCH}" == "x86_64" ]; then ./configure --prefix=/usr --disable-mmx @@ -27,6 +28,6 @@ build() { } package() { - cd ${srcdir}/SDL_gfx-${pkgver} + cd SDL_gfx-${pkgver} make DESTDIR=${pkgdir} install } diff --git a/extra/spamassassin/PKGBUILD b/extra/spamassassin/PKGBUILD index 8228494e1..a09d2b79f 100644 --- a/extra/spamassassin/PKGBUILD +++ b/extra/spamassassin/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 146678 2012-01-16 09:03:49Z bluewind $ -# Maintainer: Dale Blount +# $Id: PKGBUILD 165860 2012-09-01 18:36:23Z bluewind $ +# Maintainer: Florian Pritz +# Contributor: Dale Blount # Contributor: Manolis Tzanidakis pkgname=spamassassin pkgver=3.3.2 -pkgrel=3 +pkgrel=6 pkgdesc="A mail filter to identify spam." arch=('i686' 'x86_64') license=('APACHE') @@ -23,10 +24,11 @@ backup=('etc/conf.d/spamd' install="${pkgname}.install" options=('!emptydirs') source=("http://mirrors.devlib.org/apache/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz" - 'spamd.conf.d' 'spamd') + 'spamd.conf.d' 'spamd' 'spamassassin.service') md5sums=('d1d62cc5c6eac57e88c4006d9633b81e' 'af501c6b0bb937a2775b747cc4b6d150' - '57545e6877503d897db21e9a2e8bd2b9') + '57545e6877503d897db21e9a2e8bd2b9' + '1c39572b79bc20c822387814050ee5c1') build() { cd "${srcdir}/Mail-SpamAssassin-${pkgver}" @@ -55,4 +57,5 @@ package() { install -D -m644 "${srcdir}/spamd.conf.d" "${pkgdir}/etc/conf.d/spamd" install -D -m755 "${srcdir}/spamd" "${pkgdir}/etc/rc.d/spamd" + install -D -m644 "${srcdir}/spamassassin.service" "${pkgdir}/usr/lib/systemd/system/spamassassin.service" } diff --git a/extra/spamassassin/spamassassin.install b/extra/spamassassin/spamassassin.install index 5109956c9..e43453e97 100644 --- a/extra/spamassassin/spamassassin.install +++ b/extra/spamassassin/spamassassin.install @@ -1,25 +1,11 @@ -# arg 1: the new package version post_install() { echo "You must run 'sa-update' to install spam rules before use." - /bin/true } -# arg 1: the new package version -# arg 2: the old package version post_upgrade() { # Compile rules, if rules have previously been compiled, and it's possible - if [ -x /usr/bin/re2c -a -x /usr/bin/perlbin/vendor/sa-compile -a -d /var/lib/spamassassin/compiled ]; then + if type re2c &>/dev/null && type sa-compile &>/dev/null && [[ -d /var/lib/spamassassin/compiled ]]; then echo "Detected compiled rules, running sa-compile..." sa-compile > /dev/null 2>&1 fi } - -# arg 1: the old package version -pre_remove() { - /bin/true -} - -# arg 1: the old package version -post_remove() { - /bin/true -} diff --git a/extra/spamassassin/spamassassin.service b/extra/spamassassin/spamassassin.service new file mode 100644 index 000000000..a74f6e644 --- /dev/null +++ b/extra/spamassassin/spamassassin.service @@ -0,0 +1,14 @@ +[Unit] +Description=Spamassassin daemon +After=syslog.target network.target + +[Service] +Type=forking +PIDFile=/var/run/spamd.pid +ExecStart=/usr/bin/vendor_perl/spamd --pidfile /var/run/spamd.pid -c +StandardOutput=syslog +StandardError=syslog +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index b179847ea..493eef879 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165606 2012-08-27 08:28:17Z jgc $ +# $Id: PKGBUILD 165875 2012-09-02 10:29:23Z jgc $ # Maintainer: AndyRTR # Maintainer: Jan de Groot pkgname=xf86-video-intel -pkgver=2.20.5 +pkgver=2.20.6 pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -18,7 +18,7 @@ conflicts=('xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xorg-server<1.12.0' 'x options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('143d1cd808694ca7202b642fbb2b03a43a7474d7b527216c517fc41319410bec') +sha256sums=('02e059bfa8e431b7503148a55b7d491816442c50ca706f3ab40052dc454cbb6d') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/yp-tools/PKGBUILD b/extra/yp-tools/PKGBUILD index 2ad93660d..e85a3e1e6 100644 --- a/extra/yp-tools/PKGBUILD +++ b/extra/yp-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 162166 2012-06-22 13:00:08Z dreisner $ +# $Id: PKGBUILD 165833 2012-08-31 12:24:13Z tomegun $ # Mantainer: Tom Gundersen # Contributor: Gaetan Bisson # Contributor: dorphell @@ -6,7 +6,7 @@ pkgname=yp-tools pkgver=2.12 -pkgrel=3 +pkgrel=4 pkgdesc='Linux NIS Tools' arch=('i686' 'x86_64') url='http://www.linux-nis.org/nis/yp-tools/' @@ -25,7 +25,7 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install - install -D -m644 ../domainname.service "${pkgdir}/usr/lib/systemd/service/domainname.service" + install -D -m644 ../domainname.service "${pkgdir}/usr/lib/systemd/system/domainname.service" } md5sums=('ce1e06d86caa285fa8cd76fdf103f51e' '8d354b76eb0df9a3b06637bfff87453b') -- cgit v1.2.3-54-g00ecf