From 7858fe5d7a6544b96702d2bdb6f075481816109e Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Wed, 26 Mar 2014 04:03:06 +0000 Subject: Wed Mar 26 03:59:23 UTC 2014 --- community/go/PKGBUILD | 13 +- community/go/go.install | 2 + community/gogglesmm/PKGBUILD | 8 +- community/ipsec-tools/PKGBUILD | 6 +- community/libharu/PKGBUILD | 6 +- community/lilypond/PKGBUILD | 19 +- ...-1ca9814191d16fd3c571d93035247db039254fc1.patch | 29 - ...-7705e46966bfa05015fb9fb20c68da844ab88028.patch | 63 - community/lilypond/texlive-workaround.patch | 88 - community/mate-panel/PKGBUILD | 13 +- community/pdnsd/PKGBUILD | 26 +- community/pdnsd/pdnsd.install | 22 + community/redis/PKGBUILD | 6 +- core/bash/PKGBUILD | 53 +- core/bash/system.bashrc | 6 +- libre/antlr2/gcc4.4.patch | 12 - libre/antlr2/mono.patch | 31 - libre/antlr2/runantlr2.sh | 5 - libre/apache-ant/PKGBUILD | 136 - libre/apache-ant/apache-ant.csh | 2 - libre/apache-ant/apache-ant.sh | 2 - libre/bbswitch-libre/PKGBUILD | 38 - libre/iceweasel-l10n/PKGBUILD | 155 -- libre/iceweasel-libre/PKGBUILD | 244 -- libre/jakarta-oro/PKGBUILD | 31 - libre/java-commons-bsf2/PKGBUILD | 58 - libre/jh/PKGBUILD | 30 - libre/junit/PKGBUILD | 48 - libre/nant/PKGBUILD | 26 - libre/nant/mono3.patch | 2645 -------------------- libre/texlive-bin-libre/texlive.install | 50 - libre/vim-colorsamplerpack-libre/LICENSE | 207 -- libre/vim-colorsamplerpack-libre/PKGBUILD | 44 - pcr/gnuhealth/PKGBUILD | 84 - pcr/python2-qrcode/PKGBUILD | 21 - 35 files changed, 99 insertions(+), 4130 deletions(-) delete mode 100644 community/lilypond/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch delete mode 100644 community/lilypond/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch delete mode 100644 community/lilypond/texlive-workaround.patch create mode 100644 community/pdnsd/pdnsd.install delete mode 100644 libre/antlr2/gcc4.4.patch delete mode 100644 libre/antlr2/mono.patch delete mode 100644 libre/antlr2/runantlr2.sh delete mode 100644 libre/apache-ant/PKGBUILD delete mode 100644 libre/apache-ant/apache-ant.csh delete mode 100644 libre/apache-ant/apache-ant.sh delete mode 100644 libre/bbswitch-libre/PKGBUILD delete mode 100644 libre/iceweasel-l10n/PKGBUILD delete mode 100644 libre/iceweasel-libre/PKGBUILD delete mode 100644 libre/jakarta-oro/PKGBUILD delete mode 100644 libre/java-commons-bsf2/PKGBUILD delete mode 100644 libre/jh/PKGBUILD delete mode 100644 libre/junit/PKGBUILD delete mode 100644 libre/nant/PKGBUILD delete mode 100644 libre/nant/mono3.patch delete mode 100644 libre/texlive-bin-libre/texlive.install delete mode 100644 libre/vim-colorsamplerpack-libre/LICENSE delete mode 100644 libre/vim-colorsamplerpack-libre/PKGBUILD delete mode 100644 pcr/gnuhealth/PKGBUILD delete mode 100644 pcr/python2-qrcode/PKGBUILD diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index 10b8c9e32..ec9fe45bf 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 108208 2014-03-24 20:35:53Z arodseth $ +# $Id: PKGBUILD 108278 2014-03-25 20:32:46Z arodseth $ # Maintainer: Vesa Kaihlavirta # Maintainer: Alexander Rødseth # Contributor: Rémy Oudompheng @@ -12,7 +12,7 @@ pkgname=go epoch=2 pkgver=1.2.1 -pkgrel=3 +pkgrel=4 pkgdesc='Compiler and tools for the Go programming language from Google' arch=('x86_64' 'i686') url='http://golang.org/' @@ -20,11 +20,10 @@ license=('custom') depends=('perl' 'gawk') makedepends=('inetutils' 'mercurial') options=('!strip' 'staticlibs') -optdepends=('liteide: IDE for editing and building projects written in Go' - 'mercurial: scalable distributed SCM tool' - 'git: fast distributed version control system' - 'bzr: decentralized revision control system' - 'svn: concurrent version control system') +optdepends=('mercurial: for fetching sources from mercurial repositories' + 'git: for fetching sources from git repositories' + 'bzr: for fetching sources from bazaar repositories' + 'svn: for fetching sources from subversion repositories') install="$pkgname.install" source=("$pkgname-$pkgver::hg+https://code.google.com/p/$pkgname#branch=release-branch.$pkgname${pkgver/.1}") md5sums=('SKIP') diff --git a/community/go/go.install b/community/go/go.install index 286aaf9dd..d8a228e08 100644 --- a/community/go/go.install +++ b/community/go/go.install @@ -1,6 +1,8 @@ post_install() { # Friendly message for new users echo + echo 'The "liteide" package provides an IDE for editing and building Go projects.' + echo echo 'Example use of the "go" tool:' echo echo ' mkdir ~/go' diff --git a/community/gogglesmm/PKGBUILD b/community/gogglesmm/PKGBUILD index b25e342ed..ad35ca191 100644 --- a/community/gogglesmm/PKGBUILD +++ b/community/gogglesmm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 107592 2014-03-18 09:05:02Z spupykin $ +# $Id: PKGBUILD 108266 2014-03-25 18:02:46Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Sander Jansen pkgname=gogglesmm -pkgver=0.13.0 -pkgrel=5 +pkgver=0.13.1 +pkgrel=1 pkgdesc="Music Manager and Player" arch=('i686' 'x86_64') url="http://gogglesmm.github.io/" @@ -17,7 +17,7 @@ makedepends=('pkgconfig' 'libpulse' 'alsa-lib' 'glproto' 'dri2proto' ) replaces=('musicmanager') conflicts=('musicmanager') source=($pkgname-$pkgver.tar.gz::https://github.com/gogglesmm/gogglesmm/archive/$pkgver.tar.gz) -md5sums=('aa912ea42958311412e2300361d15812') +md5sums=('376ed9ef48ab7bfacb1b7ce88e5146ab') build() { cd $srcdir/gogglesmm-$pkgver diff --git a/community/ipsec-tools/PKGBUILD b/community/ipsec-tools/PKGBUILD index 08a4c6115..fa9650781 100644 --- a/community/ipsec-tools/PKGBUILD +++ b/community/ipsec-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 100178 2013-11-01 20:59:24Z spupykin $ +# $Id: PKGBUILD 108232 2014-03-25 08:56:33Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Allan Henriksen pkgname=ipsec-tools pkgver=0.8.1 -pkgrel=5 +pkgrel=6 pkgdesc="KAME IPSec tools ported to Linux" arch=('i686' 'x86_64') url="http://ipsec-tools.sourceforge.net/" @@ -31,7 +31,7 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin \ --enable-security-context=no --enable-hybrid --enable-dpd --enable-natt \ --enable-adminport --enable-gssapi \ - --with-kernel-headers=/lib/modules/`pacman -Q linux-headers | cut -f2 -d\ `-ARCH/build/include + --with-kernel-headers=/usr/include make } diff --git a/community/libharu/PKGBUILD b/community/libharu/PKGBUILD index d30269628..5847764c7 100644 --- a/community/libharu/PKGBUILD +++ b/community/libharu/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 100196 2013-11-01 21:09:00Z spupykin $ +# $Id: PKGBUILD 108260 2014-03-25 12:36:49Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer : SpepS # Contributor: Auguste @@ -7,8 +7,8 @@ pkgname=libharu pkgver=2.2.1 pkgrel=5 -pkgdesc="C/C++ library for generating PDF documents" -url="http://libharu.org/wiki/Main_Page" +pkgdesc="C library for generating PDF documents" +url="http://libharu.org/" arch=('i686' 'x86_64') license=('custom:ZLIB') depends=('libpng' 'gcc-libs') diff --git a/community/lilypond/PKGBUILD b/community/lilypond/PKGBUILD index 473c7e418..0e8789c80 100644 --- a/community/lilypond/PKGBUILD +++ b/community/lilypond/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 103308 2014-01-02 22:45:42Z spupykin $ +# $Id: PKGBUILD 108241 2014-03-25 10:37:30Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Geoffroy Carrier # Contributor: William Rea # Contributor: Robert Emil Berge pkgname=lilypond -pkgver=2.18.0 -pkgrel=1 +pkgver=2.18.2 +pkgrel=2 pkgdesc="An automated music engraving system" arch=('i686' 'x86_64') url="http://lilypond.org" license=('GPL') depends=('guile1.8' 'python2' 'texlive-core' 'ghostscript' 'pango' 'fontconfig') makedepends=('flex' 'bison' 'gettext' 'mftrace' 'texinfo' 'fontforge' 't1utils' - 'gsfonts' 'texi2html') + 'gsfonts' 'texi2html' 'dblatex' 'texlive-langcyrillic' 'imagemagick' + 'zip' 'rsync' 'netpbm') options=('emptydirs') -#install=lilypond.install +install=lilypond.install source=(http://download.linuxaudio.org/lilypond/sources/v2.18/$pkgname-$pkgver.tar.gz) -md5sums=('5696fec935c616fb437693bed477cc27') +md5sums=('3c4bcbb708d12644668b32bfe82ebf25') prepare() { cd "$srcdir/$pkgname-$pkgver" @@ -32,10 +33,6 @@ prepare() { sed -i 's|GUILE_LDFLAGS=.*|GUILE_LDFLAGS="`pkg-config --libs guile-1.8`"|' configure rm -rf lily/out/ python/out/ - - # Fix build -# patch -Np1 -i "$srcdir/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch" -# patch -Np1 -i "$srcdir/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch" } build() { @@ -44,7 +41,7 @@ build() { export GUILE=/usr/bin/guile1.8 export GUILE_CONFIG=/usr/bin/guile-config1.8 export LDFLAGS="$LDFLAGS -lpthread" - ./configure --prefix=/usr --disable-documentation + ./configure --prefix=/usr make } diff --git a/community/lilypond/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch b/community/lilypond/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch deleted file mode 100644 index 57b5b8ef6..000000000 --- a/community/lilypond/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Julien Rioux -Date: Mon, 28 Oct 2013 20:42:43 +0000 (+0100) -Subject: Build: Fix compilation with GNU make 4.0 -X-Git-Tag: release/2.17.95-1~4^2 -X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=commitdiff_plain;h=1ca9814191d16fd3c571d93035247db039254fc1;hp=025f0236ebab947e6fe2047f20b7f74f4cec3fc4 - -Build: Fix compilation with GNU make 4.0 - -Fix "recipes commence before first target" error. - -Patch from Thomas Klausner. ---- - -diff --git a/stepmake/stepmake/po-targets.make b/stepmake/stepmake/po-targets.make -index 8919dab..8a0dd76 100644 ---- a/stepmake/stepmake/po-targets.make -+++ b/stepmake/stepmake/po-targets.make -@@ -37,10 +37,10 @@ ifneq ($(strip $(ALL_PO_SOURCES)),) - --keyword=_ --keyword=_f --keyword=_i \ - $(XGETTEXT_FLAGS) $(ALL_PO_SOURCES) - endif --endif - sed -i '1,2d' $(po-outdir)/$(package).po - sed -i -e 's/^\# This file is distributed.*/$(sed-header)/' $(po-outdir)/$(package).po - sed -i -e 's/^\"Content-Type: text\/plain.*/$(sed-content)/' $(po-outdir)/$(package).po -+endif - - - po-update: po diff --git a/community/lilypond/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch b/community/lilypond/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch deleted file mode 100644 index ad0c3d4fe..000000000 --- a/community/lilypond/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch +++ /dev/null @@ -1,63 +0,0 @@ -From: Werner Lemberg -Date: Thu, 5 Dec 2013 14:01:48 +0000 (+0100) -Subject: Issue 3694: Use standard inclusion scheme for FreeType headers. -X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=commitdiff_plain;h=7705e46966bfa05015fb9fb20c68da844ab88028;hp=88435714e762229ebe2715bcf6863eb89c1f8dff - -Issue 3694: Use standard inclusion scheme for FreeType headers. - -The most recent FreeType release (2.5.1) has changed locations for header -files. Using the standard way, this is not visible to applications. ---- - -diff --git a/lily/freetype-error.cc b/lily/freetype-error.cc -index 00e5cae..88af76c 100644 ---- a/lily/freetype-error.cc -+++ b/lily/freetype-error.cc -@@ -31,7 +31,7 @@ const struct Freetype_error_message - const char *err_msg; - } ft_errors[] = - --#include -+#include FT_ERRORS_H - - ; - -diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc -index df6a744..837a1f2 100644 ---- a/lily/open-type-font.cc -+++ b/lily/open-type-font.cc -@@ -23,7 +23,7 @@ - - using namespace std; - --#include -+#include FT_TRUETYPE_TABLES_H - - #include "dimensions.hh" - #include "freetype.hh" -diff --git a/lily/pango-font.cc b/lily/pango-font.cc -index ee986fc..b148a5b 100644 ---- a/lily/pango-font.cc -+++ b/lily/pango-font.cc -@@ -22,7 +22,7 @@ - #define PANGO_ENABLE_BACKEND - - #include --#include -+#include FT_XFREE86_H - - #include - #include -diff --git a/lily/ttf.cc b/lily/ttf.cc -index eaeb67a..6d7f97b 100644 ---- a/lily/ttf.cc -+++ b/lily/ttf.cc -@@ -20,7 +20,7 @@ - #include - #include "freetype.hh" - --#include -+#include FT_TRUETYPE_TABLES_H - - #include "international.hh" - #include "memory-stream.hh" diff --git a/community/lilypond/texlive-workaround.patch b/community/lilypond/texlive-workaround.patch deleted file mode 100644 index 1eb262863..000000000 --- a/community/lilypond/texlive-workaround.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff --git a/mf/feta-autometric.mf b/mf/feta-autometric.mf -index d5cbb7f..b25c4bc 100644 ---- a/mf/feta-autometric.mf -+++ b/mf/feta-autometric.mf -@@ -149,7 +149,6 @@ def set_char_box (expr b_sharp, w_sharp, d_sharp, h_sharp) = - & to_bp (w) & " " - & to_bp (h); - special "% MF2PT1: font_size " & decimal designsize; -- special "% MF2PT1: font_slant " & decimal font_slant_; - - for fvar = "font_identifier", - "font_coding_scheme", -@@ -175,9 +174,6 @@ def set_char_box (expr b_sharp, w_sharp, d_sharp, h_sharp) = - fi; - endfor; - -- special "% MF2PT1: font_fixed_pitch " -- & (if font_fixed_pitch_: "1" else: "0" fi); -- - % this must come after the `font_size' special - special "% MF2PT1: charwd " & decimal charwd; - fi; -diff --git a/mf/mf2pt1.mp b/mf/mf2pt1.mp -index a8b45aa..c935628 100644 ---- a/mf/mf2pt1.mp -+++ b/mf/mf2pt1.mp -@@ -61,7 +61,6 @@ def beginchar(expr c,w_sharp,h_sharp,d_sharp) = - def to_bp (expr num) = decimal (ceiling (num*bp_per_pixel)) enddef; - special "% MF2PT1: glyph_dimensions 0 " & to_bp (-d) & " " & to_bp(w) & " " & to_bp(h); - special "% MF2PT1: font_size " & decimal designsize; -- special "% MF2PT1: font_slant " & decimal font_slant_; - special "% MF2PT1: charwd " & decimal charwd; % Must come after the |font_size| |special| - for fvar = "font_identifier", "font_coding_scheme", "font_version", - "font_comment", "font_family", "font_weight", "font_unique_id", -@@ -76,8 +75,6 @@ def beginchar(expr c,w_sharp,h_sharp,d_sharp) = - scantokens ("decimal " & fvar & "_"); - fi; - endfor; -- special "% MF2PT1: font_fixed_pitch " & -- (if font_fixed_pitch_: "1" else: "0" fi); - enddef; - - -@@ -91,19 +88,6 @@ enddef; - - - %% \begin{explaincode} --%% Store the value of \mfcomment --% |font_slant_|, so we can recall it at each |beginchar|. --%% \end{explaincode} -- --font_slant_ := 0; -- --def font_slant expr x = -- font_slant_ := x; -- fontdimen 1: x --enddef; -- -- --%% \begin{explaincode} - %% Redefine \mfcomment - % |bpppix_|, the number of ``big'' points per pixel. \mfcomment - % This in turn redefines |mm|, |in|, |pt|, and other derived units. -@@ -141,11 +125,6 @@ forsuffixes fvar = font_underline_position, font_underline_thickness: - scantokens ("def " & str fvar & " expr x = " & str fvar & "_ := x enddef;"); - endfor; - --boolean font_fixed_pitch_; --font_fixed_pitch_ := false; --def font_fixed_pitch expr x = font_fixed_pitch_ := x enddef; -- -- - %% \begin{explaincode} - %% We'd like to be able to use calligraphic pens. Normally, MetaPost's - %% output routine does all the work for us of converting these to filled -diff --git a/scripts/build/mf2pt1.pl b/scripts/build/mf2pt1.pl -index 95df0f8..20f410b 100644 ---- a/scripts/build/mf2pt1.pl -+++ b/scripts/build/mf2pt1.pl -@@ -427,7 +427,7 @@ ENDHEADER - sub get_bboxes ($) - { - execute_command 1, ("mpost", "-mem=mf2pt1", "-progname=mpost", -- "\\mode:=localfont; mag:=$mag; bpppix $bpppix; input $mffile"); -+ "\\mode:=localfont; mag:=$mag; bpppix:=$bpppix; input $mffile"); - opendir (CURDIR, ".") || die "${progname}: $! ($filedir)\n"; - @charfiles = sort - { ($a=~ /\.(\d+)$/)[0] <=> ($b=~ /\.(\d+)$/)[0] } diff --git a/community/mate-panel/PKGBUILD b/community/mate-panel/PKGBUILD index 543287adb..4fd7ca24f 100644 --- a/community/mate-panel/PKGBUILD +++ b/community/mate-panel/PKGBUILD @@ -2,7 +2,7 @@ pkgname=mate-panel pkgver=1.8.0 -pkgrel=2 +pkgrel=3 pkgdesc="The MATE Panel" url="http://mate-desktop.org" arch=('i686' 'x86_64') @@ -14,17 +14,10 @@ makedepends=('gobject-introspection' 'mate-common' 'networkmanager' 'perl-xml-parser' 'yelp-tools') optdepends=('yelp: for reading MATE help documents') groups=('mate') -source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz" - "https://github.com/City-busz/mate-panel/commit/f4d754c48a1cb141407ca28d80431cbd954a5ef5.diff") -sha1sums=('289bca55fb26465f2c155d087932d6973edf07d9' - '8c67a6aacfad3ee8225410f1ff1e37c6da3d5bc8') +source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz") +sha1sums=('289bca55fb26465f2c155d087932d6973edf07d9') install=${pkgname}.install -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/f4d754c48a1cb141407ca28d80431cbd954a5ef5.diff" -} - build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ diff --git a/community/pdnsd/PKGBUILD b/community/pdnsd/PKGBUILD index d8fe5189d..d9d941e52 100644 --- a/community/pdnsd/PKGBUILD +++ b/community/pdnsd/PKGBUILD @@ -1,29 +1,39 @@ -# $Id: PKGBUILD 91500 2013-05-23 10:14:34Z spupykin $ +# $Id: PKGBUILD 108220 2014-03-25 02:22:26Z thestinger $ # Maintainer: Sergej Pupykin +# Contributor: Daniel Micay # Contributor: Henrik Nymann Jensen pkgname=pdnsd pkgver=1.2.9.a _pkgver=${pkgver/.a/a} -pkgrel=4 +pkgrel=5 pkgdesc="Proxy DNS server with permanent caching" arch=(i686 x86_64) url="http://members.home.nl/p.a.rombouts/pdnsd/" license=('GPL') depends=('glibc') +backup=(etc/pdnsd.conf) +install=${pkgname}.install source=(http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-$_pkgver-par.tar.gz service) md5sums=('2f3e705d59a0f9308ad9504b24400769' '4f86bdbd8495b53341070d5720491996') build() { - cd $srcdir/$pkgname-${_pkgver} - ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --enable-ipv6 - make + cd "$srcdir/$pkgname-$_pkgver" + ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --enable-ipv6 + make } package() { - cd $srcdir/$pkgname-${_pkgver} - make DESTDIR=$pkgdir install - install -Dm0644 $srcdir/service $pkgdir/usr/lib/systemd/system/pdnsd.service + cd "$srcdir/$pkgname-$_pkgver" + make DESTDIR="$pkgdir" install + install -Dm0644 ../service "$pkgdir/usr/lib/systemd/system/pdnsd.service" + + # Rename the configuration file, so users get pacnew files. + mv "$pkgdir/etc/pdnsd.conf.sample" "$pkgdir/etc/pdnsd.conf" + + sed -i 's/"nobody"/"pdnsd"/' "$pkgdir/etc/pdnsd.conf" + + chown 184:184 "$pkgdir/var/cache/pdnsd" } diff --git a/community/pdnsd/pdnsd.install b/community/pdnsd/pdnsd.install new file mode 100644 index 000000000..c1c10f044 --- /dev/null +++ b/community/pdnsd/pdnsd.install @@ -0,0 +1,22 @@ +post_install() { + getent group pdnsd &>/dev/null || groupadd -g 184 pdnsd >/dev/null + getent passwd pdnsd &>/dev/null || useradd -u 184 -g pdnsd -d /var/lib/pdnsd -c 'Proxy DNS server' -s /bin/nologin pdnsd >/dev/null + true +} + +post_upgrade() { + if [[ $(vercmp $2 1.2.9.a-5) -le 0 ]]; then + # in case the user/group were already created as recommended by the wiki + userdel pdnsd &>/dev/null + groupdel pdnsd &>/dev/null + + post_install + chown -R 184:184 /var/cache/pdnsd + fi +} + +post_remove() { + getent passwd pdnsd &>/dev/null && userdel pdnsd >/dev/null + getent group pdnsd &>/dev/null && groupdel pdnsd >/dev/null + true +} diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index 9dc84721d..99cb22424 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 106524 2014-03-05 17:09:27Z spupykin $ +# $Id: PKGBUILD 108268 2014-03-25 18:03:08Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Jan-Erik Rediger # Contributor: nofxx .com> pkgname=redis -pkgver=2.8.7 +pkgver=2.8.8 pkgrel=1 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ source=("http://download.redis.io/releases/redis-$pkgver.tar.gz" "redis.service" "redis.logrotate" "redis.tmpfiles.d") -md5sums=('3fc0bcdf6aef491ca2f08e62e4de7bc2' +md5sums=('f3af82ca88b9d84c81d0b77614d07426' '5320aa6d0f31aadc1d6202ca40425aea' '9e2d75b7a9dc421122d673fe520ef17f' 'dd9ab8022b4d963b2e5899170dfff490') diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD index b9533b217..3395a09e7 100644 --- a/core/bash/PKGBUILD +++ b/core/bash/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 208144 2014-03-18 07:53:38Z bpiotrowski $ -# Maintainer: Allan McRae +# $Id: PKGBUILD 208718 2014-03-25 12:08:31Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski +# Contributor: Allan McRae # Contributor: Aaron Griffin pkgname=bash _basever=4.3 _patchlevel=000 #prepare for some patches pkgver=$_basever #.$_patchlevel -pkgrel=2 -pkgdesc="The GNU Bourne Again shell" +pkgrel=3 +pkgdesc='The GNU Bourne Again shell' arch=('i686' 'x86_64') license=('GPL') -url="http://www.gnu.org/software/bash/bash.html" +url='http://www.gnu.org/software/bash/bash.html' groups=('base') backup=(etc/bash.bash{rc,_logout} etc/skel/.bash{rc,_profile,_logout}) depends=('readline>=6.3' 'glibc') @@ -24,27 +25,27 @@ source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig} system.bash_logout bash-4.3-debug-trap.patch bash-4.3-test-nameref.patch) -if [ $_patchlevel -gt 000 ]; then +if [[ $_patchlevel -gt 000 ]]; then for (( p=1; p<=$((10#${_patchlevel})); p++ )); do source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-$_basever-patches/bash${_basever//./}-$(printf "%03d" $p){,.sig}) done fi prepare() { - cd ${srcdir}/${pkgname}-$_basever + cd $pkgname-$_basever for (( p=1; p<=$((10#${_patchlevel})); p++ )); do msg "applying patch bash${_basever//./}-$(printf "%03d" $p)" - patch -p0 -i $srcdir/bash${_basever//./}-$(printf "%03d" $p) + patch -p0 -i ../bash${_basever//./}-$(printf "%03d" $p) done - + # upstream patches I assume will be made official later... - patch -p0 -i $srcdir/bash-4.3-debug-trap.patch - patch -p0 -i $srcdir/bash-4.3-test-nameref.patch + patch -p0 -i ../bash-4.3-debug-trap.patch + patch -p0 -i ../bash-4.3-test-nameref.patch } build() { - cd ${srcdir}/${pkgname}-$_basever + cd $pkgname-$_basever _bashconfig=(-DDEFAULT_PATH_VALUE=\'\"/usr/local/sbin:/usr/local/bin:/usr/bin\"\' -DSTANDARD_UTILS_PATH=\'\"/usr/bin\"\' @@ -58,26 +59,22 @@ build() { } check() { - cd ${srcdir}/${pkgname}-$_basever - make check + make -C $pkgname-$_basever check } package() { - cd ${srcdir}/${pkgname}-$_basever - make DESTDIR=${pkgdir} install - - ln -s bash ${pkgdir}/usr/bin/sh + make -C $pkgname-$_basever DESTDIR="$pkgdir" install + ln -s bash "$pkgdir"/usr/bin/sh - install -dm755 ${pkgdir}/etc/skel/ - + install -dm755 "$pkgdir"/etc/skel/ # system-wide configuration files - install -m644 ${srcdir}/system.bashrc ${pkgdir}/etc/bash.bashrc - install -m644 ${srcdir}/system.bash_logout ${pkgdir}/etc/bash.bash_logout - + install -m644 system.bashrc $pkgdir/etc/bash.bashrc + install -m644 system.bash_logout "$pkgdir"/etc/bash.bash_logout + # user configuration file skeletons - install -m644 ${srcdir}/dot.bashrc ${pkgdir}/etc/skel/.bashrc - install -m644 ${srcdir}/dot.bash_profile ${pkgdir}/etc/skel/.bash_profile - install -m644 ${srcdir}/dot.bash_logout ${pkgdir}/etc/skel/.bash_logout + install -m644 dot.bashrc "$pkgdir"/etc/skel/.bashrc + install -m644 dot.bash_profile "$pkgdir"/etc/skel/.bash_profile + install -m644 dot.bash_logout "$pkgdir"/etc/skel/.bash_logout } md5sums=('81348932d5da294953e15d4814c74dd1' @@ -85,9 +82,7 @@ md5sums=('81348932d5da294953e15d4814c74dd1' '027d6bd8f5f6a06b75bb7698cb478089' '2902e0fee7a9168f3a4fd2ccd60ff047' '42f4400ed2314bd7519c020d0187edc5' - '3546099a1b2f667adc9794f52e78e35b' + '561949793177116b7be29a07c385ba8b' '472f536d7c9e8250dc4568ec4cfaf294' '3d5b91bc498c43d7bf902b679c8168ef' '0615db31244215fd102ecbcd38b8b2e8') - - diff --git a/core/bash/system.bashrc b/core/bash/system.bashrc index a2231e861..4d7a64344 100644 --- a/core/bash/system.bashrc +++ b/core/bash/system.bashrc @@ -12,11 +12,11 @@ PS4='+ ' case ${TERM} in xterm*|rxvt*|Eterm|aterm|kterm|gnome*) - PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"' - + PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"' + ;; screen) - PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033_%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"' + PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033_%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"' ;; esac diff --git a/libre/antlr2/gcc4.4.patch b/libre/antlr2/gcc4.4.patch deleted file mode 100644 index 15e25fb00..000000000 --- a/libre/antlr2/gcc4.4.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp ---- antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp -+++ antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp -@@ -10,6 +10,8 @@ - - #include - -+#include -+#include - #include - - #ifdef HAS_NOT_CCTYPE_H diff --git a/libre/antlr2/mono.patch b/libre/antlr2/mono.patch deleted file mode 100644 index 59c78d811..000000000 --- a/libre/antlr2/mono.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -ruN antlr-2.7.7.orig/lib/csharp/antlr.runtime.build antlr-2.7.7/lib/csharp/antlr.runtime.build ---- antlr-2.7.7.orig/lib/csharp/antlr.runtime.build 2006-11-01 16:37:17.000000000 -0500 -+++ antlr-2.7.7/lib/csharp/antlr.runtime.build 2013-05-14 20:07:32.000000000 -0400 -@@ -25,6 +25,9 @@ - - -