From effb26c3b1f00bf8bea4e2562f07f9a06eb67606 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 7 Nov 2011 23:14:55 +0000 Subject: Mon Nov 7 23:14:55 UTC 2011 --- extra/gmime/PKGBUILD | 6 +- extra/imagemagick/PKGBUILD | 13 +++-- extra/ntp/PKGBUILD | 107 +++++++++++++++--------------------- extra/ntp/install | 10 ++++ extra/ntp/ntp.conf | 62 ++++++--------------- extra/ntp/ntpd | 2 +- extra/ntp/ntpd.conf | 5 ++ extra/ntp/ntpdate | 2 +- extra/postfix/PKGBUILD | 6 +- extra/talloc/PKGBUILD | 27 ++++----- extra/wxpython/PKGBUILD | 11 ++-- extra/wxpython/wxpython-cairo.patch | 51 +++++++++++++++++ 12 files changed, 164 insertions(+), 138 deletions(-) create mode 100644 extra/ntp/install create mode 100644 extra/ntp/ntpd.conf create mode 100644 extra/wxpython/wxpython-cairo.patch (limited to 'extra') diff --git a/extra/gmime/PKGBUILD b/extra/gmime/PKGBUILD index 7f55fc500..d2e265a3e 100644 --- a/extra/gmime/PKGBUILD +++ b/extra/gmime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 137328 2011-09-07 08:13:58Z jgc $ +# $Id: PKGBUILD 142226 2011-11-06 17:01:40Z ibiru $ # Maintainer: Jan de Groot # Contributor: Ben pkgname=gmime -pkgver=2.4.26 +pkgver=2.4.28 pkgrel=1 pkgdesc="Core mime parsing library" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('glib2' 'zlib') makedepends=('gtk-sharp-2' 'pkgconfig') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('bad2c9ceb36a685a8f31eccf047be9d761da781c777c7657b093f9ff0bba401f') +sha256sums=('8487faf949ca60c7fb814338e6457d4b4260fcba361158667e1f3fe3e7cce13e') build() { # get rid of that .wapi errors in fakeroot diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 6687c5add..d1e325a31 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140515 2011-10-16 08:18:29Z foutrelis $ +# $Id: PKGBUILD 142234 2011-11-06 21:12:47Z eric $ # Maintainer: Eric Bélanger pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.7.3.1 +pkgver=6.7.3.4 pkgrel=1 arch=('i686' 'x86_64') url="http://www.imagemagick.org/" @@ -12,7 +12,7 @@ depends=('libltdl' 'lcms2' 'libxt' 'bzip2' 'xz' 'fontconfig' 'libxext' 'libjpeg- makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'libpng') source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('67e20cf171fa50e76c30bf6e703d37419164ce70' +sha1sums=('317dbb760c0ff8a22f031c3864d3c13f03b93a4c' '23405f80904b1de94ebd7bd6fe2a332471b8c283') build() { @@ -20,7 +20,7 @@ build() { sed '/AC_PATH_XTRA/d' -i configure.ac autoreconf - patch -Np0 -i ../perlmagick.rpath.patch + patch -p0 -i ../perlmagick.rpath.patch LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl" \ ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \ @@ -32,6 +32,11 @@ build() { make } +check() { + cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} + make check +} + package_imagemagick() { pkgdesc="An image viewing/manipulation program" optdepends=('ghostscript: for Ghostscript support' diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD index 69669c721..79bec1b56 100644 --- a/extra/ntp/PKGBUILD +++ b/extra/ntp/PKGBUILD @@ -1,78 +1,61 @@ -# $Id: PKGBUILD 117473 2011-04-03 17:50:26Z andrea $ -# Maintainer: kevin +# $Id: PKGBUILD 142201 2011-11-06 05:54:25Z bisson $ +# Maintainer: Gaetan Bisson +# Contributor: kevin pkgname=ntp -pkgver=4.2.6.p3 -_realver=4.2.6p3 -pkgrel=3 -pkgdesc="NTP (Network Time Protocol) tries to keep servers in sync" -arch=(i686 x86_64) +pkgver=4.2.6.p4 +_realver=4.2.6p4 +pkgrel=2 +pkgdesc='Network Time Protocol reference implementation' +url='http://www.ntp.org/' license=('custom') -url="http://www.ntp.org/" +arch=('i686' 'x86_64') depends=('openssl' 'readline' 'libcap') makedepends=('perl-html-parser') -backup=('etc/ntp.conf' 'etc/conf.d/ntp-client.conf') -options=('!emptydirs') -changelog=changelog -source=(http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz - ntp-4.2.4-html2man.patch - ntp.conf - ntp-client.conf - ntpd - ntpdate) -md5sums=('59876a9009b098ff59767ee45a88ebd2' '1b04e888717bb31479a6087632981723' - '398a7f270f6ae083f47f86eb8b557a75' '58997d6cf4846d80e35a01b855376a33' - 'bf20804e75656609e808ca21b53ea4aa' '99b49d763e5866f4f81c48d922c80b93') +backup=('etc/ntp.conf' 'etc/conf.d/ntpd.conf') +source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz" + 'ntpd' + 'ntpdate' + 'ntp.conf' + 'ntpd.conf') +sha1sums=('b53c4565c5d1c37494584d4fb826f82ffea285cf' + '97b41b8bc34f259f4e525ab2e58707c9724e72e2' + '63572457586379aa6bf75b6e899e71d651e643f4' + '6d2d234afb1db2dcb940747a62f70217246a3d13' + '6cfcb7bbd34499b30e31dffca2f3e1a036010271') + +install=install build() { - cd "$srcdir/$pkgname-$_realver" - # fix man page generation - patch -Np1 -i ../ntp-4.2.4-html2man.patch - # configure - export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" - # 4.2.6p3: aclocal too old, regenerate - rm -f aclocal.m4 - libtoolize --copy --force - ac_cv_header_dns_sd_h=0 ./configure --prefix=/usr \ - --mandir=/usr/share/man \ - --enable-linux-caps - # build - make -} + cd "${srcdir}/${pkgname}-${_realver}" -package() { - cd "$srcdir/$pkgname-$_realver" + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --enable-linux-caps \ - # install - make DESTDIR="$pkgdir" install + make +} - # install conf files - install -d "$pkgdir/usr/share/ntp" - install -D -m644 conf/* "${pkgdir}/usr/share/ntp" +package() { + cd "${srcdir}/${pkgname}-$_realver" - # install launch scripts - install -d "$pkgdir/etc/rc.d" - install -D -m755 ${srcdir}/{ntpd,ntpdate} "$pkgdir/etc/rc.d" + make DESTDIR="${pkgdir}" install - # install man pages - cd html - ../scripts/html2man - sed -i 's/^[\t\ ]*$//;/./,/^$/!d' man/man*/*.[58] - install -d "$pkgdir"/usr/share/man/man{5,8} - install -m644 man/man5/* "$pkgdir/usr/share/man/man5/" - install -m644 man/man8/* "$pkgdir/usr/share/man/man8/" - mv "$pkgdir/usr/share/man/man8/ntpd.8" "$pkgdir/usr/share/man/man8/ntp-ntpd.8" - cd .. + install -Dm755 ../ntpd "${pkgdir}"/etc/rc.d/ntpd + install -Dm755 ../ntpdate "${pkgdir}"/etc/rc.d/ntpdate + install -Dm644 ../ntp.conf "${pkgdir}"/etc/ntp.conf + install -Dm644 ../ntpd.conf "${pkgdir}"/etc/conf.d/ntpd.conf - # install sample configs - install -D -m644 "$srcdir/ntp.conf" "$pkgdir/etc/ntp.conf" - install -D -m644 "$srcdir/ntp-client.conf" \ - "$pkgdir/etc/conf.d/ntp-client.conf" + cd html + ../scripts/html2man + install -d "${pkgdir}"/usr/share/man + mv man/man* "${pkgdir}"/usr/share/man + mv "${pkgdir}/usr/share/man/man8/ntpd.8" "${pkgdir}/usr/share/man/man8/ntp-ntpd.8" # we should ditch openntpd + cd .. - # create /var/lib/ntp - install -d "$pkgdir/var/lib/ntp" - touch "$pkgdir/var/lib/ntp/.placeholder" + rmdir "${pkgdir}"/usr/{lib,sbin} + install -d "${pkgdir}/var/lib/ntp" + install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -Dm644 "$srcdir/$pkgname-$_realver/COPYRIGHT" \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + touch "${pkgdir}"/var/lib/ntp/.placeholder } diff --git a/extra/ntp/install b/extra/ntp/install new file mode 100644 index 000000000..ad9a39d54 --- /dev/null +++ b/extra/ntp/install @@ -0,0 +1,10 @@ +post_upgrade() { + if [[ $(vercmp $2 4.2.6.p3) -le 0 ]]; then + cat < The file /etc/conf.d/ntp-client.conf has been renamed /etc/conf.d/ntpd.conf +==> If you made changes to the former, please update the latter. + +EOF + fi +} diff --git a/extra/ntp/ntp.conf b/extra/ntp/ntp.conf index 7f888e4b1..5f31fea83 100644 --- a/extra/ntp/ntp.conf +++ b/extra/ntp/ntp.conf @@ -1,52 +1,22 @@ -# NOTES: -# - you should only have to update the server line below -# - if you start getting lines like 'restrict' and 'fudge' -# and you didnt add them, AND you run dhcpcd on your -# network interfaces, be sure to add '-Y -N' to the -# dhcpcd_ethX variables in /etc/conf.d/net - -# Name of the servers ntpd should sync with -# Please respect the access policy as stated by the responsible person. -#server ntp.example.tld iburst - -server pool.ntp.org - -## -# A list of available servers can be found here: -# http://www.pool.ntp.org/ -# http://www.pool.ntp.org/#use -# A good way to get servers for your machine is: -# netselect -s 3 pool.ntp.org -## - -#server ntplocal.example.com prefer -#server timeserver.example.org - -# Warning: Using default NTP settings will leave your NTP -# server accessible to all hosts on the Internet. +# With the default settings below, ntpd will only synchronize your clock. +# +# For details, see: +# - the ntp.conf man page +# - http://support.ntp.org/bin/view/Support/GettingStarted +# - https://wiki.archlinux.org/index.php/Network_Time_Protocol_daemon -# A default deny all (including localhost) policy -# To use this define restrictions for all servers and clients -#restrict default ignore -#restrict -6 default ignore +# Select three geolocalized NTP public servers; see http://www.pool.ntp.org/ +server 0.pool.ntp.org +server 1.pool.ntp.org +server 2.pool.ntp.org -# A more open policy, allow access but deny changing the configuration +# Only allow read-only access from localhost restrict default nomodify nopeer -#restrict -6 default nomodify nopeer - -# Allow localhost restrict 127.0.0.1 -#restrict -6 ::1 - - -# To allow machines within your network to synchronize -# their clocks with your server, but ensure they are -# not allowed to configure the server or used as peers -# to synchronize against, uncomment this line. -# -#restrict 192.168.0.0 mask 255.255.255.0 nomodify nopeer notrap - -# you should not need to modify the following paths -driftfile /var/lib/ntp/ntp.drift +# Location of drift and log files +driftfile /var/lib/ntp/ntp.drift +logfile /var/log/ntp.log +# NOTE: If you run dhcpcd and have lines like 'restrict' and 'fudge' appearing +# here, be sure to add '-Y -N' to the dhcpcd_ethX variables in /etc/conf.d/net diff --git a/extra/ntp/ntpd b/extra/ntp/ntpd index 825efc189..a3e886e1f 100755 --- a/extra/ntp/ntpd +++ b/extra/ntp/ntpd @@ -2,7 +2,7 @@ . /etc/rc.conf . /etc/rc.d/functions -. /etc/conf.d/ntp-client.conf +. /etc/conf.d/ntpd.conf PIDFILE="/var/run/ntpd/ntpd.pid" PID=$(cat $PIDFILE 2> /dev/null) diff --git a/extra/ntp/ntpd.conf b/extra/ntp/ntpd.conf new file mode 100644 index 000000000..e728db579 --- /dev/null +++ b/extra/ntp/ntpd.conf @@ -0,0 +1,5 @@ +# client options for "ntpd -q" - ntpdate equivalent +NTP_CLIENT_OPTION="-g" + +# arguments passed to ntpd when started +NTPD_ARGS="-g" diff --git a/extra/ntp/ntpdate b/extra/ntp/ntpdate index 99508f4fd..4f7c8375b 100755 --- a/extra/ntp/ntpdate +++ b/extra/ntp/ntpdate @@ -2,7 +2,7 @@ . /etc/rc.conf . /etc/rc.d/functions -. /etc/conf.d/ntp-client.conf +. /etc/conf.d/ntpd.conf case "$1" in start) diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD index b420652a8..595d82b13 100644 --- a/extra/postfix/PKGBUILD +++ b/extra/postfix/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 141172 2011-10-25 11:07:35Z bisson $ +# $Id: PKGBUILD 142240 2011-11-07 04:19:17Z bisson $ # Contributor: Jeff Brodnax # Contributor: Paul Mattal # Maintainer: Gaetan Bisson pkgname=postfix -pkgver=2.8.6 +pkgver=2.8.7 pkgrel=1 pkgdesc='Fast, easy to administer, secure mail server' url='http://www.postfix.org/' @@ -15,7 +15,7 @@ backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,ma source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" \ 'aliases.patch' \ 'rc.d') -sha1sums=('32613ad01cad10ae04aad626f9a69ac9126b3d28' +sha1sums=('81c87aceff4d9af67a304354bab9c99ac98fc8a0' '5fc3de6c7df1e5851a0a379e825148868808318b' '40c6be2eb55e6437a402f43775cdb3d22ea87a66') diff --git a/extra/talloc/PKGBUILD b/extra/talloc/PKGBUILD index 678ee5af4..573d162dd 100644 --- a/extra/talloc/PKGBUILD +++ b/extra/talloc/PKGBUILD @@ -1,30 +1,31 @@ -# $Id: PKGBUILD 116938 2011-03-26 14:56:31Z tpowa $ -# Maintainer: Tobias Powalowski +# $Id: PKGBUILD 142221 2011-11-06 11:39:12Z andrea $ +# Maintainer: +# Contributor: Tobias Powalowski pkgname=talloc -pkgver=2.0.5 +pkgver=2.0.7 pkgrel=1 pkgdesc="A hierarchical pool based memory allocator with destructors" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('GPL3') url="http://talloc.samba.org/" -source=(http://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar.gz) -makedepends=('python2') depends=('glibc') +makedepends=('python2' 'docbook-xsl') optdepends=('python2: for python bindings') +source=("http://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('dbfb3146f4cc47054e13b8a2988299f9') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" sed -i -e 's#python#python2#g' buildtools/bin/waf ./configure --prefix=/usr \ - --sysconfdir=/etc/samba \ - --localstatedir=/var \ - --enable-talloc-compat1 + --sysconfdir=/etc/samba \ + --localstatedir=/var \ + --enable-talloc-compat1 make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=$pkgdir/ install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } -md5sums=('6e3fdfbc43dde8ccba27b6af894b8fb2') diff --git a/extra/wxpython/PKGBUILD b/extra/wxpython/PKGBUILD index 7f02de61a..2a983d1a3 100644 --- a/extra/wxpython/PKGBUILD +++ b/extra/wxpython/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 134638 2011-08-07 02:39:42Z eric $ +# $Id: PKGBUILD 142236 2011-11-07 00:38:07Z eric $ # Maintainer: Eric Bélanger pkgname=wxpython pkgver=2.8.12.1 -pkgrel=1 +pkgrel=2 pkgdesc="A wxWidgets GUI toolkit for Python" arch=('i686' 'x86_64') license=('custom:wxWindows') url="http://www.wxpython.org" depends=('wxgtk' 'python2') makedepends=('mesa') -source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2) -md5sums=('8c06c5941477beee213b4f2fa78be620') -sha1sums=('05688dc03d61631750f5904273122bb40a2115f5') +source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2 wxpython-cairo.patch) +sha1sums=('05688dc03d61631750f5904273122bb40a2115f5' + '420700b0a216b853352ffafd054f406a82a30bb3') build() { cd "${srcdir}/wxPython-src-${pkgver}" @@ -22,6 +22,7 @@ build() { --enable-graphics_ctx --with-gnomeprint --disable-optimize --enable-mediactrl \ --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys cd "${srcdir}/wxPython-src-${pkgver}/wxPython" + patch -p2 -i "${srcdir}/wxpython-cairo.patch" python2 setup.py WXPORT=gtk2 UNICODE=1 build } diff --git a/extra/wxpython/wxpython-cairo.patch b/extra/wxpython/wxpython-cairo.patch new file mode 100644 index 000000000..f3fc6fba0 --- /dev/null +++ b/extra/wxpython/wxpython-cairo.patch @@ -0,0 +1,51 @@ +--- wxPython/trunk/wx/lib/wxcairo.py 2011/08/25 18:50:02 68894 ++++ wxPython/trunk/wx/lib/wxcairo.py 2011/09/22 00:30:25 69181 +@@ -401,6 +401,48 @@ + ctypes.py_object)), + ('Check_Status', ctypes.PYFUNCTYPE(ctypes.c_int, ctypes.c_int))] + ++ # This structure is known good with pycairo 1.10.0. The keep adding stuff ++ # to the middle of the structure instead of only adding to the end! ++ elif cairo.version_info < (1,11): ++ _fields_ = [ ++ ('Context_Type', ctypes.py_object), ++ ('Context_FromContext', ctypes.PYFUNCTYPE(ctypes.py_object, ++ ctypes.c_void_p, ++ ctypes.py_object, ++ ctypes.py_object)), ++ ('FontFace_Type', ctypes.py_object), ++ ('ToyFontFace_Type', ctypes.py_object), #** new in 1.8.4 ++ ('FontFace_FromFontFace', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)), ++ ('FontOptions_Type', ctypes.py_object), ++ ('FontOptions_FromFontOptions', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)), ++ ('Matrix_Type', ctypes.py_object), ++ ('Matrix_FromMatrix', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)), ++ ('Path_Type', ctypes.py_object), ++ ('Path_FromPath', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)), ++ ('Pattern_Type', ctypes.py_object), ++ ('SolidPattern_Type', ctypes.py_object), ++ ('SurfacePattern_Type', ctypes.py_object), ++ ('Gradient_Type', ctypes.py_object), ++ ('LinearGradient_Type', ctypes.py_object), ++ ('RadialGradient_Type', ctypes.py_object), ++ ('Pattern_FromPattern', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p, ++ ctypes.py_object)), #** changed in 1.8.4 ++ ('ScaledFont_Type', ctypes.py_object), ++ ('ScaledFont_FromScaledFont', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)), ++ ('Surface_Type', ctypes.py_object), ++ ('ImageSurface_Type', ctypes.py_object), ++ ('PDFSurface_Type', ctypes.py_object), ++ ('PSSurface_Type', ctypes.py_object), ++ ('SVGSurface_Type', ctypes.py_object), ++ ('Win32Surface_Type', ctypes.py_object), ++ ('Win32PrintingSurface_Type', ctypes.py_object), ++ ('XCBSurface_Type', ctypes.py_object), ++ ('XlibSurface_Type', ctypes.py_object), ++ ('Surface_FromSurface', ctypes.PYFUNCTYPE(ctypes.py_object, ++ ctypes.c_void_p, ++ ctypes.py_object)), ++ ('Check_Status', ctypes.PYFUNCTYPE(ctypes.c_int, ctypes.c_int))] ++ + + def _loadPycairoAPI(): + global pycairoAPI -- cgit v1.2.3-54-g00ecf