diff options
Diffstat (limited to 'abs/extra')
52 files changed, 1201 insertions, 820 deletions
diff --git a/abs/extra/chromium/PKGBUILD b/abs/extra/chromium/PKGBUILD deleted file mode 100644 index 821ba39..0000000 --- a/abs/extra/chromium/PKGBUILD +++ /dev/null @@ -1,139 +0,0 @@ -# $Id: PKGBUILD 170409 2012-11-07 11:29:05Z foutrelis $ -# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> -# Contributor: Pierre Schmitz <pierre@archlinux.de> -# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=chromium -pkgver=23.0.1271.64 -pkgrel=1 -pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser" -arch=('i686' 'x86_64') -url="http://www.chromium.org/" -license=('BSD') -depends=('gtk2' 'dbus-glib' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent' - 'libxss' 'libgcrypt' 'ttf-dejavu' 'desktop-file-utils' - 'hicolor-icon-theme') -makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring' - 'elfutils' 'subversion' 'nacl-toolchain-newlib') -optdepends=('kdebase-kdialog: needed for file dialogs in KDE') -backup=('etc/chromium/default') -install=chromium.install -source=(http://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.bz2 - chromium.desktop - chromium.default - chromium.sh - chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch - chromium-ppapi-r0.patch) -sha256sums=('e894bb22d4747c69fc34b181be3a25e20fd9599ed93f08779df600fe3402ffe7' - '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322' - '478340d5760a9bd6c549e19b1b5d1c5b4933ebf5f8cfb2b3e2d70d07443fe232' - '4999fded897af692f4974f0a3e3bbb215193519918a1fa9b31ed51e74a2dccb9' - 'c1baf14121502efbc2a31b64029dcafa0e28ca5b71ad0e28a3c6342d18198615' - '1f4b57670d317959bc2dc60e5d2a44aa8fc6028f7ed540cdb502fa0aa99c81bd') - -build() { - cd "$srcdir/chromium-$pkgver" - - # Fix build with glibc 2.16 - patch -Np1 -i "$srcdir/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch" - - # Fix build without NaCl glibc toolchain (patch from Gentoo) - patch -Np0 -i "$srcdir/chromium-ppapi-r0.patch" - - # http://code.google.com/p/chromium/issues/detail?id=109527 - sed -i 's|glib/gutils.h|glib.h|' ui/base/l10n/l10n_util.cc - - # Missing gyp files in tarball (http://crbug.com/144823) - sed -i '/nacl_test_data\.gyp/d' chrome/chrome_tests.gypi - - # Use Python 2 - find . -type f -exec sed -i -r \ - -e 's|/usr/bin/python$|&2|g' \ - -e 's|(/usr/bin/python2)\.4$|\1|g' \ - {} + - # There are still a lot of relative calls which need a workaround - mkdir "$srcdir/python2-path" - ln -s /usr/bin/python2 "$srcdir/python2-path/python" - export PATH="$srcdir/python2-path:$PATH" - - # Prepare NaCL toolchain - mkdir -p sdk native_client/toolchain/.tars - cp -a /usr/lib/nacl-toolchain-newlib sdk/nacl-sdk - tar czf native_client/toolchain/.tars/naclsdk_linux_x86.tgz sdk - rm -r sdk - - # CFLAGS are passed through release_extra_cflags below - export -n CFLAGS CXXFLAGS - - # Silence "identifier 'nullptr' is a keyword in C++11" warnings - CFLAGS+=' -Wno-c++0x-compat' - - build/gyp_chromium --depth=. \ - -Dwerror= \ - -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \ - -Dlinux_strip_binary=1 \ - -Dlinux_use_gold_binary=0 \ - -Dlinux_use_gold_flags=0 \ - -Drelease_extra_cflags="$CFLAGS" \ - -Dffmpeg_branding=Chrome \ - -Dproprietary_codecs=1 \ - -Duse_system_bzip2=1 \ - -Duse_system_ffmpeg=0 \ - -Duse_system_libevent=1 \ - -Duse_system_libjpeg=1 \ - -Duse_system_libpng=1 \ - -Duse_system_libxml=0 \ - -Duse_system_ssl=0 \ - -Duse_system_yasm=1 \ - -Duse_system_zlib=0 \ - -Duse_gconf=0 \ - -Ddisable_glibc=1 \ - -Ddisable_pnacl=1 \ - -Ddisable_sse2=1 - - make chrome chrome_sandbox BUILDTYPE=Release -} - -package() { - cd "$srcdir/chromium-$pkgver" - - install -D out/Release/chrome "$pkgdir/usr/lib/chromium/chromium" - - install -Dm4755 -o root -g root out/Release/chrome_sandbox \ - "$pkgdir/usr/lib/chromium/chromium-sandbox" - - cp out/Release/{*.pak,libffmpegsumo.so,nacl_helper{,_bootstrap}} \ - out/Release/{libppGoogleNaClPluginChrome.so,nacl_irt_*.nexe} \ - "$pkgdir/usr/lib/chromium/" - - if [[ $CARCH == i686 ]]; then - rm "$pkgdir/usr/lib/chromium/nacl_irt_x86_64.nexe" - fi - - # Allow users to override command-line options - install -Dm644 "$srcdir/chromium.default" "$pkgdir/etc/chromium/default" - - cp -a out/Release/locales "$pkgdir/usr/lib/chromium/" - - install -Dm644 out/Release/chrome.1 "$pkgdir/usr/share/man/man1/chromium.1" - - install -Dm644 "$srcdir/chromium.desktop" \ - "$pkgdir/usr/share/applications/chromium.desktop" - - for size in 22 24 48 64 128 256; do - install -Dm644 "chrome/app/theme/chromium/product_logo_$size.png" \ - "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png" - done - - for size in 16 32; do - install -Dm644 "chrome/app/theme/default_100_percent/chromium/product_logo_$size.png" \ - "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png" - done - - install -D "$srcdir/chromium.sh" "$pkgdir/usr/bin/chromium" - - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/chromium/LICENSE" -} - -# vim:set ts=2 sw=2 et: diff --git a/abs/extra/chromium/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch b/abs/extra/chromium/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch deleted file mode 100644 index 1d11a39..0000000 --- a/abs/extra/chromium/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -upr chromium-20.0.1132.57.orig/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h chromium-20.0.1132.57/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h ---- chromium-20.0.1132.57.orig/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-07-10 10:48:31.000000000 +0300 -+++ chromium-20.0.1132.57/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-07-11 23:44:11.000000000 +0300 -@@ -243,14 +243,13 @@ struct kernel_rusage { - long ru_nivcsw; - }; - --struct siginfo; - #if defined(__i386__) || defined(__arm__) || defined(__PPC__) - - /* include/asm-{arm,i386,mips,ppc}/signal.h */ - struct kernel_old_sigaction { - union { - void (*sa_handler_)(int); -- void (*sa_sigaction_)(int, struct siginfo *, void *); -+ void (*sa_sigaction_)(int, siginfo_t *, void *); - }; - unsigned long sa_mask; - unsigned long sa_flags; -@@ -287,13 +286,13 @@ struct kernel_sigaction { - unsigned long sa_flags; - union { - void (*sa_handler_)(int); -- void (*sa_sigaction_)(int, struct siginfo *, void *); -+ void (*sa_sigaction_)(int, siginfo_t *, void *); - }; - struct kernel_sigset_t sa_mask; - #else - union { - void (*sa_handler_)(int); -- void (*sa_sigaction_)(int, struct siginfo *, void *); -+ void (*sa_sigaction_)(int, siginfo_t *, void *); - }; - unsigned long sa_flags; - void (*sa_restorer)(void); diff --git a/abs/extra/chromium/chromium-ppapi-r0.patch b/abs/extra/chromium/chromium-ppapi-r0.patch deleted file mode 100644 index fb7e160..0000000 --- a/abs/extra/chromium/chromium-ppapi-r0.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ppapi/ppapi_untrusted.gyp.orig 2012-06-12 10:20:16.000000000 +0200 -+++ ppapi/ppapi_untrusted.gyp 2012-06-12 10:20:52.000000000 +0200 -@@ -80,7 +80,7 @@ - ], - }, - 'conditions': [ -- ['target_arch!="arm"', { -+ ['target_arch!="arm" and disable_glibc==0', { - 'variables': { - 'build_glibc': 1, - # NOTE: Use /lib, not /lib64 here; it is a symbolic link which diff --git a/abs/extra/chromium/chromium.default b/abs/extra/chromium/chromium.default deleted file mode 100644 index 2632024..0000000 --- a/abs/extra/chromium/chromium.default +++ /dev/null @@ -1,4 +0,0 @@ -# Default settings for chromium. This file is sourced by /usr/bin/chromium - -# Options to pass to chromium -CHROMIUM_FLAGS="" diff --git a/abs/extra/chromium/chromium.desktop b/abs/extra/chromium/chromium.desktop deleted file mode 100644 index 18446d4..0000000 --- a/abs/extra/chromium/chromium.desktop +++ /dev/null @@ -1,113 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=Chromium -# Only KDE 4 seems to use GenericName, so we reuse the KDE strings. -# From Ubuntu's language-pack-kde-XX-base packages, version 9.04-20090413. -GenericName=Web Browser -GenericName[ar]=متصفح الشبكة -GenericName[bg]=Уеб браузър -GenericName[ca]=Navegador web -GenericName[cs]=WWW prohlížeč -GenericName[da]=Browser -GenericName[de]=Web-Browser -GenericName[el]=Περιηγητής ιστού -GenericName[en_GB]=Web Browser -GenericName[es]=Navegador web -GenericName[et]=Veebibrauser -GenericName[fi]=WWW-selain -GenericName[fr]=Navigateur Web -GenericName[gu]=વેબ બ્રાઉઝર -GenericName[he]=דפדפן אינטרנט -GenericName[hi]=वेब ब्राउज़र -GenericName[hu]=Webböngésző -GenericName[it]=Browser Web -GenericName[ja]=ウェブブラウザ -GenericName[kn]=ಜಾಲ ವೀಕ್ಷಕ -GenericName[ko]=웹 브라우저 -GenericName[lt]=Žiniatinklio naršyklė -GenericName[lv]=Tīmekļa pārlūks -GenericName[ml]=വെബ് ബ്രൌസര് -GenericName[mr]=वेब ब्राऊजर -GenericName[nb]=Nettleser -GenericName[nl]=Webbrowser -GenericName[pl]=Przeglądarka WWW -GenericName[pt]=Navegador Web -GenericName[pt_BR]=Navegador da Internet -GenericName[ro]=Navigator de Internet -GenericName[ru]=Веб-браузер -GenericName[sl]=Spletni brskalnik -GenericName[sv]=Webbläsare -GenericName[ta]=இணைய உலாவி -GenericName[th]=เว็บเบราว์เซอร์ -GenericName[tr]=Web Tarayıcı -GenericName[uk]=Навігатор Тенет -GenericName[zh_CN]=网页浏览器 -GenericName[zh_HK]=網頁瀏覽器 -GenericName[zh_TW]=網頁瀏覽器 -# Not translated in KDE, from Epiphany 2.26.1-0ubuntu1. -GenericName[bn]=ওয়েব ব্রাউজার -GenericName[fil]=Web Browser -GenericName[hr]=Web preglednik -GenericName[id]=Browser Web -GenericName[or]=ଓ୍ବେବ ବ୍ରାଉଜର -GenericName[sk]=WWW prehliadač -GenericName[sr]=Интернет прегледник -GenericName[te]=మహాతల అన్వేషి -GenericName[vi]=Bộ duyệt Web -# Gnome and KDE 3 uses Comment. -Comment=Access the Internet -Comment[ar]=الدخول إلى الإنترنت -Comment[bg]=Достъп до интернет -Comment[bn]=ইন্টারনেটটি অ্যাক্সেস করুন -Comment[ca]=Accedeix a Internet -Comment[cs]=Přístup k internetu -Comment[da]=Få adgang til internettet -Comment[de]=Internetzugriff -Comment[el]=Πρόσβαση στο Διαδίκτυο -Comment[en_GB]=Access the Internet -Comment[es]=Accede a Internet. -Comment[et]=Pääs Internetti -Comment[fi]=Käytä internetiä -Comment[fil]=I-access ang Internet -Comment[fr]=Accéder à Internet -Comment[gu]=ઇંટરનેટ ઍક્સેસ કરો -Comment[he]=גישה אל האינטרנט -Comment[hi]=इंटरनेट तक पहुंच स्थापित करें -Comment[hr]=Pristup Internetu -Comment[hu]=Internetelérés -Comment[id]=Akses Internet -Comment[it]=Accesso a Internet -Comment[ja]=インターネットにアクセス -Comment[kn]=ಇಂಟರ್ನೆಟ್ ಅನ್ನು ಪ್ರವೇಶಿಸಿ -Comment[ko]=인터넷 연결 -Comment[lt]=Interneto prieiga -Comment[lv]=Piekļūt internetam -Comment[ml]=ഇന്റര്നെറ്റ് ആക്സസ് ചെയ്യുക -Comment[mr]=इंटरनेटमध्ये प्रवेश करा -Comment[nb]=Gå til Internett -Comment[nl]=Verbinding maken met internet -Comment[or]=ଇଣ୍ଟର୍ନେଟ୍ ପ୍ରବେଶ କରନ୍ତୁ -Comment[pl]=Skorzystaj z internetu -Comment[pt]=Aceder à Internet -Comment[pt_BR]=Acessar a internet -Comment[ro]=Accesaţi Internetul -Comment[ru]=Доступ в Интернет -Comment[sk]=Prístup do siete Internet -Comment[sl]=Dostop do interneta -Comment[sr]=Приступите Интернету -Comment[sv]=Gå ut på Internet -Comment[ta]=இணையத்தை அணுகுதல் -Comment[te]=ఇంటర్నెట్ను ఆక్సెస్ చెయ్యండి -Comment[th]=เข้าถึงอินเทอร์เน็ต -Comment[tr]=İnternet'e erişin -Comment[uk]=Доступ до Інтернету -Comment[vi]=Truy cập Internet -Comment[zh_CN]=访问互联网 -Comment[zh_HK]=連線到網際網路 -Comment[zh_TW]=連線到網際網路 -Exec=chromium %U -Terminal=false -Icon=chromium -Type=Application -Categories=GTK;Network;WebBrowser; -MimeType=text/html;text/xml;application/xhtml+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https; diff --git a/abs/extra/chromium/chromium.install b/abs/extra/chromium/chromium.install deleted file mode 100644 index d43ea7c..0000000 --- a/abs/extra/chromium/chromium.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &>/dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/abs/extra/chromium/chromium.sh b/abs/extra/chromium/chromium.sh deleted file mode 100755 index ba8a7e6..0000000 --- a/abs/extra/chromium/chromium.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -# Allow users to override command-line options -# Based on Gentoo's chromium package (and by extension, Debian's) -if [[ -f /etc/chromium/default ]]; then - . /etc/chromium/default -fi - -# Prefer user defined CHROMIUM_USER_FLAGS (from env) over system -# default CHROMIUM_FLAGS (from /etc/chromium/default) -CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-$CHROMIUM_FLAGS} - -export CHROME_WRAPPER=$(readlink -f "$0") -export CHROME_DESKTOP=chromium.desktop - -exec /usr/lib/chromium/chromium $CHROMIUM_FLAGS "$@" diff --git a/abs/extra/community/tig/PKGBUILD b/abs/extra/community/tig/PKGBUILD new file mode 100644 index 0000000..ccba8c3 --- /dev/null +++ b/abs/extra/community/tig/PKGBUILD @@ -0,0 +1,30 @@ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Loui Chang <louipc dot ist at gmail company> +# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> +# Contributor: Nathan Jones <nathanj@insightbb.com> + +pkgname=tig +pkgver=1.2 +pkgrel=1 +pkgdesc='Text-mode interface for Git.' +depends=('git' 'ncurses') +url='http://jonas.nitro.dk/tig/' +license=('GPL') +arch=('i686' 'x86_64') +source=("http://jonas.nitro.dk/${pkgname}/releases/${pkgname}-${pkgver}.tar.gz") +md5sums=('9821525564aa3f4aa51ad2b6c11b3a91') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install install-doc-man + install -Dm0644 contrib/tigrc "$pkgdir/etc/tigrc.sample" + install -Dm0644 contrib/tig-completion.bash "$pkgdir/usr/share/bash-completion/completions/tig" +} diff --git a/abs/extra/dotconf/PKGBUILD b/abs/extra/dotconf/PKGBUILD new file mode 100644 index 0000000..07e7e91 --- /dev/null +++ b/abs/extra/dotconf/PKGBUILD @@ -0,0 +1,29 @@ +# $Id$ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Chris Brannon <cmbrannon@cox.net> + +pkgname=dotconf +pkgver=1.3 +pkgrel=3 +pkgdesc='A C library for parsing configuration files' +url="https://github.com/williamh/dotconf" +arch=('i686' 'x86_64') +depends=('glibc') +makedepends=('pkgconfig' 'findutils') +license=('LGPL2.1') +source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/williamh/${pkgname}/tarball/v${pkgver}") +md5sums=('36bfdde245072fc2f4f5766b7db97c45') +options=('!libtool') + +build() { + cd "${srcdir}"/williamh-${pkgname}-4cd7b3a + autoreconf -i + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}"/williamh-${pkgname}-4cd7b3a + make DESTDIR="${pkgdir}" install +} diff --git a/abs/extra/fakechroot/PKGBUILD b/abs/extra/fakechroot/PKGBUILD new file mode 100644 index 0000000..4cdd8c9 --- /dev/null +++ b/abs/extra/fakechroot/PKGBUILD @@ -0,0 +1,43 @@ +# $Id$ +# Maintainer : Allan McRae <allan@archlinux.org> +# Contributor: Aaron Griffin <aaron@archlinux.org> + +pkgname=fakechroot +pkgver=2.16 +pkgrel=3 +pkgdesc="Gives a fake chroot environment" +arch=('i686' 'x86_64') +url="https://github.com/fakechroot/fakechroot/wiki" +license=('LGPL') +options=('!libtool') +install=fakechroot.install +source=(https://github.com/downloads/fakechroot/fakechroot/fakechroot-${pkgver}.tar.gz) +md5sums=('3ea5efb76664e787450e0cfcefc1b807') + + +prepare() { + cd ${srcdir}/${pkgname}-${pkgver} + + # https://github.com/fakechroot/fakechroot/issues/10 + sed -i "s#usr/sbin/chroot#usr/bin/chroot#" test/testtree.sh test/t/chroot.t +} + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --sbindir=/usr/bin \ + --libdir=/usr/lib/libfakeroot --sysconfdir=/etc + make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + + install -dm755 ${pkgdir}/etc/ld.so.conf.d/ + echo '/usr/lib/libfakeroot/fakechroot/' > ${pkgdir}/etc/ld.so.conf.d/fakechroot.conf +} diff --git a/abs/extra/fakechroot/fakechroot.install b/abs/extra/fakechroot/fakechroot.install new file mode 100644 index 0000000..61c5b73 --- /dev/null +++ b/abs/extra/fakechroot/fakechroot.install @@ -0,0 +1,11 @@ +post_install() { + sbin/ldconfig -r . +} + +post_upgrade() { + sbin/ldconfig -r . +} + +post_remove() { + sbin/ldconfig -r . +} diff --git a/abs/extra/glu/PKGBUILD b/abs/extra/glu/PKGBUILD new file mode 100644 index 0000000..d720ae4 --- /dev/null +++ b/abs/extra/glu/PKGBUILD @@ -0,0 +1,31 @@ +# $Id$ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Laurent Carlier <lordheavym@gmail.com> + +pkgname=glu +pkgver=9.0.0 +pkgrel=2 +pkgdesc="Mesa OpenGL Utility library" +arch=('i686' 'x86_64') +url="http://cgit.freedesktop.org/mesa/glu/" +license=('LGPL') +depends=('libgl') +options=('!libtool') +source=(ftp://ftp.freedesktop.org/pub/mesa/$pkgname/$pkgname-$pkgver.tar.bz2) +sha256sums=('1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --disable-static + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD new file mode 100644 index 0000000..085418c --- /dev/null +++ b/abs/extra/google-chrome/PKGBUILD @@ -0,0 +1,58 @@ +# Maintainer: Det <nimetonmaili at gmail a-dot com> +# Contributors: t3ddy, Lex Rivera aka x-demon, ruario + +# Check for new Linux releases in: http://googlechromereleases.blogspot.com/search/label/Stable%20updates +# or use: $ curl -s https://dl.google.com/linux/chrome/rpm/stable/x86_64/repodata/other.xml.gz | gzip -df | awk -F\" '/pkgid/{ sub(".*-","",$4); print $4": "$10 }' + +pkgname=google-chrome +pkgver=30.0.1599.101 +pkgrel=1 +pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)" +arch=('i686' 'x86_64') +url="https://www.google.com/chrome" +license=('custom:chrome') +depends=('alsa-lib' 'gconf' 'gtk2' 'hicolor-icon-theme' 'libpng' 'libxslt' 'libxss' 'nss' 'ttf-font' 'xdg-utils') +optdepends=('kdebase-kdialog: needed for file dialogs in KDE' + 'ttf-google-fonts-git') +provides=("google-chrome=$pkgver") +conflicts=('google-chrome') +replaces=('chromium') +options=('!emptydirs' '!strip') +install=$pkgname.install +_channel=stable +_arch=i386 +[ "$CARCH" = 'x86_64' ] && _arch=amd64 +source=("google-chrome-${_channel}_${pkgver}_${_arch}.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_${_arch}.deb" + "$url/intl/en/eula_text.html") +md5sums=('fa5d706a9f7ef0682de6b665c20f302f' + '6d57da7476a4b1b7a81821d9c036425c') +[ "$CARCH" = 'x86_64' ] && md5sums[0]='9abdef7ee0422f7dabb16941453551cc' + +#PKGEXT='.pkg.tar' + +package() { + msg2 "Extracting the data.tar.lzma" + bsdtar -xf data.tar.lzma -C "$pkgdir/" + + msg2 "Moving stuff in place" + # Desktop + mv "$pkgdir"/opt/google/chrome/google-chrome.desktop "$pkgdir"/usr/share/applications/ + + # Icons + for i in 16 22 24 32 48 64 128 256; do + install -Dm644 "$pkgdir"/opt/google/chrome/product_logo_${i}.png "$pkgdir"/usr/share/icons/hicolor/${i}x${i}/apps/google-chrome.png + done + + # Man page + gzip "$pkgdir"/usr/share/man/man1/google-chrome.1 + + # License + install -Dm644 eula_text.html "$pkgdir"/usr/share/licenses/google-chrome/eula_text.html + + msg2 "Symlinking missing Udev lib" + ln -s /usr/lib/libudev.so.1 "$pkgdir"/opt/google/chrome/libudev.so.0 + + msg2 "Removing the Debian-intended cron job and duplicated images" + rm -r "$pkgdir"/etc/cron.daily/ "$pkgdir"/opt/google/chrome/cron/ + rm "$pkgdir"/opt/google/chrome/product_logo_*.png +} diff --git a/abs/extra/google-chrome/__changelog b/abs/extra/google-chrome/__changelog new file mode 100644 index 0000000..20fbc77 --- /dev/null +++ b/abs/extra/google-chrome/__changelog @@ -0,0 +1,5 @@ +8/25/13 +Pull from ARU: https://aur.archlinux.org/packages/google-chrome/ +- PKGBUILD: comment out PKGEXT so we compress the pkg +- PKGBUILD: add replaces chromium +- google-chrome.install: add symlink from /usr/bin/chromium to google-chrome so as not to break pkgs that use chromium diff --git a/abs/extra/google-chrome/google-chrome.install b/abs/extra/google-chrome/google-chrome.install new file mode 100644 index 0000000..4b923b2 --- /dev/null +++ b/abs/extra/google-chrome/google-chrome.install @@ -0,0 +1,17 @@ +post_install() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + if [ ! -e /usr/bin/chromium ]; then + ln -s /usr/bin/google-chrome /usr/bin/chromium + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + if [ -h /usr/bin/chromium ]; then + rm /usr/bin/chromium + fi +} diff --git a/abs/extra/libdvdcss/PKGBUILD b/abs/extra/libdvdcss/PKGBUILD index c6b1807..9e8edc9 100644 --- a/abs/extra/libdvdcss/PKGBUILD +++ b/abs/extra/libdvdcss/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 160018 2012-05-28 02:15:20Z eric $ +# $Id: PKGBUILD 180007 2013-03-14 11:52:25Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: arjan <arjan@archlinux.org> # Contributor Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=libdvdcss -pkgver=1.2.12 +pkgver=1.2.13 pkgrel=1 pkgdesc="A portable abstraction library for DVD decryption" url="http://www.videolan.org/libdvdcss" arch=('i686' 'x86_64') license=('GPL') depends=('glibc') -options=('!libtool') +options=('!libtool' '!docs' '!emptydirs') source=(http://download.videolan.org/pub/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('2218a193900e3203aa10dc24cdf54275') +sha1sums=('1a4a5e55c7529da46386c1c333340eee2c325a77') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -23,5 +23,5 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="$pkgdir" install + make DESTDIR="${pkgdir}" install } diff --git a/abs/extra/libmicrohttpd/PKGBUILD b/abs/extra/libmicrohttpd/PKGBUILD index 7312377..978b589 100644 --- a/abs/extra/libmicrohttpd/PKGBUILD +++ b/abs/extra/libmicrohttpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 79771 2012-11-12 09:04:51Z spupykin $ +# $Id$ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Norberto Lopes <shelika@mail.telepac.pt> # Contributor: Kao Dome <kaodome@gmail.com> @@ -6,7 +6,7 @@ # Contributor: Mathias Rohnstock <linksoft@gmx.de> pkgname=libmicrohttpd -pkgver=0.9.23 +pkgver=0.9.27 pkgrel=1 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application." arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ options=('!libtool') depends=('gnutls' 'libgcrypt') install=libmicrohttpd.install source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz) -md5sums=('efd038d93836adc0149beaa1c2927f61') +md5sums=('a10496b7f1b495aaf6897584da52f51b') build() { cd ${pkgname}-${pkgver} @@ -32,6 +32,6 @@ package() { ${pkgdir}/usr/include/$pkgname/platform.h install -Dm644 ${srcdir}/${pkgname}-${pkgver}/src/include/plibc/plibc.h \ ${pkgdir}/usr/include/$pkgname/plibc.h - sed -i 's#Cflags: -I${includedir}#Cflags: -I${includedir} -I{includedir}/libmicrohttpd#' \ + sed -i 's#Cflags: -I${includedir}#Cflags: -I${includedir} -I${includedir}/libmicrohttpd#' \ $pkgdir/usr/lib/pkgconfig/libmicrohttpd.pc } diff --git a/abs/extra/libmicrohttpd/libmicrohttpd.install b/abs/extra/libmicrohttpd/libmicrohttpd.install index dc0d2b9..7129b17 100644 --- a/abs/extra/libmicrohttpd/libmicrohttpd.install +++ b/abs/extra/libmicrohttpd/libmicrohttpd.install @@ -1,5 +1,5 @@ infodir=usr/share/info -filelist=(microhttpd.info microhttpd-tutorial.info) +filelist=(libmicrohttpd.info libmicrohttpd-tutorial.info) post_install() { [ -x usr/bin/install-info ] || return 0 diff --git a/abs/extra/nacl-toolchain-newlib/PKGBUILD b/abs/extra/nacl-toolchain-newlib/PKGBUILD index 0635d1e..6f86814 100644 --- a/abs/extra/nacl-toolchain-newlib/PKGBUILD +++ b/abs/extra/nacl-toolchain-newlib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165618 2012-08-27 12:19:30Z foutrelis $ +# $Id$ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Gustavo Alvarez <sl1pkn07@gmail.com> pkgname=nacl-toolchain-newlib -pkgver=9513 +pkgver=12029 pkgrel=1 _binutilsver=2.20.1 _newlibver=1.20.0 @@ -20,16 +20,20 @@ source=(http://ftp.gnu.org/gnu/binutils/binutils-$_binutilsver.tar.bz2 http://commondatastorage.googleapis.com/nativeclient-archive2/x86_toolchain/r$pkgver/nacltoolchain-buildscripts-r$pkgver.tar.gz http://commondatastorage.googleapis.com/nativeclient-archive2/x86_toolchain/r$pkgver/naclbinutils-$_binutilsver-r$pkgver.patch.bz2 http://commondatastorage.googleapis.com/nativeclient-archive2/x86_toolchain/r$pkgver/naclnewlib-$_newlibver-r$pkgver.patch.bz2 - http://commondatastorage.googleapis.com/nativeclient-archive2/x86_toolchain/r$pkgver/naclgcc-$_gccver-r$pkgver.patch.bz2) + http://commondatastorage.googleapis.com/nativeclient-archive2/x86_toolchain/r$pkgver/naclgcc-$_gccver-r$pkgver.patch.bz2 + binutils-texinfo-r0.patch + gcc-texinfo-r0.patch) sha256sums=('71d37c96451333c5c0b84b170169fdcb138bbb27397dc06281905d9717c8ed64' 'c644b2847244278c57bec2ddda69d8fab5a7c767f3b9af69aa7aa3da823ff692' '97ed664694b02b4d58ac2cafe443d02a388f9cb3645e7778843b5086a5fec040' - '3c3d6e63ef8caec24a9e368b72e6c94a28edc8c016da5fef73a312b4a3514909' - 'caaefc2bf90325f152bd0998a29fcad425522a22c6ce373366c4dde2b76c5338' - 'be9e48f8714eaadfc3349ac6d8b077050b719d16a3e7592573670cee7a3c4934' - 'ccbc83627bc7c36f7bbe994ccffe4d51584d8812f2ed62f08528c173e06dcf85') + 'a77912c4aac01142bd1c2f684f9933d6fcd39f0e67a1058858be50f0db18da7e' + '3b0e41b7923a90d611e598b31ed30062cfa3cf2fc2cbe7304e340a0acc780186' + '2de88079c500a694b73dab5a6a3690b2126ea0df498f1e27c5819b7d4256cb1a' + 'c98bda783fbc9726a9d0374118b1315f4ade4fe3bb5cbc96511b7a80b385dd70' + '64ba7c3f5edbe33b17312ab6da6c4b9e244e47289bde796a3078bf73072a0139' + '7eab20b6db6a7224984fd4b5bff1742571b0429428ea2af02f83f82f3de63070') -build() { +prepare() { cd "$srcdir" mkdir SRC @@ -37,10 +41,25 @@ build() { mv newlib-$_newlibver SRC/newlib mv gcc-$_gccver SRC/gcc - for _patch in *.patch; do + for _patch in *-r$pkgver.patch; do patch -d SRC -Np0 -i "$srcdir/$_patch" done + cd SRC + + # Fix build with texinfo 5.1 + patch -d binutils -Np1 -i "$srcdir/binutils-texinfo-r0.patch" + patch -d gcc -Np1 -i "$srcdir/gcc-texinfo-r0.patch" +} + +build() { + cd "$srcdir" + ./download_SRC.sh $pkgver + + CFLAGS+=" $CPPFLAGS" + CXXFLAGS+=" $CPPFLAGS" + unset CPPFLAGS + make PREFIX="$srcdir/$pkgname" CANNED_REVISION="yes" build-with-newlib } @@ -49,6 +68,13 @@ package() { install -d "$pkgdir/usr/lib" mv $pkgname "$pkgdir/usr/lib/$pkgname" + + # NaCL license + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + # Newlib license + install -m644 -t "$pkgdir/usr/share/licenses/$pkgname/" \ + SRC/newlib/COPYING.{NEWLIB,LIBGLOSS} } # vim:set ts=2 sw=2 et: diff --git a/abs/extra/nacl-toolchain-newlib/binutils-texinfo-r0.patch b/abs/extra/nacl-toolchain-newlib/binutils-texinfo-r0.patch new file mode 100644 index 0000000..ab81d8a --- /dev/null +++ b/abs/extra/nacl-toolchain-newlib/binutils-texinfo-r0.patch @@ -0,0 +1,58 @@ +https://bugs.gentoo.org/show_bug.cgi?id=464168 + +commit 935f85422863b42b6fbca30885885e3fa28eea36 +Author: Nick Clifton <nickc@redhat.com> +Date: Mon Jan 7 12:11:11 2013 +0000 + + * ld.texinfo: Replace @ with @@ when it is part of the text. + Correct ordering of M68HC11 entry. + + * doc/binutils.texi: Fix ordering of top level nodes. + Replace erroneous uses of @itemx with @item. + + * bfd.texinfo: Replace @ with @@ when it is part of the text. + +diff --git a/bfd/doc/bfd.texinfo b/bfd/doc/bfd.texinfo +index 45ffa73..3aa3300 100644 +--- a/bfd/doc/bfd.texinfo ++++ b/bfd/doc/bfd.texinfo +@@ -322,7 +324,7 @@ All of BFD lives in one directory. + @printindex cp + + @tex +-% I think something like @colophon should be in texinfo. In the ++% I think something like @@colophon should be in texinfo. In the + % meantime: + \long\def\colophon{\hbox to0pt{}\vfill + \centerline{The body of this manual is set in} +@@ -333,7 +335,7 @@ All of BFD lives in one directory. + \centerline{{\sl\fontname\tensl\/}} + \centerline{are used for emphasis.}\vfill} + \page\colophon +-% Blame: doc@cygnus.com, 28mar91. ++% Blame: doc@@cygnus.com, 28mar91. + @end tex + + @bye +diff --git a/ld/ld.texinfo b/ld/ld.texinfo +index c7ae2a5..4777ad5 100644 +--- a/ld/ld.texinfo ++++ b/ld/ld.texinfo +@@ -7877,7 +7879,7 @@ If you have more than one @code{SECT} statement for the same + @printindex cp + + @tex +-% I think something like @colophon should be in texinfo. In the ++% I think something like @@colophon should be in texinfo. In the + % meantime: + \long\def\colophon{\hbox to0pt{}\vfill + \centerline{The body of this manual is set in} +@@ -7888,7 +7890,7 @@ If you have more than one @code{SECT} statement for the same + \centerline{{\sl\fontname\tensl\/}} + \centerline{are used for emphasis.}\vfill} + \page\colophon +-% Blame: doc@cygnus.com, 28mar91. ++% Blame: doc@@cygnus.com, 28mar91. + @end tex + + @bye diff --git a/abs/extra/nacl-toolchain-newlib/gcc-texinfo-r0.patch b/abs/extra/nacl-toolchain-newlib/gcc-texinfo-r0.patch new file mode 100644 index 0000000..8523373 --- /dev/null +++ b/abs/extra/nacl-toolchain-newlib/gcc-texinfo-r0.patch @@ -0,0 +1,132 @@ +https://bugs.gentoo.org/show_bug.cgi?id=464168 + +commit 85ad240e47dcdc1bf20ef6a95e921ac1f766d995 +Author: schwab <schwab@138bc75d-0d04-0410-961f-82ee72b054a4> +Date: Sun Oct 28 09:19:54 2012 +0000 + + * doc/cppopts.texi: Fix use of @item vs. @itemx inside @table. + * doc/extend.texi: Likewise. + * doc/generic.texi: Likewise. + * doc/invoke.texi: Likewise. + * doc/md.texi: Likewise. + * doc/sourcebuild.texi: Likewise. + + + git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@192887 138bc75d-0d04-0410-961f-82ee72b054a4 + +diff --git a/gcc/doc/cppopts.texi b/gcc/doc/cppopts.texi +index 27b1095..a2eb79d 100644 +--- a/gcc/doc/cppopts.texi ++++ b/gcc/doc/cppopts.texi +@@ -805,7 +805,7 @@ Replacement: [ ] @{ @} # \ ^ | ~ + Enable special code to work around file systems which only permit very + short file names, such as MS-DOS@. + +-@itemx --help ++@item --help + @itemx --target-help + @opindex help + @opindex target-help +diff --git a/gcc/doc/md.texi b/gcc/doc/md.texi +index dfbdc4c..bca0d8f 100644 +--- a/gcc/doc/md.texi ++++ b/gcc/doc/md.texi +@@ -4483,8 +4483,8 @@ means of constraints requiring operands 1 and 0 to be the same location. + @cindex @code{ior@var{m}3} instruction pattern + @cindex @code{xor@var{m}3} instruction pattern + @item @samp{ssadd@var{m}3}, @samp{usadd@var{m}3} +-@item @samp{sub@var{m}3}, @samp{sssub@var{m}3}, @samp{ussub@var{m}3} +-@item @samp{mul@var{m}3}, @samp{ssmul@var{m}3}, @samp{usmul@var{m}3} ++@itemx @samp{sub@var{m}3}, @samp{sssub@var{m}3}, @samp{ussub@var{m}3} ++@itemx @samp{mul@var{m}3}, @samp{ssmul@var{m}3}, @samp{usmul@var{m}3} + @itemx @samp{div@var{m}3}, @samp{ssdiv@var{m}3} + @itemx @samp{udiv@var{m}3}, @samp{usdiv@var{m}3} + @itemx @samp{mod@var{m}3}, @samp{umod@var{m}3} +diff --git a/gcc/doc/sourcebuild.texi b/gcc/doc/sourcebuild.texi +index 89e7712..ec8263f 100644 +--- a/gcc/doc/sourcebuild.texi ++++ b/gcc/doc/sourcebuild.texi +@@ -691,7 +691,7 @@ standard rule in @file{gcc/Makefile.in} to the variable + @code{lang_checks}. + + @table @code +-@itemx all.cross ++@item all.cross + @itemx start.encap + @itemx rest.encap + FIXME: exactly what goes in each of these targets? +--- a/gcc/doc/c-tree.texi ++++ b/gcc/doc/c-tree.texi +@@ -2338,13 +2338,13 @@ + not matter. The type of the operands and that of the result are + always of @code{BOOLEAN_TYPE} or @code{INTEGER_TYPE}. + +-@itemx POINTER_PLUS_EXPR ++@item POINTER_PLUS_EXPR + This node represents pointer arithmetic. The first operand is always + a pointer/reference type. The second operand is always an unsigned + integer type compatible with sizetype. This is the only binary + arithmetic operand that can operate on pointer types. + +-@itemx PLUS_EXPR ++@item PLUS_EXPR + @itemx MINUS_EXPR + @itemx MULT_EXPR + These nodes represent various binary arithmetic operations. +--- a/gcc/doc/invoke.texi ++++ b/gcc/doc/invoke.texi +@@ -4645,11 +4652,11 @@ + @option{-fdump-rtl-ce3} enable dumping after the three + if conversion passes. + +-@itemx -fdump-rtl-cprop_hardreg ++@item -fdump-rtl-cprop_hardreg + @opindex fdump-rtl-cprop_hardreg + Dump after hard register copy propagation. + +-@itemx -fdump-rtl-csa ++@item -fdump-rtl-csa + @opindex fdump-rtl-csa + Dump after combining stack adjustments. + +@@ -4660,11 +4667,11 @@ + @option{-fdump-rtl-cse1} and @option{-fdump-rtl-cse2} enable dumping after + the two common sub-expression elimination passes. + +-@itemx -fdump-rtl-dce ++@item -fdump-rtl-dce + @opindex fdump-rtl-dce + Dump after the standalone dead code elimination passes. + +-@itemx -fdump-rtl-dbr ++@item -fdump-rtl-dbr + @opindex fdump-rtl-dbr + Dump after delayed branch scheduling. + +@@ -4709,7 +4716,7 @@ + @opindex fdump-rtl-initvals + Dump after the computation of the initial value sets. + +-@itemx -fdump-rtl-into_cfglayout ++@item -fdump-rtl-into_cfglayout + @opindex fdump-rtl-into_cfglayout + Dump after converting to cfglayout mode. + +@@ -4739,7 +4746,7 @@ + @opindex fdump-rtl-rnreg + Dump after register renumbering. + +-@itemx -fdump-rtl-outof_cfglayout ++@item -fdump-rtl-outof_cfglayout + @opindex fdump-rtl-outof_cfglayout + Dump after converting from cfglayout mode. + +@@ -4751,7 +4758,7 @@ + @opindex fdump-rtl-postreload + Dump after post-reload optimizations. + +-@itemx -fdump-rtl-pro_and_epilogue ++@item -fdump-rtl-pro_and_epilogue + @opindex fdump-rtl-pro_and_epilogue + Dump after generating the function pro and epilogues. + diff --git a/abs/extra/nspr/PKGBUILD b/abs/extra/nspr/PKGBUILD index 3b1ad58..3dd4de0 100644 --- a/abs/extra/nspr/PKGBUILD +++ b/abs/extra/nspr/PKGBUILD @@ -1,63 +1,44 @@ -# $Id: PKGBUILD 162022 2012-06-18 22:10:00Z ibiru $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> + pkgname=nspr -pkgver=4.9.1 -pkgrel=1 +pkgver=4.10 +pkgrel=2 pkgdesc="Netscape Portable Runtime" arch=(i686 x86_64) url="http://www.mozilla.org/projects/nspr/" license=('MPL' 'GPL') depends=('glibc') makedepends=('zip') -options=(!emptydirs) -source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz - nspr.pc.in) -md5sums=('d36d7b65a38f5b43ebd50ad3ad227120' - 'bce1611f3117b53fc904cab549c09967') +options=('!emptydirs') +source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz) +md5sums=('f5466def95726b3c900d8a0227bdd034') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - if [ "$CARCH" = "x86_64" ]; then - confflags="--enable-64bit" + cd $pkgname-$pkgver + + if [[ $CARCH = x86_64 ]]; then + _confflags="--enable-64bit" else - confflags="" + _confflags="" fi - sed -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \ - -i mozilla/nsprpub/config/rules.mk - - ./mozilla/nsprpub/configure \ + ./nspr/configure \ --prefix=/usr \ --libdir=/usr/lib \ --includedir=/usr/include/nspr \ --enable-optimize \ - --disable-debug ${confflags} + --disable-debug ${_confflags} make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - NSPR_LIBS=`./config/nspr-config --libs` - NSPR_CFLAGS=`./config/nspr-config --cflags` - NSPR_VERSION=`./config/nspr-config --version` - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - sed "${srcdir}/nspr.pc.in" -e "s,%libdir%,/usr/lib," \ - -e "s,%prefix%,/usr," \ - -e "s,%exec_prefix%,/usr/bin," \ - -e "s,%includedir%,/usr/include/nspr," \ - -e "s,%NSPR_VERSION%,${NSPR_VERSION}," \ - -e "s,%FULL_NSPR_LIBS%,${NSPR_LIBS}," \ - -e "s,%FULL_NSPR_CFLAGS%,${NSPR_CFLAGS}," > "${pkgdir}/usr/lib/pkgconfig/nspr.pc" - chmod 644 "${pkgdir}/usr/lib/pkgconfig/nspr.pc" - ln -sf nspr.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nspr.pc" - - chmod 644 ${pkgdir}/usr/lib/*.a + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install - rm -rf "${pkgdir}/usr/bin/compile-et.pl" \ - "${pkgdir}/usr/bin/prerr.properties" \ - "${pkgdir}/usr/share/aclocal/nspr.m4" \ - "${pkgdir}/usr/include/nspr/md" + chmod 644 "$pkgdir"/usr/lib/*.a + ln -s nspr.pc "$pkgdir/usr/lib/pkgconfig/mozilla-nspr.pc" + rm -r "$pkgdir"/usr/bin/{compile-et.pl,prerr.properties} \ + "$pkgdir/usr/include/nspr/md" } diff --git a/abs/extra/nspr/nspr.pc.in b/abs/extra/nspr/nspr.pc.in deleted file mode 100644 index 1d8f4a0..0000000 --- a/abs/extra/nspr/nspr.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=%prefix% -exec_prefix=%exec_prefix% -libdir=%libdir% -includedir=%includedir% - -Name: NSPR -Description: The Netscape Portable Runtime -Version: %NSPR_VERSION% -Libs: %FULL_NSPR_LIBS% -Cflags: %FULL_NSPR_CFLAGS% diff --git a/abs/extra/nss/PKGBUILD b/abs/extra/nss/PKGBUILD index 77bc6ef..09c9d97 100644 --- a/abs/extra/nss/PKGBUILD +++ b/abs/extra/nss/PKGBUILD @@ -1,106 +1,97 @@ -# $Id: PKGBUILD 162023 2012-06-18 22:10:13Z ibiru $ +# $Id$ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=nss -pkgver=3.13.5 +pkgver=3.15.1 pkgrel=1 pkgdesc="Mozilla Network Security Services" arch=(i686 x86_64) url="http://www.mozilla.org/projects/security/pki/nss/" license=('MPL' 'GPL') -_nsprver=4.9.1 +_nsprver=4.10 depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh') makedepends=('perl') -options=('!strip') +options=('!strip' '!makeflags') source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz - nss-no-rpath.patch nss.pc.in nss-config.in - add_spi+cacert_ca_certs.patch - ssl-renegotiate-transitional.patch) -sha1sums=('22cfe2cbccc93189699e6eed283eca288b45f6cb' - 'c8fcdb153af9d39689243119adb475905a657284' + ssl-renegotiate-transitional.patch + add_spi+cacert_ca_certs.patch) +sha1sums=('1aa7c0ff8af7fb2c8b6e4886ae2291f4bfe0d5c0' 'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd' 'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c' - '3d89f29e321d7df7269b7ae6d219654543feaa6a' - '8a964a744ba098711b80c0d279a2993524e8eb92') + '8a964a744ba098711b80c0d279a2993524e8eb92' + 'be6ef0f124f188ebb76f4d83e13466bdcfb27dd3') + +prepare() { + cd $pkgname-$pkgver + + # Add CAcert and spi-inc.org CA certificates. + # See http://wiki.cacert.org/NSSLib for how to generate + patch -Np1 -i ../add_spi+cacert_ca_certs.patch -build() { - cd "${srcdir}/${pkgname}-${pkgver}/mozilla" - # Adds the SPI Inc. and CAcert.org CA certificates - patch from Debian, modified to apply on certdata.txt only - patch -Np2 -i "${srcdir}/add_spi+cacert_ca_certs.patch" # Adds transitional SSL renegotiate support - patch from Debian - patch -Np2 -i "${srcdir}/ssl-renegotiate-transitional.patch" - # Removes rpath - patch -Np2 -i "${srcdir}/nss-no-rpath.patch" + patch -Np3 -i ../ssl-renegotiate-transitional.patch # Respect LDFLAGS - sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \ - -i security/coreconf/rules.mk + sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/' \ + -i nss/coreconf/rules.mk +} + - # Generate certdata.c from certdata.txt - cd security/nss/lib/ckfw/builtins - make generate +build() { + cd $pkgname-$pkgver/nss - cd "${srcdir}/${pkgname}-${pkgver}" export BUILD_OPT=1 - export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 - export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 export NSS_USE_SYSTEM_SQLITE=1 export NSS_ENABLE_ECC=1 - export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'` - export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L.//'` + export NSPR_INCLUDE_DIR="`nspr-config --includedir`" + export NSPR_LIB_DIR="`nspr-config --libdir`" export XCFLAGS="${CFLAGS}" [ "$CARCH" = "x86_64" ] && export USE_64=1 - make -j 1 -C mozilla/security/coreconf - make -j 1 -C mozilla/security/dbm - make -j 1 -C mozilla/security/nss + make -C coreconf + make -C lib/dbm + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m755 -d "${pkgdir}/usr/bin" - install -m755 -d "${pkgdir}/usr/include/nss" - - NSS_VMAJOR=`grep "#define.*NSS_VMAJOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'` - NSS_VMINOR=`grep "#define.*NSS_VMINOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'` - NSS_VPATCH=`grep "#define.*NSS_VPATCH" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'` - - sed "${srcdir}/nss.pc.in" -e "s,%libdir%,/usr/lib,g" \ - -e "s,%prefix%,/usr,g" \ - -e "s,%exec_prefix%,/usr/bin,g" \ - -e "s,%includedir%,/usr/include/nss,g" \ - -e "s,%NSPR_VERSION%,${pkgver},g" \ - -e "s,%NSS_VERSION%,${pkgver},g" > \ - "${pkgdir}/usr/lib/pkgconfig/nss.pc" - ln -sf nss.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nss.pc" - chmod 644 ${pkgdir}/usr/lib/pkgconfig/*.pc - - sed "${srcdir}/nss-config.in" -e "s,@libdir@,/usr/lib,g" \ - -e "s,@prefix@,/usr/bin,g" \ - -e "s,@exec_prefix@,/usr/bin,g" \ - -e "s,@includedir@,/usr/include/nss,g" \ - -e "s,@MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \ - -e "s,@MOD_MINOR_VERSION@,${NSS_VMINOR},g" \ - -e "s,@MOD_PATCH_VERSION@,${NSS_VPATCH},g" \ - > "${pkgdir}/usr/bin/nss-config" - chmod 755 "${pkgdir}/usr/bin/nss-config" - - for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \ - libssl3.so libsmime3.so libnssckbi.so libnssdbm3.so - do - install -m755 mozilla/dist/*.OBJ/lib/${file} "${pkgdir}/usr/lib/" - done - - install -m644 mozilla/dist/*.OBJ/lib/libcrmf.a "${pkgdir}/usr/lib/" - install -m644 mozilla/dist/*.OBJ/lib/*.chk "${pkgdir}/usr/lib/" - - for file in certutil cmsutil crlutil modutil pk12util shlibsign signtool signver ssltap; do - install -m755 mozilla/dist/*.OBJ/bin/${file} "${pkgdir}/usr/bin/" - done - - install -m644 mozilla/dist/public/nss/*.h "${pkgdir}/usr/include/nss/" + cd $pkgname-$pkgver + install -d "$pkgdir"/usr/{bin,include/nss,lib/pkgconfig} + + NSS_VMAJOR=$(grep '#define.*NSS_VMAJOR' nss/lib/nss/nss.h | awk '{print $3}') + NSS_VMINOR=$(grep '#define.*NSS_VMINOR' nss/lib/nss/nss.h | awk '{print $3}') + NSS_VPATCH=$(grep '#define.*NSS_VPATCH' nss/lib/nss/nss.h | awk '{print $3}') + + sed ../nss.pc.in \ + -e "s,%libdir%,/usr/lib,g" \ + -e "s,%prefix%,/usr,g" \ + -e "s,%exec_prefix%,/usr/bin,g" \ + -e "s,%includedir%,/usr/include/nss,g" \ + -e "s,%NSPR_VERSION%,${_nsprver},g" \ + -e "s,%NSS_VERSION%,${pkgver},g" \ + > "$pkgdir/usr/lib/pkgconfig/nss.pc" + ln -s nss.pc "$pkgdir/usr/lib/pkgconfig/mozilla-nss.pc" + + sed ../nss-config.in \ + -e "s,@libdir@,/usr/lib,g" \ + -e "s,@prefix@,/usr/bin,g" \ + -e "s,@exec_prefix@,/usr/bin,g" \ + -e "s,@includedir@,/usr/include/nss,g" \ + -e "s,@MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \ + -e "s,@MOD_MINOR_VERSION@,${NSS_VMINOR},g" \ + -e "s,@MOD_PATCH_VERSION@,${NSS_VPATCH},g" \ + > "$pkgdir/usr/bin/nss-config" + chmod 755 "$pkgdir/usr/bin/nss-config" + + cd dist/*.OBJ/bin + install -t "$pkgdir/usr/bin" *util shlibsign signtool signver ssltap + + cd ../lib + install -t "$pkgdir/usr/lib" *.so + install -t "$pkgdir/usr/lib" -m644 libcrmf.a *.chk + + cd ../../public/nss + install -t "$pkgdir/usr/include/nss" -m644 *.h } diff --git a/abs/extra/nss/add_spi+cacert_ca_certs.patch b/abs/extra/nss/add_spi+cacert_ca_certs.patch index bf7e2ca..14c65e0 100644 --- a/abs/extra/nss/add_spi+cacert_ca_certs.patch +++ b/abs/extra/nss/add_spi+cacert_ca_certs.patch @@ -1,20 +1,20 @@ -## 95_add_spi+cacert_ca_certs.patch by martin f. krafft <madduck@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Adds the SPI Inc. and CAcert.org CA certificates - -Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt -=================================================================== ---- nss.orig/mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2012-02-24 09:32:14.000000000 +0100 -+++ nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2012-02-24 09:35:07.577861466 +0100 -@@ -23475,3 +23475,558 @@ - CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_NOT_TRUSTED - CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_NOT_TRUSTED +--- security/nss/lib/ckfw/builtins/certdata.txt.orig 2012-08-19 16:22:51.726895174 +0200 ++++ security/nss/lib/ckfw/builtins/certdata.txt 2012-08-19 17:40:41.233306703 +0200 +@@ -24454,3 +24454,621 @@ + CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST + CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -+ ++ +# +# Certificate "CAcert.org Class 1 Root CA" +# ++# Issuer: E=support@cacert.org,CN=CA Cert Signing Authority,OU=http://www.cacert.org,O=Root CA ++# Serial Number: 0 (0x0) ++# Subject: E=support@cacert.org,CN=CA Cert Signing Authority,OU=http://www.cacert.org,O=Root CA ++# Not Valid Before: Sun Mar 30 12:29:49 2003 ++# Not Valid After : Tue Mar 29 12:29:49 2033 ++# Fingerprint (MD5): A6:1B:37:5E:39:0D:9C:36:54:EE:BD:20:31:46:1F:6B ++# Fingerprint (SHA1): 13:5C:EC:36:F4:9C:B8:E9:3B:1A:B2:70:CD:80:88:46:76:CE:8F:33 +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE @@ -165,8 +165,15 @@ Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt +\103 +END + -+# Trust for Certificate "CAcert.org Class 1 Root CA" -+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST ++# Trust for "CAcert.org Class 1 Root CA" ++# Issuer: E=support@cacert.org,CN=CA Cert Signing Authority,OU=http://www.cacert.org,O=Root CA ++# Serial Number: 0 (0x0) ++# Subject: E=support@cacert.org,CN=CA Cert Signing Authority,OU=http://www.cacert.org,O=Root CA ++# Not Valid Before: Sun Mar 30 12:29:49 2003 ++# Not Valid After : Tue Mar 29 12:29:49 2033 ++# Fingerprint (MD5): A6:1B:37:5E:39:0D:9C:36:54:EE:BD:20:31:46:1F:6B ++# Fingerprint (SHA1): 13:5C:EC:36:F4:9C:B8:E9:3B:1A:B2:70:CD:80:88:46:76:CE:8F:33 ++CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE @@ -191,14 +198,21 @@ Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\001\000 +END -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# +# Certificate "CAcert.org Class 3 Root CA" +# ++# Issuer: E=support@cacert.org,CN=CA Cert Signing Authority,OU=http://www.cacert.org,O=Root CA ++# Serial Number: 672138 (0xa418a) ++# Subject: CN=CAcert Class 3 Root,OU=http://www.CAcert.org,O=CAcert Inc. ++# Not Valid Before: Mon May 23 17:48:02 2011 ++# Not Valid After : Thu May 20 17:48:02 2021 ++# Fingerprint (MD5): F7:25:12:82:4E:67:B5:D0:8D:92:B7:7C:0B:86:7A:42 ++# Fingerprint (SHA1): AD:7C:3F:64:FC:44:39:FE:F4:E9:0B:E8:F4:7C:6C:FA:8A:AD:FD:CE +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE @@ -225,120 +239,148 @@ Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt +\100\143\141\143\145\162\164\056\157\162\147 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\001\001 ++\002\003\012\101\212 +END +CKA_VALUE MULTILINE_OCTAL -+\060\202\006\010\060\202\003\360\240\003\002\001\002\002\001\001 -+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060 -+\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164 -+\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164 -+\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056 -+\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101 -+\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165 -+\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110 -+\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100 -+\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\065 -+\061\060\061\064\060\067\063\066\065\065\132\027\015\063\063\060 -+\063\062\070\060\067\063\066\065\065\132\060\124\061\024\060\022 -+\006\003\125\004\012\023\013\103\101\143\145\162\164\040\111\156 -+\143\056\061\036\060\034\006\003\125\004\013\023\025\150\164\164 -+\160\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157 -+\162\147\061\034\060\032\006\003\125\004\003\023\023\103\101\143 -+\145\162\164\040\103\154\141\163\163\040\063\040\122\157\157\164 -+\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001 -+\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001 -+\000\253\111\065\021\110\174\322\046\176\123\224\317\103\251\335 -+\050\327\102\052\213\363\207\170\031\130\174\017\236\332\211\175 -+\341\373\353\162\220\015\164\241\226\144\253\237\240\044\231\163 -+\332\342\125\166\307\027\173\365\004\254\106\270\303\276\177\144 -+\215\020\154\044\363\141\234\300\362\220\372\121\346\365\151\001 -+\143\303\017\126\342\112\102\317\342\104\214\045\050\250\305\171 -+\011\175\106\271\212\363\351\363\064\051\010\105\344\034\237\313 -+\224\004\034\201\250\024\263\230\145\304\103\354\116\202\215\011 -+\321\275\252\133\215\222\320\354\336\220\305\177\012\302\343\353 -+\346\061\132\136\164\076\227\063\131\350\303\003\075\140\063\277 -+\367\321\157\107\304\315\356\142\203\122\156\056\010\232\244\331 -+\025\030\221\246\205\222\107\260\256\110\353\155\267\041\354\205 -+\032\150\162\065\253\377\360\020\135\300\364\224\247\152\325\073 -+\222\176\114\220\005\176\223\301\054\213\244\216\142\164\025\161 -+\156\013\161\003\352\257\025\070\232\324\322\005\162\157\214\371 -+\053\353\132\162\045\371\071\106\343\162\033\076\004\303\144\047 -+\042\020\052\212\117\130\247\003\255\276\264\056\023\355\135\252 -+\110\327\325\175\324\052\173\134\372\106\004\120\344\314\016\102 -+\133\214\355\333\362\317\374\226\223\340\333\021\066\124\142\064 -+\070\217\014\140\233\073\227\126\070\255\363\322\133\213\240\133 -+\352\116\226\270\174\327\325\240\206\160\100\323\221\051\267\242 -+\074\255\365\214\273\317\032\222\212\344\064\173\300\330\154\137 -+\351\012\302\303\247\040\232\132\337\054\135\122\134\272\107\325 -+\233\357\044\050\160\070\040\057\325\177\051\300\262\101\003\150 -+\222\314\340\234\314\227\113\105\357\072\020\012\253\160\072\230 -+\225\160\255\065\261\352\205\053\244\034\200\041\061\251\256\140 -+\172\200\046\110\000\270\001\300\223\143\125\042\221\074\126\347 -+\257\333\072\045\363\217\061\124\352\046\213\201\131\371\241\321 -+\123\021\305\173\235\003\366\164\021\340\155\261\054\077\054\206 -+\221\231\161\232\246\167\213\064\140\321\024\264\054\254\235\257 -+\214\020\323\237\304\152\370\157\023\374\163\131\367\146\102\164 -+\036\212\343\370\334\322\157\230\234\313\107\230\225\100\005\373 -+\351\002\003\001\000\001\243\201\277\060\201\274\060\017\006\003 -+\125\035\023\001\001\377\004\005\060\003\001\001\377\060\135\006 -+\010\053\006\001\005\005\007\001\001\004\121\060\117\060\043\006 -+\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072 -+\057\057\157\143\163\160\056\103\101\143\145\162\164\056\157\162 -+\147\057\060\050\006\010\053\006\001\005\005\007\060\002\206\034 -+\150\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162 -+\164\056\157\162\147\057\143\141\056\143\162\164\060\112\006\003 -+\125\035\040\004\103\060\101\060\077\006\010\053\006\001\004\001 -+\201\220\112\060\063\060\061\006\010\053\006\001\005\005\007\002 -+\001\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101 -+\143\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160 -+\150\160\077\151\144\075\061\060\060\015\006\011\052\206\110\206 -+\367\015\001\001\004\005\000\003\202\002\001\000\177\010\210\241 -+\332\032\120\111\332\211\373\241\010\162\363\212\367\036\304\072 -+\264\171\133\040\060\261\105\336\302\135\323\145\151\361\302\135 -+\124\124\074\205\137\271\173\102\221\302\231\375\033\121\233\253 -+\106\245\241\020\123\236\155\210\254\163\156\054\063\246\360\364 -+\236\340\165\301\076\210\105\251\341\146\103\376\126\132\321\172 -+\101\170\367\100\332\112\072\361\013\133\245\273\026\006\346\302 -+\347\223\271\205\115\227\117\261\036\070\103\200\357\233\015\214 -+\357\270\247\140\000\207\127\175\036\104\034\313\043\357\233\074 -+\231\235\257\265\051\034\105\171\026\226\115\047\155\361\034\154 -+\303\302\125\144\263\274\024\342\363\244\037\036\062\374\047\025 -+\005\317\335\056\256\076\202\141\173\360\041\020\030\366\104\352 -+\123\071\371\334\320\232\040\340\306\273\340\273\132\117\304\231 -+\310\007\275\265\275\242\333\056\142\015\102\064\101\274\377\213 -+\212\365\121\042\252\210\060\000\342\260\324\274\276\145\272\325 -+\003\127\171\233\350\334\310\115\370\120\355\221\245\122\050\242 -+\254\373\066\130\076\351\224\053\221\120\207\033\326\136\326\214 -+\314\367\017\020\014\122\116\320\026\141\345\345\012\154\277\027 -+\307\162\106\127\234\230\365\154\140\143\172\157\136\271\116\057 -+\310\271\271\273\152\205\274\230\015\355\371\076\227\204\064\224 -+\256\000\257\241\345\347\222\156\116\275\363\342\331\024\213\134 -+\322\353\001\154\240\027\245\055\020\353\234\172\112\275\275\356 -+\316\375\355\042\100\253\160\070\210\365\012\207\152\302\253\005 -+\140\311\110\005\332\123\301\336\104\167\152\263\363\074\074\355 -+\200\274\246\070\112\051\044\137\376\131\073\233\045\172\126\143 -+\000\144\271\135\244\142\175\127\066\117\255\203\357\037\222\123 -+\240\216\167\127\335\345\141\021\075\043\000\220\114\074\372\243 -+\140\223\004\243\257\065\366\016\152\217\117\112\140\247\205\005 -+\154\106\241\217\364\307\166\343\241\131\127\367\161\262\304\156 -+\024\134\155\155\101\146\337\033\223\261\324\000\303\356\313\317 -+\074\075\041\200\251\137\143\145\374\335\340\137\244\364\053\360 -+\205\161\101\324\147\045\373\032\261\227\256\326\231\202\023\101 -+\322\156\245\033\231\047\200\347\013\251\250\000 ++\060\202\007\131\060\202\005\101\240\003\002\001\002\002\003\012 ++\101\212\060\015\006\011\052\206\110\206\367\015\001\001\013\005 ++\000\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157 ++\157\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025 ++\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162 ++\164\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031 ++\103\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040 ++\101\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052 ++\206\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162 ++\164\100\143\141\143\145\162\164\056\157\162\147\060\036\027\015 ++\061\061\060\065\062\063\061\067\064\070\060\062\132\027\015\062 ++\061\060\065\062\060\061\067\064\070\060\062\132\060\124\061\024 ++\060\022\006\003\125\004\012\023\013\103\101\143\145\162\164\040 ++\111\156\143\056\061\036\060\034\006\003\125\004\013\023\025\150 ++\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162\164 ++\056\157\162\147\061\034\060\032\006\003\125\004\003\023\023\103 ++\101\143\145\162\164\040\103\154\141\163\163\040\063\040\122\157 ++\157\164\060\202\002\042\060\015\006\011\052\206\110\206\367\015 ++\001\001\001\005\000\003\202\002\017\000\060\202\002\012\002\202 ++\002\001\000\253\111\065\021\110\174\322\046\176\123\224\317\103 ++\251\335\050\327\102\052\213\363\207\170\031\130\174\017\236\332 ++\211\175\341\373\353\162\220\015\164\241\226\144\253\237\240\044 ++\231\163\332\342\125\166\307\027\173\365\004\254\106\270\303\276 ++\177\144\215\020\154\044\363\141\234\300\362\220\372\121\346\365 ++\151\001\143\303\017\126\342\112\102\317\342\104\214\045\050\250 ++\305\171\011\175\106\271\212\363\351\363\064\051\010\105\344\034 ++\237\313\224\004\034\201\250\024\263\230\145\304\103\354\116\202 ++\215\011\321\275\252\133\215\222\320\354\336\220\305\177\012\302 ++\343\353\346\061\132\136\164\076\227\063\131\350\303\003\075\140 ++\063\277\367\321\157\107\304\315\356\142\203\122\156\056\010\232 ++\244\331\025\030\221\246\205\222\107\260\256\110\353\155\267\041 ++\354\205\032\150\162\065\253\377\360\020\135\300\364\224\247\152 ++\325\073\222\176\114\220\005\176\223\301\054\213\244\216\142\164 ++\025\161\156\013\161\003\352\257\025\070\232\324\322\005\162\157 ++\214\371\053\353\132\162\045\371\071\106\343\162\033\076\004\303 ++\144\047\042\020\052\212\117\130\247\003\255\276\264\056\023\355 ++\135\252\110\327\325\175\324\052\173\134\372\106\004\120\344\314 ++\016\102\133\214\355\333\362\317\374\226\223\340\333\021\066\124 ++\142\064\070\217\014\140\233\073\227\126\070\255\363\322\133\213 ++\240\133\352\116\226\270\174\327\325\240\206\160\100\323\221\051 ++\267\242\074\255\365\214\273\317\032\222\212\344\064\173\300\330 ++\154\137\351\012\302\303\247\040\232\132\337\054\135\122\134\272 ++\107\325\233\357\044\050\160\070\040\057\325\177\051\300\262\101 ++\003\150\222\314\340\234\314\227\113\105\357\072\020\012\253\160 ++\072\230\225\160\255\065\261\352\205\053\244\034\200\041\061\251 ++\256\140\172\200\046\110\000\270\001\300\223\143\125\042\221\074 ++\126\347\257\333\072\045\363\217\061\124\352\046\213\201\131\371 ++\241\321\123\021\305\173\235\003\366\164\021\340\155\261\054\077 ++\054\206\221\231\161\232\246\167\213\064\140\321\024\264\054\254 ++\235\257\214\020\323\237\304\152\370\157\023\374\163\131\367\146 ++\102\164\036\212\343\370\334\322\157\230\234\313\107\230\225\100 ++\005\373\351\002\003\001\000\001\243\202\002\015\060\202\002\011 ++\060\035\006\003\125\035\016\004\026\004\024\165\250\161\140\114 ++\210\023\360\170\331\211\167\265\155\305\211\337\274\261\172\060 ++\201\243\006\003\125\035\043\004\201\233\060\201\230\200\024\026 ++\265\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262 ++\071\030\321\241\175\244\173\060\171\061\020\060\016\006\003\125 ++\004\012\023\007\122\157\157\164\040\103\101\061\036\060\034\006 ++\003\125\004\013\023\025\150\164\164\160\072\057\057\167\167\167 ++\056\143\141\143\145\162\164\056\157\162\147\061\042\060\040\006 ++\003\125\004\003\023\031\103\101\040\103\145\162\164\040\123\151 ++\147\156\151\156\147\040\101\165\164\150\157\162\151\164\171\061 ++\041\060\037\006\011\052\206\110\206\367\015\001\011\001\026\022 ++\163\165\160\160\157\162\164\100\143\141\143\145\162\164\056\157 ++\162\147\202\001\000\060\017\006\003\125\035\023\001\001\377\004 ++\005\060\003\001\001\377\060\135\006\010\053\006\001\005\005\007 ++\001\001\004\121\060\117\060\043\006\010\053\006\001\005\005\007 ++\060\001\206\027\150\164\164\160\072\057\057\157\143\163\160\056 ++\103\101\143\145\162\164\056\157\162\147\057\060\050\006\010\053 ++\006\001\005\005\007\060\002\206\034\150\164\164\160\072\057\057 ++\167\167\167\056\103\101\143\145\162\164\056\157\162\147\057\143 ++\141\056\143\162\164\060\112\006\003\125\035\040\004\103\060\101 ++\060\077\006\010\053\006\001\004\001\201\220\112\060\063\060\061 ++\006\010\053\006\001\005\005\007\002\001\026\045\150\164\164\160 ++\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157\162 ++\147\057\151\156\144\145\170\056\160\150\160\077\151\144\075\061 ++\060\060\064\006\011\140\206\110\001\206\370\102\001\010\004\047 ++\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101\143 ++\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160\150 ++\160\077\151\144\075\061\060\060\120\006\011\140\206\110\001\206 ++\370\102\001\015\004\103\026\101\124\157\040\147\145\164\040\171 ++\157\165\162\040\157\167\156\040\143\145\162\164\151\146\151\143 ++\141\164\145\040\146\157\162\040\106\122\105\105\054\040\147\157 ++\040\164\157\040\150\164\164\160\072\057\057\167\167\167\056\103 ++\101\143\145\162\164\056\157\162\147\060\015\006\011\052\206\110 ++\206\367\015\001\001\013\005\000\003\202\002\001\000\051\050\205 ++\256\104\251\271\257\244\171\023\360\250\243\053\227\140\363\134 ++\356\343\057\301\366\342\146\240\021\256\066\067\072\166\025\004 ++\123\352\102\365\371\352\300\025\330\246\202\331\344\141\256\162 ++\013\051\134\220\103\350\101\262\341\167\333\002\023\104\170\107 ++\125\257\130\374\314\230\366\105\271\321\040\370\330\041\007\376 ++\155\252\163\324\263\306\007\351\011\205\314\073\362\266\276\054 ++\034\045\325\161\214\071\265\056\352\276\030\201\272\260\223\270 ++\017\343\346\327\046\214\061\132\162\003\204\122\346\246\365\063 ++\042\105\012\310\013\015\212\270\066\157\220\011\241\253\275\327 ++\325\116\056\161\242\324\256\372\247\124\053\353\065\215\132\267 ++\124\210\057\356\164\237\355\110\026\312\015\110\320\224\323\254 ++\244\242\366\044\337\222\343\275\353\103\100\221\156\034\030\216 ++\126\264\202\022\363\251\223\237\324\274\234\255\234\165\356\132 ++\227\033\225\347\164\055\034\017\260\054\227\237\373\251\063\071 ++\172\347\003\072\222\216\042\366\214\015\344\331\176\015\166\030 ++\367\001\371\357\226\226\242\125\163\300\074\161\264\035\032\126 ++\103\267\303\012\215\162\374\342\020\011\013\101\316\214\224\240 ++\371\003\375\161\163\113\212\127\063\345\216\164\176\025\001\000 ++\346\314\112\034\347\177\225\031\055\305\245\014\213\273\265\355 ++\205\263\134\323\337\270\271\362\312\307\015\001\024\254\160\130 ++\305\214\215\063\324\235\146\243\032\120\225\043\374\110\340\006 ++\103\022\331\315\247\206\071\057\066\162\243\200\020\344\341\363 ++\321\313\133\032\300\344\200\232\174\023\163\006\117\333\243\153 ++\044\012\272\263\034\274\112\170\273\345\343\165\070\245\110\247 ++\242\036\257\166\324\136\367\070\206\126\132\211\316\326\303\247 ++\171\262\122\240\306\361\205\264\045\214\362\077\226\263\020\331 ++\215\154\127\073\237\157\206\072\030\202\042\066\310\260\221\070 ++\333\052\241\223\252\204\077\365\047\145\256\163\325\310\325\323 ++\167\352\113\235\307\101\273\307\300\343\240\077\344\175\244\215 ++\163\346\022\113\337\241\163\163\163\072\200\350\325\313\216\057 ++\313\352\023\247\326\101\213\254\372\074\211\327\044\365\116\264 ++\340\141\222\267\363\067\230\304\276\226\243\267\212 +END + -+# Trust for Certificate "CAcert.org Class 3 Root CA" -+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST ++# Trust for "CAcert.org Class 3 Root CA" ++# Issuer: E=support@cacert.org,CN=CA Cert Signing Authority,OU=http://www.cacert.org,O=Root CA ++# Serial Number: 672138 (0xa418a) ++# Subject: CN=CAcert Class 3 Root,OU=http://www.CAcert.org,O=CAcert Inc. ++# Not Valid Before: Mon May 23 17:48:02 2011 ++# Not Valid After : Thu May 20 17:48:02 2021 ++# Fingerprint (MD5): F7:25:12:82:4E:67:B5:D0:8D:92:B7:7C:0B:86:7A:42 ++# Fingerprint (SHA1): AD:7C:3F:64:FC:44:39:FE:F4:E9:0B:E8:F4:7C:6C:FA:8A:AD:FD:CE ++CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE +CKA_LABEL UTF8 "CAcert.org Class 3 Root CA" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL -+\333\114\102\151\007\077\351\302\243\175\211\012\134\033\030\304 -+\030\116\052\055 ++\255\174\077\144\374\104\071\376\364\351\013\350\364\174\154\372 ++\212\255\375\316 +END +CKA_CERT_MD5_HASH MULTILINE_OCTAL -+\163\077\065\124\035\104\311\351\132\112\357\121\255\003\006\266 ++\367\045\022\202\116\147\265\320\215\222\267\174\013\206\172\102 +END +CKA_ISSUER MULTILINE_OCTAL +\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157 @@ -351,21 +393,28 @@ Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt +\100\143\141\143\145\162\164\056\157\162\147 +END +CKA_SERIAL_NUMBER MULTILINE_OCTAL -+\002\001\001 ++\002\003\012\101\212 +END -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE + +# -+# Certificate "Software in the Public Interest, Inc. Root CA (2008)" ++# Certificate "Software in the Public Interest" +# ++# Issuer: E=hostmaster@spi-inc.org,CN=Certificate Authority,OU=hostmaster,O=Software in the Public Interest,L=Indianapolis,ST=Indiana,C=US ++# Serial Number:00:e8:8e:b6:c9:f8:2a:14:28 ++# Subject: E=hostmaster@spi-inc.org,CN=Certificate Authority,OU=hostmaster,O=Software in the Public Interest,L=Indianapolis,ST=Indiana,C=US ++# Not Valid Before: Tue May 13 08:07:56 2008 ++# Not Valid After : Fri May 11 08:07:56 2018 ++# Fingerprint (MD5): 2A:47:9F:60:BB:83:74:6F:01:03:D7:0B:0D:F6:0D:78 ++# Fingerprint (SHA1): AF:70:88:43:83:82:02:15:CD:61:C6:BC:EC:FD:37:24:A9:90:43:1C +CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)" ++CKA_LABEL UTF8 "Software in the Public Interest" +CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 +CKA_SUBJECT MULTILINE_OCTAL +\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123 @@ -532,12 +581,19 @@ Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt +\243\140 +END + -+# Trust for Certificate "Software in the Public Interest, Inc. Root CA (2008)" -+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST ++# Trust for "Software in the Public Interest" ++# Issuer: E=hostmaster@spi-inc.org,CN=Certificate Authority,OU=hostmaster,O=Software in the Public Interest,L=Indianapolis,ST=Indiana,C=US ++# Serial Number:00:e8:8e:b6:c9:f8:2a:14:28 ++# Subject: E=hostmaster@spi-inc.org,CN=Certificate Authority,OU=hostmaster,O=Software in the Public Interest,L=Indianapolis,ST=Indiana,C=US ++# Not Valid Before: Tue May 13 08:07:56 2008 ++# Not Valid After : Fri May 11 08:07:56 2018 ++# Fingerprint (MD5): 2A:47:9F:60:BB:83:74:6F:01:03:D7:0B:0D:F6:0D:78 ++# Fingerprint (SHA1): AF:70:88:43:83:82:02:15:CD:61:C6:BC:EC:FD:37:24:A9:90:43:1C ++CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST +CKA_TOKEN CK_BBOOL CK_TRUE +CKA_PRIVATE CK_BBOOL CK_FALSE +CKA_MODIFIABLE CK_BBOOL CK_FALSE -+CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)" ++CKA_LABEL UTF8 "Software in the Public Interest" +CKA_CERT_SHA1_HASH MULTILINE_OCTAL +\257\160\210\103\203\202\002\025\315\141\306\274\354\375\067\044 +\251\220\103\034 @@ -562,7 +618,7 @@ Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt +CKA_SERIAL_NUMBER MULTILINE_OCTAL +\002\011\000\350\216\266\311\370\052\024\050 +END -+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR -+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR ++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR ++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR ++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR +CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE diff --git a/abs/extra/nss/nss-no-rpath.patch b/abs/extra/nss/nss-no-rpath.patch deleted file mode 100644 index 35ea573..0000000 --- a/abs/extra/nss/nss-no-rpath.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- ./mozilla/security/nss/cmd/platlibs.mk.withrpath 2007-02-19 07:17:06.000000000 +0100 -+++ ./mozilla/security/nss/cmd/platlibs.mk 2007-02-19 07:18:07.000000000 +0100 -@@ -52,9 +52,9 @@ - - ifeq ($(OS_ARCH), Linux) - ifeq ($(USE_64), 1) --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib' - else --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib' - endif - endif - diff --git a/abs/extra/ntfs-3g_ntfsprogs/PKGBUILD b/abs/extra/ntfs-3g_ntfsprogs/PKGBUILD new file mode 100644 index 0000000..116ab72 --- /dev/null +++ b/abs/extra/ntfs-3g_ntfsprogs/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 185299 2013-05-13 04:23:22Z eric $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: Ronald van Haren <ronald.archlinux.org> +# Contributor: Thomas Bchler <thomas.archlinux.org> + +pkgbase=ntfs-3g_ntfsprogs +pkgname=ntfs-3g +pkgver=2013.1.13 +pkgrel=3 +pkgdesc="NTFS filesystem utilities" +arch=('i686' 'x86_64') +url="http://www.tuxera.com/community/ntfs-3g-download/" +license=('GPL2') +depends=('util-linux' 'fuse') +conflicts=('ntfsprogs') +provides=('ntfsprogs') +replaces=('ntfsprogs') +options=('!libtool') +source=(http://tuxera.com/opensource/$pkgbase-$pkgver.tgz) +sha1sums=('8c12b7644d90ae9fb8d0aca0d7ebd5f8fac2c818') + +prepare() { + cd $pkgbase-$pkgver + sed -i 's|$(DESTDIR)/sbin|$(DESTDIR)/usr/bin|' {ntfsprogs,src}/Makefile.in +} + +build() { + cd $pkgbase-$pkgver + ./configure --prefix=/usr \ + --with-fuse=external --disable-static \ + --enable-posix-acls --disable-ldconfig \ + --mandir=/usr/share/man --sbin=/usr/bin + make +} + +package_ntfs-3g() { + cd $pkgbase-$pkgver + make DESTDIR="$pkgdir" rootbindir=/usr/bin rootsbindir=/usr/bin rootlibdir=/usr/lib install + ln -s /usr/bin/ntfs-3g "$pkgdir/usr/bin/mount.ntfs" +} diff --git a/abs/extra/postfix/PKGBUILD b/abs/extra/postfix/PKGBUILD index 159f9eb..86b79f6 100644 --- a/abs/extra/postfix/PKGBUILD +++ b/abs/extra/postfix/PKGBUILD @@ -1,52 +1,58 @@ -# $Id: PKGBUILD 70372 2010-02-26 13:35:23Z paul $ +# $Id$ # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net> -# Maintainer: Paul Mattal <paul@archlinux.org> +# Contributor: Paul Mattal <paul@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + pkgname=postfix -pkgver=2.7.1 +pkgver=2.10.2 pkgrel=1 -pkgdesc="Secure, fast, easy to administer drop in replacement for Sendmail (MTA)" -arch=('i686' 'x86_64') +pkgdesc='Fast, easy to administer, secure mail server' +url='http://www.postfix.org/' license=('custom') -depends=('pcre' 'libsasl' 'db>=4.7') -backup=(etc/postfix/aliases etc/postfix/virtual etc/postfix/relocated \ - etc/postfix/access etc/postfix/header_checks etc/postfix/transport \ - etc/postfix/generic etc/postfix/canonical \ - etc/postfix/main.cf etc/postfix/master.cf) -install="${pkgname}.install" +arch=('i686' 'x86_64') +depends=('pcre' 'libsasl' 'db') +backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual}) +source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz"{,.sig} + 'aliases.patch' + 'service') +sha1sums=('4721024784d071c3e663d610db17f8bd99821f3d' 'SKIP' + '5fc3de6c7df1e5851a0a379e825148868808318b' + 'dd12885d367bebaf0fc9d2e9823a7f82086b6ee9') + provides=('smtp-server' 'smtp-forwarder') -replaces=('postfix-mysql' 'postfix-pgsql') -conflicts=('postfix-mysql' 'postfix-pgsql' 'smtp-server' 'smtp-forwarder') -url="http://www.postfix.org/" -source=(ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz \ - ${pkgname}.patch.bz2 \ - ${pkgname}) +conflicts=('smtp-server' 'smtp-forwarder') + +install=install build() { - cd ${srcdir}/${pkgname}-${pkgver} - - make makefiles \ - CCARGS="-DUSE_SASL_AUTH -I/usr/include/sasl \ - -DUSE_CYRUS_SASL \ - -DUSE_TLS" \ - AUXLIBS="-lsasl2 -lssl -lcrypto -llber -lz -lm " - make OPT="${CFLAGS}" || return 1 - - sh postfix-install -non-interactive \ - install_root="${pkgdir}" \ - daemon_directory="/usr/lib/${pkgname}" \ - sample_directory="/etc/${pkgname}/sample" \ - manpage_directory="/usr/share/man" - - cd ${pkgdir} - cat ${srcdir}/${pkgname}.patch |patch -Np0 || return 1 - rm -f etc/${pkgname}/main.cf~ - - cd ${pkgdir} - mkdir etc/rc.d - install -m 0755 ${srcdir}/${pkgname} etc/rc.d/${pkgname} - - install -Dm644 ${srcdir}/${pkgname}-${pkgver}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + cd "${srcdir}/${pkgname}-${pkgver}" + + make makefiles DEBUG='' CCARGS=' \ + -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl \ + -DUSE_TLS \ + -DDEF_COMMAND_DIR=\"/usr/bin\" \ + -DDEF_DAEMON_DIR=\"/usr/lib/postfix\" \ + -DDEF_SENDMAIL_PATH=\"/usr/bin/sendmail\" \ +# -DDEF_README_DIR=\"/usr/share/doc/postfix\" \ + -DDEF_SAMPLE_DIR=\"/etc/postfix/sample\" \ + -DDEF_MANPAGE_DIR=\"/usr/share/man\" \ + ' AUXLIBS=' \ + -lsasl2 \ + -lssl -lcrypto \ + ' OPT="${CFLAGS} ${LDFLAGS}" + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sh postfix-install -non-interactive install_root="${pkgdir}" + + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/${pkgname}.service" + + cd "${pkgdir}" + patch -p0 -i "${srcdir}"/aliases.patch + sed 's/^\(\$manpage[^:]*\):/\1.gz:/' -i "usr/lib/${pkgname}/postfix-files" } -md5sums=('b7a5c3ccd309156a65d6f8d2683d4fa1' - 'a3c45ff23ef036143711793fcf2478c3' - 'c847b96f08925f08b0f610468a8e21f6') diff --git a/abs/extra/postfix/aliases.patch b/abs/extra/postfix/aliases.patch new file mode 100644 index 0000000..6767870 --- /dev/null +++ b/abs/extra/postfix/aliases.patch @@ -0,0 +1,18 @@ +--- etc/postfix/main.cf.orig 2010-12-13 20:18:22.000000000 +0100 ++++ etc/postfix/main.cf 2010-12-13 20:18:24.000000000 +0100 +@@ -382,6 +382,7 @@ + #alias_maps = hash:/etc/aliases + #alias_maps = hash:/etc/aliases, nis:mail.aliases + #alias_maps = netinfo:/aliases ++alias_maps = hash:/etc/postfix/aliases + + # The alias_database parameter specifies the alias database(s) that + # are built with "newaliases" or "sendmail -bi". This is a separate +@@ -392,6 +393,7 @@ + #alias_database = dbm:/etc/mail/aliases + #alias_database = hash:/etc/aliases + #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases ++alias_database = $alias_maps + + # ADDRESS EXTENSIONS (e.g., user+foo) + # diff --git a/abs/extra/postfix/install b/abs/extra/postfix/install new file mode 100644 index 0000000..c7e06b0 --- /dev/null +++ b/abs/extra/postfix/install @@ -0,0 +1,18 @@ +post_upgrade() { + /usr/lib/postfix/post-install daemon_directory=/usr/lib/postfix command_directory=/usr/bin upgrade-package + chown postfix var/lib/postfix +} + +post_install() { + getent group postdrop &>/dev/null || groupadd -g 75 postdrop >/dev/null + getent group postfix &>/dev/null || groupadd -g 73 postfix >/dev/null + getent passwd postfix &>/dev/null || useradd -u 73 -d /var/spool/postfix -g postfix -s /bin/false postfix >/dev/null + post_upgrade +} + +pre_remove() { + getent passwd postfix &>/dev/null && userdel postfix >/dev/null + getent group postfix &>/dev/null && groupdel postfix >/dev/null + getent group postdrop &>/dev/null && groupdel postdrop >/dev/null + true +} diff --git a/abs/extra/postfix/postfix b/abs/extra/postfix/postfix deleted file mode 100755 index 37dd6a8..0000000 --- a/abs/extra/postfix/postfix +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pgrep -f /usr/lib/postfix/master` - -start() { - stat_busy "Starting Postfix" - [ -z "$PID" ] && /usr/sbin/postfix start &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon postfix - stat_done - fi -} - -stop() { - stat_busy "Stopping Postfix" - [ ! -z "$PID" ] && /usr/sbin/postfix stop &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon postfix - stat_done - fi -} - -reload() { - stat_busy "Reloading Postfix" - [ ! -z "$PID" ] && kill -HUP $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - # calling 'stop' and 'start' without the $0 fails... - $0 stop - $0 start - ;; - reload) - reload - ;; - *) - echo "usage: $0 {start|stop|restart|reload}" -esac -exit 0 diff --git a/abs/extra/postfix/postfix.install b/abs/extra/postfix/postfix.install deleted file mode 100644 index bac3e1d..0000000 --- a/abs/extra/postfix/postfix.install +++ /dev/null @@ -1,38 +0,0 @@ -# arg 1: the new package version -post_install() { - if [ -z "`grep '^postdrop::' /etc/group`" ]; then - groupadd -g 75 postdrop >& /dev/null - fi - if [ -z "`grep '^postfix::' /etc/group`" ]; then - groupadd -g 73 postfix >& /dev/null - fi - if [ -z "`grep '^postfix:' /etc/passwd`" ]; then - useradd -u 73 -d /var/spool/postfix -g postfix -s /bin/false postfix - else - # fix a packaging bug from before (postfix should have no shell) - usermod -s /bin/false postfix - fi - - chown postfix var/spool/postfix/{active,bounce,corrupt,defer,deferred,\ -flush,hold,incoming,private,public,maildrop,trace,saved} - chown postfix var/lib/postfix - chgrp postdrop var/spool/postfix/{public,maildrop} - chgrp postdrop usr/sbin/postqueue - chgrp postdrop usr/sbin/postdrop - chmod g+s usr/sbin/{postqueue,postdrop} - - newaliases -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 -} - -# arg 1: the old package version -pre_remove() { - userdel postfix &> /dev/null - groupdel postfix &> /dev/null - groupdel postdrop &> /dev/null -} diff --git a/abs/extra/postfix/postfix.patch.bz2 b/abs/extra/postfix/postfix.patch.bz2 Binary files differdeleted file mode 100644 index dbc0950..0000000 --- a/abs/extra/postfix/postfix.patch.bz2 +++ /dev/null diff --git a/abs/extra/postfix/service b/abs/extra/postfix/service new file mode 100644 index 0000000..a7cdc53 --- /dev/null +++ b/abs/extra/postfix/service @@ -0,0 +1,14 @@ +[Unit] +Description=Postfix Mail Transport Agent +After=network.target + +[Service] +Type=forking +PIDFile=/var/spool/postfix/pid/master.pid +ExecStart=/usr/bin/postfix start +ExecStop=/usr/bin/postfix stop +ExecReload=/usr/bin/postfix reload +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/abs/extra/pyxdg/PKGBUILD b/abs/extra/pyxdg/PKGBUILD new file mode 100644 index 0000000..f1a4473 --- /dev/null +++ b/abs/extra/pyxdg/PKGBUILD @@ -0,0 +1,33 @@ +# $Id$ +# Maintainer: Hugo Doria <hugo@archlinux.org> +# Contributor: Mario A. Vazquez <mario_vazq@hotmail.com> + +pkgbase=pyxdg +pkgname=('python2-xdg' 'python-xdg') +pkgver=0.25 +pkgrel=1 +pkgdesc="Python library to access freedesktop.org standards" +arch=('any') +url="http://freedesktop.org/Software/pyxdg" +license=("LGPL") +makedepends=('python2') +source=(http://www.freedesktop.org/~takluyver/${pkgbase}-${pkgver}.tar.gz{,.asc}) +sha1sums=('1272ee62b8c3909ac4844a34a95f8b1fb3398af2' + 'b5ec82567cc4d7bcf3a151eaf70c42dd3ed5b194') + +package_python2-xdg() { + depends=('python2') + conflicts=('pyxdg') + provides=('pyxdg') + replaces=('pyxdg') + + cd "${srcdir}/${pkgbase}-${pkgver}" + python2 setup.py install --prefix=/usr --root="${pkgdir}" +} + +package_python-xdg() { + depends=('python2') + + cd "${srcdir}/${pkgbase}-${pkgver}" + python setup.py install --prefix=/usr --root="${pkgdir}" --skip-build --optimize=1 +} diff --git a/abs/extra/pyxdg/__changelog b/abs/extra/pyxdg/__changelog new file mode 100644 index 0000000..9acc2f0 --- /dev/null +++ b/abs/extra/pyxdg/__changelog @@ -0,0 +1 @@ +Remove deps for python and building python pkg. Only build for python2 diff --git a/abs/extra/shellinabox/PKGBUILD b/abs/extra/shellinabox/PKGBUILD new file mode 100644 index 0000000..af3b4be --- /dev/null +++ b/abs/extra/shellinabox/PKGBUILD @@ -0,0 +1,53 @@ +# Contributor: Brian Moore <archlinux@cptl.org> +pkgname=shellinabox +pkgver=2.14 +pkgrel=6 +pkgdesc="A web-based ssh client." +arch=('i686' 'x86_64') +url="http://shellinabox.com/" +license=('GPL2') +depends=('runit-scripts>=8.0-2') +optdepends=('openssh: SSL support') +makedepends=(openssh) +install=shellinaboxd.install +backup=('etc/conf.d/shellinaboxd') +source=("http://shellinabox.googlecode.com/files/$pkgname-$pkgver.tar.gz" "shellinaboxd.rc.d" "shellinaboxd.conf.d" "shellinaboxd.service" + "shellinaboxd.include" "shellinaboxd.gen_light_conf.d") + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" configure +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + + #change default to show onscreen keyboard + sed -i "s/this.softKeyboard = false;/this.softKeyboard = true;/g" ./shellinabox/vt100.js + sed -i "s/this.softKeyboard = false;/this.softKeyboard = true;/g" ./shellinabox/vt100.jspp + + ./configure --prefix=/usr + + make +} +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR=$pkgdir install || return 1 + + install -Dm755 $srcdir/shellinaboxd.rc.d $pkgdir/etc/rc.d/shellinaboxd + install -D -m644 $srcdir/shellinaboxd.service $pkgdir/usr/lib/systemd/system/shellinaboxd.service + install -Dm644 $srcdir/shellinaboxd.conf.d $pkgdir/etc/conf.d/shellinaboxd + install -dm700 -o nobody $pkgdir/var/lib/shellinabox + + #install conf files for lighttpd + mkdir -p ${pkgdir}/etc/lighttpd + install -D -m 644 ${srcdir}/shellinaboxd.include ${pkgdir}/etc/lighttpd/ + #gen_light_conf + install -D -m 744 ${srcdir}/shellinaboxd.gen_light_conf.d ${pkgdir}/etc/gen_light_conf.d/shellinaboxd.conf +} +md5sums=('6c63b52edcebc56ee73a108e7211d174' + 'feea22575089cc7eb4925b1daff88b8c' + '77e487f36da2abe51251500f4a1e024f' + 'be649866d06ba497d88bb14f3e58f862' + 'dd46ab61bfafdb56ea705a876963550e' + 'aadd1edf4110aca2d16d806791e90019') diff --git a/abs/extra/shellinabox/__changelog b/abs/extra/shellinabox/__changelog new file mode 100644 index 0000000..d0d35bb --- /dev/null +++ b/abs/extra/shellinabox/__changelog @@ -0,0 +1,9 @@ +#8/13/2013 +initial inclusion from AUR v2.14-3 +add dep of runit-scripts to PKGBUILD +add shellinaboxd.install + +# 8/14/2013 +add proxy config to PKGBUILD & .install +add shellinaboxd.include and shellinaboxd.gen_light_conf.d +change default onscreen keyboard to true diff --git a/abs/extra/shellinabox/shellinaboxd.conf.d b/abs/extra/shellinabox/shellinaboxd.conf.d new file mode 100644 index 0000000..646bab7 --- /dev/null +++ b/abs/extra/shellinabox/shellinaboxd.conf.d @@ -0,0 +1,5 @@ +# +# Parameters to be passed to shellinaboxd +# +SHELLINABOXD_ARGS="-t -b" + diff --git a/abs/extra/shellinabox/shellinaboxd.gen_light_conf.d b/abs/extra/shellinabox/shellinaboxd.gen_light_conf.d new file mode 100644 index 0000000..5512216 --- /dev/null +++ b/abs/extra/shellinabox/shellinaboxd.gen_light_conf.d @@ -0,0 +1 @@ +include "/etc/lighttpd/shellinaboxd.include" diff --git a/abs/extra/shellinabox/shellinaboxd.include b/abs/extra/shellinabox/shellinaboxd.include new file mode 100644 index 0000000..8d2befa --- /dev/null +++ b/abs/extra/shellinabox/shellinaboxd.include @@ -0,0 +1,7 @@ +#proxy for shellinaboxd +$HTTP["url"] =~ "/shell/" { + proxy.server = ( "" => ( + ("host" => "127.0.0.1", "port" => 4200) + )) +} + diff --git a/abs/extra/shellinabox/shellinaboxd.install b/abs/extra/shellinabox/shellinaboxd.install new file mode 100644 index 0000000..1fb3a79 --- /dev/null +++ b/abs/extra/shellinabox/shellinaboxd.install @@ -0,0 +1,24 @@ +post_install() { + echo "Generate lighttpd include..." + gen_light_include.py + echo "Create link to linhes.pem..." + ln -s /etc/lighttpd/linhes.pem /etc/lighttpd/certificate.pem + echo "Start runit service for shellinaboxd..." + add_service.sh shellinaboxd + /sbin/sv restart shellinaboxd +} + +post_upgrade() { + post_install +} + +post_remove() { + echo "Generate lighttpd include..." + gen_light_include.py + echo "Forcing a re-read of lighttpd's configuration file..." + /sbin/sv hup /service/lighttpd + echo "Remove link to linhes.pem..." + rm /etc/lighttpd/certificate.pem + echo "Remove runit service for shellinaboxd..." + remove_service.sh shellinaboxd +} diff --git a/abs/extra/shellinabox/shellinaboxd.rc.d b/abs/extra/shellinabox/shellinaboxd.rc.d new file mode 100644 index 0000000..3399945 --- /dev/null +++ b/abs/extra/shellinabox/shellinaboxd.rc.d @@ -0,0 +1,38 @@ +#!/bin/bash +. /etc/rc.conf +. /etc/rc.d/functions + +SHELLINABOXD_ARGS= +[ -f /etc/conf.d/shellinaboxd ] && . /etc/conf.d/shellinaboxd + +PID=`pidof -o %PPID /usr/bin/shellinaboxd` +case "$1" in + start) + stat_busy "Starting SHELLINABOXD" + [ -z "$PID" ] && /usr/bin/shellinaboxd ${SHELLINABOXD_ARGS} + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon shellinaboxd + stat_done + fi + ;; + stop) + stat_busy "Stopping SHELLINABOXD" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon shellinboxd + stat_done + fi + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 + diff --git a/abs/extra/shellinabox/shellinaboxd.service b/abs/extra/shellinabox/shellinaboxd.service new file mode 100644 index 0000000..d92065b --- /dev/null +++ b/abs/extra/shellinabox/shellinaboxd.service @@ -0,0 +1,17 @@ +[Unit] +Description=Serve a login-terminal over http on port 4200. +Required=sshd.service +After=sshd.service + +[Service] +User=root +Type=forking +EnvironmentFile=/etc/conf.d/shellinaboxd +ExecStart=/usr/bin/shellinaboxd $SHELLINABOXD_ARGS +ExecReload=/bin/kill -HUP $MAINPID +KillMode=process +Restart=on-abort + +[Install] +WantedBy=multi-user.target + diff --git a/abs/extra/ttf-google-fonts-git/PKGBUILD b/abs/extra/ttf-google-fonts-git/PKGBUILD new file mode 100644 index 0000000..a4e60a2 --- /dev/null +++ b/abs/extra/ttf-google-fonts-git/PKGBUILD @@ -0,0 +1,72 @@ +# Maintainer: Sebastian Stammler <stammler.s@gmail.com> +# +# Now pacman 4.1 ready! +# For improvements/fixes to this package, please send me a +# pull request on github: https://github.com/sebastianst/aur-packages +# +# Contributor: Sarkasper <echo a2FzcGVyLm1lbnRlbkBnbXguY29tCg== | base64 -d> +# Contributor: Daniel Micay <danielmicay@gmail.com> +# Contributor: Michalis Georgiou <mechmg93@gmail.comr> +# Contributor: Alexander De Sousa <archaur.xandy21@spamgourmet.com> + +pkgname=ttf-google-fonts-git +pkgver=20130818 +pkgrel=1 +pkgdesc="Google Fonts catalogue." +arch=('any') +url="https://github.com/w0ng/googlefontdirectory" +license=('various') +depends=('fontconfig' 'xorg-fonts-encodings') +makedepends=(git) +conflicts=('googlefontdirectory' + 'jsmath-fonts' + 'lohit-fonts' + 'oldstand-font' + 'otf-goudy' + 'ttf-andika' + 'ttf-anonymous-pro' + 'ttf-cantarell' + 'ttf-cardo' + 'ttf-chromeos-fonts' + 'ttf-droid' + 'ttf-google-webfonts-hg' + 'ttf-inconsolata' + 'ttf-kimberly_geswein_print' + 'ttf-nova' + 'ttf-oldstandard' + 'ttf-pt-mono' + 'ttf-pt-sans' + 'ttf-ptsans' + 'ttf-roboto' + 'ttf-sil-fonts' + 'ttf-sortsmillgoudy' + 'ttf-source-code-pro' + 'ttf-source-sans-pro' + 'ttf-ubuntu-font-family' + 'ttf-vollkorn' + 'ttf-google-webfonts' + 'ttf-oxygen' + 'ttf-opensans' + 'ttf-medievalsharp' + 'ttf-google-webfonts-git' + 'cantarell-fonts' + 'ttf-comfortaa') +provides=("${conflicts[@]}") +source=("git://github.com/w0ng/googlefontdirectory.git") +md5sums=('SKIP') +install=font.install + +# git variables +_gitname="googlefontdirectory" + +pkgver() { + cd "$srcdir/$_gitname" + git log -1 --format="%cd" --date=short | sed 's|-||g' +} + +package() { + cd "$srcdir" + install -dm755 "$pkgdir/usr/share/fonts/TTF" + find . -type f -name \*.ttf -exec install -Dm644 '{}' \ + "$pkgdir/usr/share/fonts/TTF" \; +} diff --git a/abs/extra/ttf-google-fonts-git/font.install b/abs/extra/ttf-google-fonts-git/font.install new file mode 100644 index 0000000..faf717e --- /dev/null +++ b/abs/extra/ttf-google-fonts-git/font.install @@ -0,0 +1,15 @@ +post_install() { + echo -n "Updating font cache... " + fc-cache -fs > /dev/null + mkfontscale /usr/share/fonts/TTF + mkfontdir /usr/share/fonts/TTF + echo "done" +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install $1 +}
\ No newline at end of file diff --git a/abs/extra/web-on-linhes/PKGBUILD b/abs/extra/web-on-linhes/PKGBUILD index ec7965c..64afe1e 100644 --- a/abs/extra/web-on-linhes/PKGBUILD +++ b/abs/extra/web-on-linhes/PKGBUILD @@ -3,16 +3,16 @@ pkgname=web-on-linhes pkgver=1.00.0 -pkgrel=5 +pkgrel=7 pkgdesc="Added multiple websites with 10' UIs to Play Online Streams." arch=('i686' 'x86_64') license=('GPL2') url="http://www.linhes.org/" -depends=('chromium' 'flashplugin' 'linhes-scripts>=7-29' ) +depends=('google-chrome') install=web-on-linhes.install source=('web-on-linhes.sh' 'web-on-linhes_is.conf') -build() { +package() { cd ${srcdir} install -d ${pkgdir}/usr/LH/bin install -D -m755 *.sh ${pkgdir}/usr/LH/bin diff --git a/abs/extra/xbmc/PKGBUILD b/abs/extra/xbmc/PKGBUILD index ecd7fb9..e496886 100644 --- a/abs/extra/xbmc/PKGBUILD +++ b/abs/extra/xbmc/PKGBUILD @@ -8,32 +8,36 @@ _prefix=/usr pkgname=xbmc -pkgver=11.0 -pkgrel=9 +pkgver=12.2 +pkgrel=6 pkgdesc="A software media player and entertainment hub for digital media" arch=('i686' 'x86_64') url="http://xbmc.org" license=('GPL' 'custom') -depends=('hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva' 'libpng' 'libcdio' 'yajl' 'libmysqlclient' 'libjpeg' 'libsamplerate' 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2' 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos' 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez' 'linhes-scripts>=7-31') -makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'vdpau-video' 'libcec' 'udisks' 'upower' 'bluez') -optdepends=( - 'libcec: support for Pulse-Eight USB-CEC adapter' - 'vdpau-video: accelerated video playback for nvidia cards' - 'xvba-video: accelerated video playback for amd cards' - 'lirc: remote controller support' - 'udisks: automount external drives' - 'upower: used to trigger suspend functionality' - 'unrar: access compressed files without unpacking them' -) +depends=('hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva' + 'libpng' 'libcdio' 'yajl' 'libmysqlclient' 'libjpeg-turbo' 'libsamplerate' + 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2' + 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos' + 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez-libs' 'glu' + 'tinyxml' 'taglib') +makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libcec' + 'udisks' 'upower' 'mesa' 'doxygen' 'swig' 'java-environment') +optdepends=('libcec: support for Pulse-Eight USB-CEC adapter' + 'lirc: remote controller support' + 'udisks: automount external drives' + 'upower: used to trigger suspend functionality' + 'unrar: access compressed files without unpacking them' + 'xorg-xinit: autostart xbmc') install="${pkgname}.install" -source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz" 'xbmc11.patch' 'xbmc.sh' 'xbmc_lib.conf') +source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz" + "xbmc.service" "xbmc.sh" "xbmc_lib.conf") build() { cd "${srcdir}/xbmc-$pkgver" - patch -p1 < ../xbmc11.patch # fix lsb_release dependency sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp +# sed -i -e 's:#include <libsmbclient.h>:#include <samba-4.0/libsmbclient.h>:' xbmc/filesystem/{SmbFile,SMBDirectory}.cpp # Bootstrapping XBMC ./bootstrap @@ -41,7 +45,7 @@ build() { # Configuring XBMC export PYTHON_VERSION=2 # external python v2 ./configure --prefix=$_prefix --exec-prefix=$_prefix \ - --enable-debug \ + --disable-debug \ --enable-optimizations \ --enable-gl \ --enable-sdl \ @@ -71,8 +75,7 @@ build() { --enable-libusb \ --enable-libcec \ --enable-external-libraries \ - --disable-external-ffmpeg \ - --disable-crystalhd + --disable-external-ffmpeg # Now (finally) build make } @@ -99,14 +102,17 @@ package() { mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${pkgname}" done + # LinHES stuff mkdir -p ${pkgdir}/usr/LH/bin install -D -m 0755 ${srcdir}/xbmc.sh ${pkgdir}/usr/LH/bin #add in xbmc_lib.conf install -D -m0744 ${srcdir}/xbmc_lib.conf ${pkgdir}/etc/gen_lib_xml.d/xbmc_lib.conf + # systemd stuff + install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service } # vim:set ts=2 sw=2 et: -md5sums=('9e8a26ee25173c7268abea7f1d82d428' - '5aa2e21a1f9fea60a2e5bb345e5aefd0' +md5sums=('489f3877decae4e265ece54f9eaef0ba' + '76fae229ebc3bcfaab7e7f27e4fb51f5' 'e48a3d87984669ef206e902bc8290ff9' - '6c4ab6c8a5ef748786c7602bb2a9ef99') + '8c5cd1b5e7660a49ccd2f99967180a82') diff --git a/abs/extra/xbmc/xbmc.install b/abs/extra/xbmc/xbmc.install index 46ac150..6490483 100644 --- a/abs/extra/xbmc/xbmc.install +++ b/abs/extra/xbmc/xbmc.install @@ -1,29 +1,17 @@ post_install() { - gen_lib_xml.py - echo ">> If XBMC won't start, but just segfaults, double check your X.Org config." - echo ">> The display depth has to be at least 24-bit, ie" - echo ">> set \"DefaultDepth 24\" under the \"Screen\" section of your xorg.conf file." - echo ">> If you have problems or suggestions for this PKGBUILD, have a look at its" - echo ">> dedicated forum thread: http://bbs.archlinux.org/viewtopic.php?pid=559107" - echo ">> or the wiki: http://xbmc.org/wiki/?title=XBMC_on_Arch_Linux_(Unofficial)." - echo ">> Note that this is a development version of XBMC." - echo ">> If you encounter problems with XBMC don't forget to consult the official" - echo ">> xbmc forums found here: http://forum.xbmc.org " - echo ">> and report bugs to the xbmc bugtracker found here: http://trac.xbmc.org." - echo - - [[ $(type -p gtk-update-icon-cache) ]] && /usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor - [[ $(type -p update-desktop-database) ]] && /usr/bin/update-desktop-database -q usr/share/applications + [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor + [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications + getent group xbmc > /dev/null || groupadd xbmc + getent passwd xbmc > /dev/null || useradd -m -d /var/lib/xbmc -g xbmc xbmc + usermod -a -G xbmc,audio,video,power,network,optical,storage,disk xbmc + gen_lib_xml.py } post_upgrade() { - gen_lib_xml.py - [[ $(type -p gtk-update-icon-cache) ]] && /usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor - [[ $(type -p update-desktop-database) ]] && /usr/bin/update-desktop-database -q usr/share/applications + post_install $1 } post_remove() { - [[ $(type -p gtk-update-icon-cache) ]] && /usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor - [[ $(type -p update-desktop-database) ]] && /usr/bin/update-desktop-database -q usr/share/applications - gen_lib_xml.py + post_install $1 + echo "You may want to remove xbmc user and group" } diff --git a/abs/extra/xbmc/xbmc.service b/abs/extra/xbmc/xbmc.service new file mode 100644 index 0000000..431582f --- /dev/null +++ b/abs/extra/xbmc/xbmc.service @@ -0,0 +1,13 @@ +[Unit] +Description = Starts instance of XBMC using xinit +After = remote-fs.target + +[Service] +User = xbmc +Group = xbmc +Type = simple +ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -- :0 -nolisten tcp +Restart = always + +[Install] +WantedBy = multi-user.target diff --git a/abs/extra/xbmc/xbmc11.patch b/abs/extra/xbmc/xbmc11.patch deleted file mode 100644 index fb144d1..0000000 --- a/abs/extra/xbmc/xbmc11.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ruaN xbmc-11.0.orig//xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp xbmc-11.0/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp ---- xbmc-11.0.orig//xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp 2012-03-21 22:07:50.000000000 +0000 -+++ xbmc-11.0/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp 2012-04-08 21:04:19.000000000 +0000 -@@ -22,9 +22,9 @@ - #if (defined HAVE_CONFIG_H) && (!defined WIN32) - #include "config.h" - #endif --#ifdef _WIN32 -+//#ifdef _WIN32 - #include "system.h" // just for HAS_LIBRTMP --#endif -+//#endif - - #ifdef HAS_LIBRTMP - #include "settings/AdvancedSettings.h" diff --git a/abs/extra/xbmc/xbmc_lib.conf b/abs/extra/xbmc/xbmc_lib.conf index df88abb..2dbb10f 100644 --- a/abs/extra/xbmc/xbmc_lib.conf +++ b/abs/extra/xbmc/xbmc_lib.conf @@ -2,7 +2,7 @@ <button> <type>MENU_XBMC</type> <text>Launch XBMC</text> - <action>EXEC /usr/bin/xbmc</action> + <action>EXEC /usr/LH/bin/xbmc.sh</action> </button> <!--#XBMC--> |