diff options
25 files changed, 459 insertions, 182 deletions
diff --git a/java/java-rxtx/0000-configure-java-version.patch b/java/java-rxtx/0000-configure-java-version.patch new file mode 100644 index 000000000..c9e37258a --- /dev/null +++ b/java/java-rxtx/0000-configure-java-version.patch @@ -0,0 +1,93 @@ +Make the JAVA_VERSION checks future-proof (for Java 6 and 7) + +At this point Java is mature enough that support for older versions isn't +going to be dropped, so instead of having a growing list of new versions that +work by default, have a short list of old versions that need special measures. +--- RXTX.orig/configure.in 2012-10-29 01:13:58.000000000 -0400 ++++ RXTX/configure.in 2012-10-29 10:56:18.000000000 -0400 +@@ -463,12 +463,6 @@ + CFLAGS=$CFLAGS" -D__need_timespec" + case $JAVA_VERSION in + +- 1.2*|1.3*|1.4*|1.5*) +- #fix_parameters $JPATH/jre/lib/javax.comm.properties +- CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1` +- JHOME=$JPATH"/jre/lib/ext" +- RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)" +- ;; + 1.1*) + CLASSPATH=".:\$(TOP):\$(TOP)/src:"` \ + if [ -d $JPATH/share/kaffe/ ]; then +@@ -498,6 +492,12 @@ + JHOME=$JPATH/"lib" + fi + ;; ++ *) ++ #fix_parameters $JPATH/jre/lib/javax.comm.properties ++ CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1` ++ JHOME=$JPATH"/jre/lib/ext" ++ RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)" ++ ;; + esac + + # Cross Compilers +@@ -533,12 +533,6 @@ + TARGETLIB="\$(target_triplet)/librxtxSerial.la \ + \$(target_triplet)/librxtxParallel.la" + case $JAVA_VERSION in +- 1.2*|1.3*|1.4*|1.5*) +- #fix_parameters $JPATH/jre/lib/javax.comm.properties +- CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1` +- RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)" +- JHOME=$JPATH/"jre/lib/ext" +- ;; + 1.1*) + check_prefix + #fix_parameters $JPATH/lib/javax.comm.properties +@@ -570,6 +564,10 @@ + JHOME=$JPATH/"lib" + ;; + *) ++ #fix_parameters $JPATH/jre/lib/javax.comm.properties ++ CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1` ++ RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)" ++ JHOME=$JPATH/"jre/lib/ext" + ;; + esac + ;; +@@ -669,15 +667,15 @@ + + WIN32) + case $JAVA_VERSION in +- 1.2*|1.3*|1.4*|1.5*) +- CLASSPATH=".:\$(TOP):\$(TOP)/src:`find $JPATH/ -name RXTXcomm.jar |head -n1`:$CLASSPATH" +- JHOME=$JPATH"/jre/lib/ext" +- ;; + 1.1*) + CLASSPATH=".:\$(TOP):\$(TOP)/src:\$(JPATH)/lib/classes.zip:\$(JPATH)/lib/RXTXcomm.jar:$CLASSPATH" + RXTX_PATH="\$(prefix)/lib/" + JHOME=$JPATH/"lib" + ;; ++ *) ++ CLASSPATH=".:\$(TOP):\$(TOP)/src:`find $JPATH/ -name RXTXcomm.jar |head -n1`:$CLASSPATH" ++ JHOME=$JPATH"/jre/lib/ext" ++ ;; + esac + if test x$WIN32INCLUDE = x; then + echo "We need to know what directory the windows java include files" +@@ -721,12 +719,12 @@ + CLASSPATH=".:\$(TOP):\$(TOP)/src:\$(JPATH)/lib/classes.zip:\$(JPATH)/lib/RXTXcomm.jar:$CLASSPATH" + + case $JAVA_VERSION in +- 1.2*|1.3*|1.4*|1.5*) +- RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)" +- ;; + 1.1*) + RXTX_PATH="\$(JPATH)/lib/" + ;; ++ *) ++ RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)" ++ ;; + esac + ;; + diff --git a/java/java-rxtx/0001-makefile-destdir.patch b/java/java-rxtx/0001-makefile-destdir.patch new file mode 100644 index 000000000..944654ab6 --- /dev/null +++ b/java/java-rxtx/0001-makefile-destdir.patch @@ -0,0 +1,21 @@ +Add DESTDIR support to Makefile +--- RXTX.orig/Makefile.am ++++ RXTX/Makefile.am +@@ -81,13 +81,15 @@ + # install librxtxSerial.so into the proper directory and copy $(JARTARGET) to its + # proper location + install: all ++ $(mkinstalldirs) $(DESTDIR)$(RXTX_PATH) ++ $(mkinstalldirs) $(DESTDIR)$(JHOME) + @$(LIBTOOL_INST) \ + `for i in $(TARGETLIB);do \ + if [ -f $$i ];then \ + echo $$i; \ + fi; \ +- done` $(RXTX_PATH) +- $(INSTALL_PROGRAM) $(JARTARGET) $(JHOME)/ ++ done` $(DESTDIR)$(RXTX_PATH) ++ $(INSTALL_PROGRAM) $(JARTARGET) $(DESTDIR)$(JHOME)/ + + clean-generic: + rm -rf $(DEST) $(TOP)/$(CLASSTOP) diff --git a/java/java-rxtx/0002-makefile-javadoc-dir.patch b/java/java-rxtx/0002-makefile-javadoc-dir.patch new file mode 100644 index 000000000..9b4eb0692 --- /dev/null +++ b/java/java-rxtx/0002-makefile-javadoc-dir.patch @@ -0,0 +1,13 @@ +Place the Javadoc output in its own directory +--- RXTX.orig/Makefile.am ++++ RXTX/Makefile.am +@@ -99,7 +99,8 @@ + + # create the javadoc files. + docs: $(CLASSES) +- $(JAVADOC) $(javafiles) ++ mkdir javadoc ++ cd javadoc && $(JAVADOC) $(javafiles) + + ################ WIN32 CrossCompiling from here down ####################### + diff --git a/java/java-rxtx/0003-lockdir-location.patch b/java/java-rxtx/0003-lockdir-location.patch new file mode 100644 index 000000000..78a757f81 --- /dev/null +++ b/java/java-rxtx/0003-lockdir-location.patch @@ -0,0 +1,18 @@ +Fix the location of device lock files. + +Use the new semi-standard device lock file directory on GNU/Linux. This is +nescessary on (at least) Arch Linux and Parabola GNU/Linux. + +http://lists.freedesktop.org/archives/systemd-devel/2011-March/001823.html + +--- RXTX.orig/src/SerialImp.h ++++ RXTX/src/SerialImp.h +@@ -109,7 +109,7 @@ + /* Ports known on the OS */ + #if defined(__linux__) + # define DEVICEDIR "/dev/" +-# define LOCKDIR "/var/lock" ++# define LOCKDIR "/var/lock/lockdev" + # define LOCKFILEPREFIX "LCK.." + # define FHS + #endif /* __linux__ */ diff --git a/java/java-rxtx/GroupMembership.txt b/java/java-rxtx/GroupMembership.txt new file mode 100644 index 000000000..dd5c47076 --- /dev/null +++ b/java/java-rxtx/GroupMembership.txt @@ -0,0 +1,7 @@ +In order to use a program that makes use of rxtx, you must be a member +of the groups: + * uucp: for access to hardware devices in /dev + * lock: for access to hardware lockfiles in /var/lock/lockdev + +Most documentation indicates that you must be in one or the other, +depending on your distro; you must actually be in both. diff --git a/java/java-rxtx/PKGBUILD b/java/java-rxtx/PKGBUILD index 30ed25967..8d609f5ae 100644 --- a/java/java-rxtx/PKGBUILD +++ b/java/java-rxtx/PKGBUILD @@ -1,54 +1,93 @@ # Maintainer (Parabola): Luke Shumaker <lukeshu@sbcglobal.net> -# Maintainer (AUR): PyroPeter <googlemail.com@abi1789> -pkgname=java-rxtx _pkgver=2.1-7r2-arduino4 _gitver='commit=a8cd90f8505d7c472b57550b1192fe67885dd638' -pkgver=${_pkgver//-/.} -pkgrel=1 +#### + +pkgname=java-rxtx +pkgver=${_pkgver//-/.} pkgdesc="A native library providing serial and parallel communication for Java" +license=(LGPL2.1) + +pkgrel=2 arch=('i686' 'x86_64') -depends=('java-environment') +depends=('java-runtime') +makedepends=('java-environment' 'pacman>4.0.3') case "$_pkgver" in *arduino*) url="https://github.com/arduino/RXTX" - source=("git://github.com/arduino/RXTX.git#${_gitver}" - java7-configure.patch - destdir.patch) - license=(LGPL) - changelog=ChangeLog.txt + source=("git://github.com/arduino/RXTX.git#${_gitver}") + md5sums=('SKIP') _dirname=RXTX ;; *) url="http://rxtx.qbang.org/" - source=("http://rxtx.qbang.org/pub/rxtx/rxtx-${_pkgver}.zip" - destdir.patch) - # Todo: patch for Java 6 AND Java 7 - license=('custom:LGPL-with-java-exception') + source=("http://rxtx.qbang.org/pub/rxtx/rxtx-${_pkgver}.zip") + md5sums=('9290b4832d46199f8d798a531209640b') _dirname=rxtx-{$_pkgver} ;; esac +source+=( + 0000-configure-java-version.patch + 0001-makefile-destdir.patch + 0002-makefile-javadoc-dir.patch + 0003-lockdir-location.patch + GroupMembership.txt) + +md5sums+=('a36caaca717018341d69605f962d1c2a' + '39c88043032de742c6b51d90a26eee2c' + 'a910e0c75a9c687d2b2f782e3d9982e3' + '19b19c2514bce563be2a812888e1d9b4' + '9dc461eab358e3b78c4b688977997116') + +_MAKEFLAGS=('JHOME=/usr/share/java' 'RXTX_PATH=/usr/lib') + +_changelog() { + t="`echo -e '\t'`" + + # Parabola changes + ls "$srcdir"/*.patch | sort -r | while read file; do + echo "${file##*/}" + sed "1s/./$t$t&/;1q" "$file" + done + + # Arduino changes + if [[ -d "$srcdir/$_dirname/.git" ]]; then + pushd "$srcdir/$_dirname" > /dev/null + git log --pretty=format:"%h %ad%n$t$t%s" --date=short|head -n-2 + popd > /dev/null + fi + + # RXTX ChangeLog + grep "^[0-9 $t]" "$srcdir/$_dirname/ChangeLog" +} + build() { + _changelog > "$srcdir/ChangeLog.txt" cd "$srcdir/$_dirname" . /etc/profile.d/jdk.sh - patch -i "$srcdir/java7-configure.patch" - patch -i "$srcdir/destdir.patch" + patch -Np1 -i "$srcdir/0000-configure-java-version.patch" # requires autogen + patch -Np1 -i "$srcdir/0001-makefile-destdir.patch" # requires autogen + patch -Np1 -i "$srcdir/0002-makefile-javadoc-dir.patch" # requires autogen + patch -Np1 -i "$srcdir/0003-lockdir-location.patch" + rm *.m4 && ./autogen.sh ./configure --prefix=/usr - make + make "${_MAKEFLAGS[@]}" all docs } package() { cd "$srcdir/$_dirname" . /etc/profile.d/jdk.sh - make DESTDIR="$pkgdir" install -} + make "${_MAKEFLAGS[@]}" DESTDIR="$pkgdir" install -md5sums=('SKIP' - 'f07bc244660852dd9b016c190e38e1c9' - '90be9bdf1d8cbe5304739df066559a13') + install -d "$pkgdir/usr/share/doc/$pkgname/" + install -m644 "$srcdir/ChangeLog.txt" "$pkgdir/usr/share/doc/$pkgname/" + install -m644 "$srcdir/GroupMembership.txt" "$pkgdir/usr/share/doc/$pkgname/" + cp -r javadoc "$pkgdir/usr/share/doc/$pkgname/" +} diff --git a/libre/gnu-ghostscript/PKGBUILD b/libre/gnu-ghostscript/PKGBUILD index c7f952833..3270a3d4d 100644 --- a/libre/gnu-ghostscript/PKGBUILD +++ b/libre/gnu-ghostscript/PKGBUILD @@ -1,33 +1,29 @@ -# Maintainer: André Silva <andre.paulista@adinet.com.uy> +# Maintainer: André Silva <emulatorman@lavabit.com> +_pkgname=ghostscript pkgname=gnu-ghostscript -_pkgver=9.04 -pkgver=9.04.1 +_pkgver=9.05 +pkgver=9.05.0 pkgrel=1 -pkgdesc="An interpreter for the PostScript language from FSF" +pkgdesc="An interpreter for the PostScript language maintained by a team of GNU programmers" arch=('i686' 'x86_64') license=('GPL3') -depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' 'libtiff>=4.0.0' 'lcms') # 'lcms2' won't get used) # move in libpaper from community? +depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' 'libtiff>=4.0.0' 'lcms2') makedepends=('gtk2' 'gnutls') optdepends=('texlive-core: needed for dvipdf' 'gtk2: needed for gsx') -conflicts=('ghostscript') -replaces=('ghostscript-lrpng' 'ghostscript') -provides=('ghostscript-lprng' "ghostscript=$pkgver") -url="https://www.gnu.org/software/ghostscript/" -source=(ftp://ftp.gnu.org/gnu/ghostscript/${pkgname}-${pkgver}.tar.xz - ${pkgname}-cups-rgbw.patch - libtool.patch) +conflicts=${_pkgname} +replaces=${_pkgname} +provides="${_pkgname}=9.06" +url="https://www.gnu.org/software/${_pkgname}/" +source=(ftp://ftp.gnu.org/gnu/${_pkgname}/${pkgname}-${pkgver}.tar.xz + libtool.patch) options=('!libtool' '!makeflags') -md5sums=('aba639a5102afbd2ee30c67831692c27' - '5a78af559d44a7502978fd09f840e3aa' +md5sums=('e80423be9abb32fc99cc897ed379a7df' '5bd5d4966007b460deed866a30a0b3c8') build() { cd ${srcdir}/${pkgname}-${pkgver} - - # fix broken color printing https://bugs.archlinux.org/task/25519 - patch -Np1 -i ${srcdir}/${pkgname}-cups-rgbw.patch # fix libtool version patch -Np1 -i ${srcdir}/libtool.patch @@ -35,7 +31,7 @@ build() { # force it to use system-libs rm -rf jpeg libpng zlib jasper expat tiff lcms freetype -LIBS=-lfreetype ./configure --prefix=/usr \ + ./configure --prefix=/usr \ --enable-dynamic \ --with-ijs \ --with-jbig2dec \ @@ -47,6 +43,7 @@ LIBS=-lfreetype ./configure --prefix=/usr \ --enable-fontconfig \ --enable-freetype \ --without-luratech \ + --with-system-libtiff \ --disable-compile-inits #--help # needed for linking with system-zlib make @@ -64,9 +61,9 @@ package() { cups_serverbin=${pkgdir}/usr/lib/cups install soinstall # install missing doc files # http://bugs.archlinux.org/task/18023 - install -m 644 ${srcdir}/${pkgname}-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} ${pkgdir}/usr/share/ghostscript/$_pkgver/doc/ + install -m 644 ${srcdir}/${pkgname}-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} ${pkgdir}/usr/share/${_pkgname}/$_pkgver/doc/ - mkdir -p ${pkgdir}/usr/share/licenses/ghostscript + mkdir -p ${pkgdir}/usr/share/licenses/${_pkgname} install -m644 LICENSE ${pkgdir}/usr/share/licenses/${_pkgname}/ # remove unwanted localized man-pages diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index dec731c97..6efc06b90 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -1,102 +1,45 @@ # Maintainer: Joshua Haase <hahj87@gmail.com +# Contributor: Luke Shumaker <lukeshu@sbcglobal.net> # Contributor: fauno <fauno@kiwwwi.com.ar> pkgbase=libretools pkgname=(libretools libretools-pr libretools-mips64el) -pkgver=$(date -u +%Y%m%d) -pkgrel=2 -pkgdesc="Scripts for easing Parabola's tasks" -arch=('any') +pkgver=20121107 +pkgdesc="Scripts for Parabola development" url="http://parabolagnulinux.org" license=('GPL3+') -depends=(openssh rsync git wget) -optdepends=('devtools: For chroot (libremkchroot, librechroot, libremakepkg)') -makedepends=(git) -install=libretools.install -source=() -md5sums=() -_gitroot="http://projects.parabolagnulinux.org/libretools.git" -_gitname="libretools" +pkgrel=1 +arch=('any') +depends=(openssh rsync git wget devtools) +install=libretools.install +source=(https://projects.parabolagnulinux.org/$pkgbase.git/snapshot/$pkgbase-$pkgver.tar.bz2) build() { - cd "$srcdir" - ## Git checkout - if [ -d $srcdir/${_gitname} ] ; then - msg "Git checkout: Updating existing tree" - cd ${_gitname} && git pull ${_gitroot} - msg "Git checkout: Tree has been updated" - else - msg "Git checkout: Retrieving sources" - git clone ${_gitroot} - fi - msg "Checkout completed" - ## Build + cd "$srcdir/$pkgbase-$pkgver" + make } package_libretools() { backup=(etc/libretools.conf) - install -d ${pkgdir}/etc/libretools.d - install -m644 ${_gitname}/libretools.conf ${pkgdir}/etc/ - - install -d ${pkgdir}/usr/bin - install -d ${pkgdir}/usr/sbin - install -m755 ${_gitname}/abslibre-commit ${pkgdir}/usr/bin - install -m755 ${_gitname}/add-mips64el ${pkgdir}/usr/bin - install -m755 ${_gitname}/aur ${pkgdir}/usr/bin - install -m755 ${_gitname}/buildenv ${pkgdir}/usr/sbin - install -m755 ${_gitname}/chcleanup ${pkgdir}/usr/bin - install -m755 ${_gitname}/createworkdir ${pkgdir}/usr/bin - install -m755 ${_gitname}/diff-unfree ${pkgdir}/usr/bin - install -m755 ${_gitname}/fullpkg ${pkgdir}/usr/bin - install -m755 ${_gitname}/fullpkg-build ${pkgdir}/usr/bin - install -m755 ${_gitname}/fullpkg-find ${pkgdir}/usr/bin - install -m755 ${_gitname}/is_built ${pkgdir}/usr/bin - install -m755 ${_gitname}/is_unfree ${pkgdir}/usr/bin - install -m755 ${_gitname}/lb ${pkgdir}/usr/bin - install -m755 ${_gitname}/libreaddiff ${pkgdir}/usr/bin - install -m755 ${_gitname}/librebasebuilder ${pkgdir}/usr/bin - install -m755 ${_gitname}/librechroot ${pkgdir}/usr/sbin - install -m755 ${_gitname}/librecommit ${pkgdir}/usr/bin - install -m755 ${_gitname}/librediff ${pkgdir}/usr/bin - install -m755 ${_gitname}/libremakepkg ${pkgdir}/usr/sbin - install -m755 ${_gitname}/libremessages ${pkgdir}/usr/bin - install -m755 ${_gitname}/libremkchroot ${pkgdir}/usr/bin - install -m755 ${_gitname}/librerelease ${pkgdir}/usr/bin - install -m755 ${_gitname}/librerepkg ${pkgdir}/usr/bin - install -m755 ${_gitname}/librestage ${pkgdir}/usr/bin - install -m755 ${_gitname}/pkgbuild-check-nonfree ${pkgdir}/usr/bin - install -m755 ${_gitname}/toru ${pkgdir}/usr/bin - install -m755 ${_gitname}/toru-path ${pkgdir}/usr/bin - install -m755 ${_gitname}/toru-utils ${pkgdir}/usr/bin - install -m755 ${_gitname}/toru-where ${pkgdir}/usr/bin - install -m755 ${_gitname}/updateabslibre ${pkgdir}/usr/bin - install -m755 ${_gitname}/update-cleansystem ${pkgdir}/usr/sbin - - install -d ${pkgdir}/usr/share/pacman - install -m755 ${_gitname}/rePKGBUILD.proto ${pkgdir}/usr/share/pacman + cd "$srcdir/$pkgbase-$pkgver" + make install-libretools DESTDIR="$pkgdir" + install -Dm755 rePKGBUILD.proto ${pkgdir}/usr/share/pacman/rePKGBUILD.proto } package_libretools-pr() { backup=('etc/libretools.d/prtools.conf') - install -d ${pkgdir}/etc/libretools.d - install -m644 ${_gitname}/prtools/prtools.conf ${pkgdir}/etc/libretools.d - - install -d ${pkgdir}/usr/bin - install -m755 ${_gitname}/prtools/prfullpkg ${pkgdir}/usr/bin - install -m755 ${_gitname}/prtools/prmipsrelease ${pkgdir}/usr/bin - install -m755 ${_gitname}/prtools/prtoru ${pkgdir}/usr/bin + cd "$srcdir/$pkgbase-$pkgver" + make install-libretools-pr DESTDIR="$pkgdir" } package_libretools-mips64el() { backup=('etc/libretools.d/mips64el.conf') - install -d ${pkgdir}/etc/libretools.d - install -m755 ${_gitname}/mips64el/mips64el.conf ${pkgdir}/etc/libretools.d - - install -d ${pkgdir}/usr/bin - install -m755 ${_gitname}/mips64el/mips-add ${pkgdir}/usr/bin - install -m755 ${_gitname}/mips64el/mipsrelease ${pkgdir}/usr/bin + cd "$srcdir/$pkgbase-$pkgver" + make install-libretools-mips64el DESTDIR="$pkgdir" } + +md5sums=('d80cc433cc627b2d7aa1c37f794d2ef9') diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index 294c5afbf..68dfccc79 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,11 +1,11 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.6.5 +_kernver=3.6.6 _kernrel=1 pkgname=('linux-libre-kmod-alx') _pkgver=2012-10-03 pkgver=20121003 -pkgrel=4 +pkgrel=5 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://linuxwireless.org/' diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index ffda9f21f..65bae7c0b 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,11 +1,11 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.0.50 +_kernver=3.0.51 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _pkgver=2012-10-03 pkgver=20121003 -pkgrel=5 +pkgrel=6 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://linuxwireless.org/' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 1bcdb57fd..b7ffda209 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -7,10 +7,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=50 +_sublevel=51 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.49 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.50 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - '8c0723e49160ecd399205f9bbb8ee076' + 'fb3c742b1f8b01131534a22348cfa712' 'aed25ab047e1c0b020a1516c235c6a74' '7d37e8ce0f4bd5a957172b12ae742ea0' 'c072b17032e80debc6a8626299245d46' @@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - 'fba8d3ccd4a7e5b1132c9e20f60df1df') + 'e2cc9f33fb26b254b6b65f8981aebf13') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index c961f9a99..75238bf66 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.50-1-LIBRE-LTS +KERNEL_VERSION=3.0.51-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index d5b44814f..0487c2e84 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.6 -_sublevel=5 +_sublevel=6 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.5 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -33,7 +33,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.6.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('a2312edd0265b5b07bd4b50afae2b380' - 'a126c193c6fbb3acff00c426493897df' + '887e4a0fd0fb10da9410f5d1a75466b8' 'e4a3a4677e1fac6ecf0e0fb44c41ca08' '68fc36a4efb6ade0eca409b9444fef0c' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -43,7 +43,7 @@ md5sums=('a2312edd0265b5b07bd4b50afae2b380' '9d3c56a4b999c8bfbd4018089a62f662' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - 'ba95fd06943438f0cf54d1818e034fcc') + '16173f50a1a39e908825fe6fe90ac103') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 30b5abc90..8a3791240 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.6.5-1-LIBRE +KERNEL_VERSION=3.6.6-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD index 5a8b77e33..8292119d8 100644 --- a/libre/parabola-keyring/PKGBUILD +++ b/libre/parabola-keyring/PKGBUILD @@ -1,8 +1,7 @@ -# $Id$ # Maintainer: André Silva <emulatorman@lavabit.com> pkgname=parabola-keyring -pkgver=20121101 +pkgver=20121102 pkgrel=1 pkgdesc='Parabola GNU/Linux-libre PGP keyring' arch=('any') @@ -16,5 +15,5 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make PREFIX=/usr DESTDIR=${pkgdir} install } -md5sums=('c663f7bfc154423b96e00683d1ea4e4e' - 'f7362e866e14da48c6900debb9e283f5') +md5sums=('63c49a827ef05575514412ae76637c67' + '9b887e116a8e115a2ca082f65b3ea65a') diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD index 649cb962d..9c5f6242c 100644 --- a/libre/your-freedom/PKGBUILD +++ b/libre/your-freedom/PKGBUILD @@ -24,4 +24,4 @@ package() { )) } -md5sums=('5e50a4ec73267a732d153c1079e9b021') +md5sums=('cc8ed9a33d0c58fcecc3323f831f687e') diff --git a/pcr/irssi-xmpp/PKGBUILD b/pcr/irssi-xmpp/PKGBUILD new file mode 100644 index 000000000..fa5d445c6 --- /dev/null +++ b/pcr/irssi-xmpp/PKGBUILD @@ -0,0 +1,22 @@ +# Maintainer: Yogesh Powar <yogesh.powar@gmail.com> +pkgname=irssi-xmpp +pkgver=0.52 +pkgrel=1 +pkgdesc="An irssi plugin to connect to the Jabber network." +url="http://cybione.org/~irssi-xmpp" +arch=('i686' 'x86_64' 'mips64el') +license=('GPL') +depends=('loudmouth>=1.4.0' 'irssi>=0.8.13') +source=("http://cybione.org/~irssi-xmpp/files/${pkgname}-${pkgver}.tar.gz") +md5sums=('f48d66ddf6a6d8e4d04bfc44b83dc3c7') + +build() { + cd "$srcdir/$pkgname-$pkgver" + export PREFIX=/usr/ + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/pcr/libav-static/PKGBUILD b/pcr/libav-static/PKGBUILD new file mode 100644 index 000000000..932213a3e --- /dev/null +++ b/pcr/libav-static/PKGBUILD @@ -0,0 +1,120 @@ +# $Id$ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# Contributor: Paul Mattal <paul@archlinux.org> +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> + +pkgbase=libav +pkgname=libav-static +pkgflag=-static +pkgver=0.8.4 +pkgrel=2 +pkgdesc='Complete and free Internet live audio and video broadcasting solution for GNU/Linux, with static library' +arch=( + i686 + x86_64 + mips64el +) +url="http://$pkgbase.org/" +license=( + GPL +) +depends=( + alsa-lib + bzip2 + gsm + lame + libpulse + libtheora + libva + libvorbis + libvpx + opencore-amr + openjpeg + rtmpdump + schroedinger + sdl + speex + x264 + xvidcore + zlib +) +makedepends=( + yasm + libvdpau +) +source=( + http://$pkgbase.org/releases/$pkgbase-$pkgver.tar.gz + avconv$pkgflag + avplay$pkgflag + avprobe$pkgflag + avserver$pkgflag + ffmpeg-$pkgname + qt-faststart-$pkgname +) +sha512sums=( + d402c7d586708e29b92340c4d03d8431fe607f0b88c2762cc95671786cdb9a7221968164b571e11086b53b2169f3a657c6106dc769c04a1a035429d011e72610 + 4a98c459df5f5bc5e42580b5f2081509719c057fdf55693b3554006b21adcaa29ee59ac0debfe0486fe1df8b9a937135d99e4ccc2df894a2634dd314eed93114 + afd2eadd0a0522cd3665ccd2b819f06a99cc50e3bdac3a0ef200861664c7084cc5990a3c1a860f2f0cc9f835c33c09cb5c57a25dbab0673eb74ba0f4c980e539 + 4e557c9eab6a97a3206df1dd49a516ae7be9490c894ff212cb5286ee097ae606c0b7a650c75278a71e4c91d0325eaee729937e1ae659ce0887c3c20ea8fe6333 + f0fa50711d19babf3f485189fb37b17a87f31849dad9cf6a7324601bdde0856fe47d55a4d82c6839c93f39e970edcbeecfbcb70a8b4e7570250fa4c7bb6975fb + 8101ec9c3e0a945ea89f85f81ace52ce67159661e3440668726a5767ba6250a91533494f1aa8fc30ee97ff9af5d64636d0f0dbcb2da862124d35b6b5ec571f5b + 0133fae31e1df586317deb7235f5e74d22abd007038f82b9df10ea3eea6748945c50a0bbe8f588e8a5d1b7874b3fa2639430e1efa32b0cfe16383a32751d3245 +) + +build() { + cd $pkgbase-$pkgver + + ./configure \ + --prefix=/opt/$pkgname \ + --enable-libmp3lame \ + --enable-libvorbis \ + --enable-libxvid \ + --enable-libx264 \ + --enable-libvpx \ + --enable-libtheora \ + --enable-libgsm \ + --enable-libspeex \ + --enable-postproc \ + --enable-shared \ + --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 + + make + make tools/qt-faststart + make doc/ffmpeg.1 + make doc/av{play,server}.1 +} + +package() { + cd $pkgbase-$pkgver + make DESTDIR=$pkgdir install install-man + install -m755 -d $pkgdir/etc/ld.so.conf.d + install -m755 -d $pkgdir/usr/bin + install -m755 -d $pkgdir/usr/share/man/man1 + install -Dm755 tools/qt-faststart $pkgdir/opt/$pkgname/bin + ln -s /opt/$pkgname/bin/avconv $pkgdir/usr/bin/avconv$pkgflag + ln -s /opt/$pkgname/bin/avplay $pkgdir/usr/bin/avplay$pkgflag + ln -s /opt/$pkgname/bin/avprobe $pkgdir/usr/bin/avprobe$pkgflag + ln -s /opt/$pkgname/bin/avserver $pkgdir/usr/bin/avserver$pkgflag + ln -s /opt/$pkgname/bin/ffmpeg $pkgdir/usr/bin/ffmpeg-$pkgname + ln -s /opt/$pkgname/bin/qt-faststart $pkgdir/usr/bin/qt-faststart-$pkgname + ln -s /opt/$pkgname/share/man/man1/avconv.1 $pkgdir/usr/share/man/man1/avconv$pkgflag.1 + ln -s /opt/$pkgname/share/man/man1/avplay.1 $pkgdir/usr/share/man/man1/avplay$pkgflag.1 + ln -s /opt/$pkgname/share/man/man1/avprobe.1 $pkgdir/usr/share/man/man1/avprobe$pkgflag.1 + ln -s /opt/$pkgname/share/man/man1/avserver.1 $pkgdir/usr/share/man/man1/avserver$pkgflag.1 + ln -s /opt/$pkgname/share/man/man1/ffmpeg.1 $pkgdir/usr/share/man/man1/ffmpeg-$pkgname.1 + echo /opt/libav-static/lib > $pkgdir/etc/ld.so.conf.d/libav-static.conf +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/libav-static/avconv-static b/pcr/libav-static/avconv-static new file mode 100644 index 000000000..5f632bec0 --- /dev/null +++ b/pcr/libav-static/avconv-static @@ -0,0 +1,2 @@ +#!/bin/bash +LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/libav-static/lib /opt/libav-static/bin/avconv $* diff --git a/pcr/libav-static/avplay-static b/pcr/libav-static/avplay-static new file mode 100644 index 000000000..8db2da816 --- /dev/null +++ b/pcr/libav-static/avplay-static @@ -0,0 +1,2 @@ +#!/bin/bash +LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/libav-static/lib /opt/libav-static/bin/avplay $* diff --git a/pcr/libav-static/avprobe-static b/pcr/libav-static/avprobe-static new file mode 100644 index 000000000..44b730287 --- /dev/null +++ b/pcr/libav-static/avprobe-static @@ -0,0 +1,2 @@ +#!/bin/bash +LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/libav-static/lib /opt/libav-static/bin/avprobe $* diff --git a/pcr/libav-static/avserver-static b/pcr/libav-static/avserver-static new file mode 100644 index 000000000..642d4722c --- /dev/null +++ b/pcr/libav-static/avserver-static @@ -0,0 +1,2 @@ +#!/bin/bash +LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/libav-static/lib /opt/libav-static/bin/avserver $* diff --git a/pcr/libav-static/ffmpeg-libav-static b/pcr/libav-static/ffmpeg-libav-static new file mode 100644 index 000000000..3f9ef6d52 --- /dev/null +++ b/pcr/libav-static/ffmpeg-libav-static @@ -0,0 +1,2 @@ +#!/bin/bash +LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/libav-static/lib /opt/libav-static/bin/ffmpeg $* diff --git a/pcr/libav-static/qt-faststart-libav-static b/pcr/libav-static/qt-faststart-libav-static new file mode 100644 index 000000000..8613091c4 --- /dev/null +++ b/pcr/libav-static/qt-faststart-libav-static @@ -0,0 +1,2 @@ +#!/bin/bash +LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/libav-static/lib /opt/libav-static/bin/qt-faststart $* diff --git a/pcr/zoneminder/PKGBUILD b/pcr/zoneminder/PKGBUILD index a008bcc6c..236ceca01 100644 --- a/pcr/zoneminder/PKGBUILD +++ b/pcr/zoneminder/PKGBUILD @@ -6,9 +6,10 @@ # based of debian squeeze package +pkgbase=zoneminder pkgname=zoneminder pkgver=1.25.0 -pkgrel=21 +pkgrel=24 pkgdesc='Capture, analyse, record and monitor video security cameras' arch=( i686 @@ -18,16 +19,16 @@ arch=( backup=( etc/zm.conf ) -url="http://www.$pkgname.com" +url="http://www.$pkgbase.com" license=( GPL ) depends=( apache cambozola - ffmpeg-static + libav-static gnutls - mysql + mariadb perl-archive-zip perl-date-manip perl-dbd-mysql @@ -52,20 +53,18 @@ makedepends=( optdepends=( netpbm ) -install=$pkgname.install +install=$pkgbase.install source=( - http://www.$pkgname.com/downloads/ZoneMinder-$pkgver.tar.gz - httpd-$pkgname.conf - $pkgname - $pkgname.service - patch-ffmpeg-0.11.patch + http://www.$pkgbase.com/downloads/ZoneMinder-$pkgver.tar.gz + httpd-$pkgbase.conf + $pkgbase + $pkgbase.service ) sha512sums=( 3e18993b0539729491052c97d8c94227ccc089eb40277c2f07682f30049033303c7cfe9734fdac6d33ae67df29c76eb72bf7fbb5dae8227e8831fa603b61c375 4ce0d8eba9d006d258f5b8a83920fc17f1f602b96518d37b7a47cd9b6eb84ef2587641a6ba839a469c3f0e33b46475866187279ae3f8be0d4054b074ee5d6b08 ab4e1d5ddaf4d9cd53d6ca59d7965902afd6a2dc830fbbafa270736c52c2b3563075fee860bb0276466f96e9dbfb71b259ac45a4ae2e4ead8eaec154a0159eb0 cfb0eb87a989236c72741a496ddc6a73aa2696e5beaaca4836d3c231ddb24c7ef5e9f65e7afa49674f2115cbfa4a07c75486e1947ce294c816ddbb875f3b99cf - 382799ad6add1632d934544230520f942dae37913b58cfa19e0cb2b11e7002267b1fdb9aa535f2217bcccf0c85c4d754f316dc3980a3ca267e5b3f5500536024 ) build() { @@ -73,10 +72,12 @@ build() { # ZM_RUNDIR need change to run dir export CPPFLAGS=-D__STDC_CONSTANT_MACROS\ - ZM_LOGDIR=/var/log/$pkgname\ - ZM_RUNDIR=/tmp/$pkgname\ + OPT_FFMPEG=yes\ + PATH_FFMPEG=/usr/bin/avconv-static\ + ZM_LOGDIR=/var/log/$pkgbase\ + ZM_RUNDIR=/tmp/$pkgbase\ ZM_SSL_LIB=gnutls\ - ZM_TMPDIR=/tmp/$pkgname + ZM_TMPDIR=/tmp/$pkgbase # Patch for GCC 4.7.x sed -i -e 's/^#include <errno.h>/#include <errno.h>\n#include <unistd.h>/'\ @@ -94,9 +95,14 @@ build() { # Patch for support html5 video and flv sed -i -e '/ZM_MPEG_LIVE_FORMAT/,+1 s/swf/webm/;/ZM_MPEG_REPLAY_FORMAT/,+1 s/swf/webm/; - /ZM_FFMPEG_FORMATS/,+1 s/mpg mpeg wmv asf avi\* mov swf 3gp\*\*/mpg mpeg wmv asf avi\* mov flv swf 3gp\*\* webm ogg h254/'\ + /ZM_FFMPEG_FORMATS/,+1 s/mpg mpeg wmv asf avi\* mov swf 3gp\*\*/mpg mpeg wmv asf avi\* mov flv swf 3gp\*\* webm ogg h264/'\ scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read + # Patch for enable video export + #sed -i -e '/ZM_OPT_FFMPEG/,+1 s/@OPT_FFMPEG@/yes/; + # /ZM_PATH_FFMPEG/,+1 s/@PATH_FFMPEG@/\/usr\/bin\/avconv-static/'\ + # scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read + # Patch for change path run dir sed -i -e '/ZM_PATH_SOCKS/,+1 s/TMP/RUN/'\ scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read @@ -105,8 +111,8 @@ build() { sed -i -e '/ZM_WEB_TITLE_PREFIX/,+1 s/"ZM"/"ZoneMinder"/'\ scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in || read - # Patch for v4l1 compat support - sed -i -e "s/$ENV{SHELL} = \'\/bin\/sh\' if exists $ENV{SHELL};/$ENV{SHELL} = \'\/bin\/sh\' if exists $ENV{SHELL};\n$ENV{LD_PRELOAD} = \'\/usr\/lib\/libv4l\/v4l1compat.so\' ;/"\ + # Patch for v4l2 convert support + sed -i -e "s/$ENV{SHELL} = \'\/bin\/sh\' if exists $ENV{SHELL};/$ENV{SHELL} = \'\/bin\/sh\' if exists $ENV{SHELL};\n$ENV{LD_PRELOAD} = \'\/usr\/lib\/libv4l\/v4l2convert.so\' ;/"\ scripts/zmdc.pl.in || read # Patch for add more socket tries @@ -126,19 +132,6 @@ build() { s/^AC_SUBST(ZM_CONFIG,"$SYSCONFDIR\/zm.conf")/AC_SUBST(ZM_CONFIG,"$SYSCONFDIR\/zm.conf")\n\nEXTRA_PERL_LIB="# Include from system perl paths only"\nPERL_MM_PARMS="INSTALLDIRS=vendor"/'\ configure.ac - # Patch for support new ffmpeg - patch -p1 < $srcdir/patch-ffmpeg-0.11.patch -# sed -i -e 's/if ( av_open_input_file( \&mFormatContext, mPath.c_str(), NULL, 0, NULL ) !=0 )/if ( avformat_open_input( \&mFormatContext, mPath.c_str(), NULL, NULL ) !=0 )/; -# s/if ( avcodec_open( mCodecContext, mCodec ) < 0 )/if ( avcodec_open2( mCodecContext, mCodec, NULL ) < 0 )/'\ -# src/zm_ffmpeg_camera.cpp -# sed -i -e 's/if ( av_set_parameters(ofc, NULL) < 0 )/\/\*\n \* Removed in last ffmpeg\n \* if ( av_set_parameters(ofc, NULL) < 0 )/; -# /Panic( "Invalid output format parameters" );/,+1 s/}/}\*/; -# /if ( avio_open(&ofc->pb, filename, URL_WRONLY) < 0 )/ s/URL_WRONLY/AVIO_FLAG_WRITE/; -# s/av_write_header(ofc);/avformat_write_header(ofc, NULL);/'\ -# src/zm_mpeg.cpp - sed -i -e 's/avcodec_init/avcodec_open/'\ - configure{,.ac} - # Patch for support ffmpeg with <libavutil/mathematics.h> and C library sed -i -e 's/^extern "C" {/extern "C" {\n#ifdef _STDINT_H\n#undef _STDINT_H\n#endif\n#include <stdint.h>/ s/^#include <libavutil\/avutil.h>/#include <libavutil\/avutil.h>\n#include <libavutil\/mathematics.h>/'\ @@ -163,10 +156,10 @@ build() { --sysconfdir=/etc\ --with-cgidir=/srv/http/cgi-bin\ --with-extralibs='-L/usr/lib -L/usr/lib/mysql'\ - --with-ffmpeg=/usr\ + --with-ffmpeg=/opt/libav-static\ --with-libarch=lib\ --with-mysql=/usr\ - --with-webdir=/srv/http/$pkgname\ + --with-webdir=/srv/http/$pkgbase\ --with-webgroup=http\ --with-webhost=localhost\ --with-webuser=http @@ -179,25 +172,25 @@ package() { make DESTDIR=$pkgdir install - mkdir -p $pkgdir/{etc/{httpd/conf/extra,rc.d},srv/http/{cgi-bin,$pkgname},usr/{lib/systemd/system,share/{license/$pkgname,$pkgname/db}},var/{cache/$pkgname,log/$pkgname}} + mkdir -p $pkgdir/{etc/{httpd/conf/extra,rc.d},srv/http/{cgi-bin,$pkgbase},usr/{lib/systemd/system,share/{license/$pkgbase,$pkgbase/db}},var/{cache/$pkgbase,log/$pkgbase}} - chown -R http.http $pkgdir/{etc/zm.conf,var/{cache/$pkgname,log/$pkgname}} + chown -R http.http $pkgdir/{etc/zm.conf,var/{cache/$pkgbase,log/$pkgbase}} chmod 0700 $pkgdir/etc/zm.conf for i in events images temp; do - mv $pkgdir/srv/http/$pkgname/$i $pkgdir/var/cache/$pkgname/$i - ln -s /var/cache/$pkgname/$i $pkgdir/srv/http/$pkgname/$i - chown -h http.http $pkgdir/srv/http/$pkgname/$i + mv $pkgdir/srv/http/$pkgbase/$i $pkgdir/var/cache/$pkgbase/$i + ln -s /var/cache/$pkgbase/$i $pkgdir/srv/http/$pkgbase/$i + chown -h http.http $pkgdir/srv/http/$pkgbase/$i done - ln -s /srv/http/cgi-bin $pkgdir/srv/http/$pkgname - chown -h http.http $pkgdir/srv/http/{cgi-bin,$pkgname,$pkgname/cgi-bin} + ln -s /srv/http/cgi-bin $pkgdir/srv/http/$pkgbase + chown -h http.http $pkgdir/srv/http/{cgi-bin,$pkgbase,$pkgbase/cgi-bin} - ln -s /usr/share/cambozola/cambozola.jar $pkgdir/srv/http/$pkgname + ln -s /usr/share/cambozola/cambozola.jar $pkgdir/srv/http/$pkgbase - install -D -m 644 $srcdir/httpd-$pkgname.conf $pkgdir/etc/httpd/conf/extra - install -D -m 644 $srcdir/$pkgname $pkgdir/etc/rc.d - install -D -m 644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system - install -D -m 644 COPYING $pkgdir/usr/share/license/$pkgname - install -D -m 644 db/zm*.sql $pkgdir/usr/share/$pkgname/db + install -D -m 644 $srcdir/httpd-$pkgbase.conf $pkgdir/etc/httpd/conf/extra + install -D -m 644 $srcdir/$pkgbase $pkgdir/etc/rc.d + install -D -m 644 $srcdir/$pkgbase.service $pkgdir/usr/lib/systemd/system + install -D -m 644 COPYING $pkgdir/usr/share/license/$pkgbase + install -D -m 644 db/zm*.sql $pkgdir/usr/share/$pkgbase/db } |