diff options
Diffstat (limited to 'libre')
-rw-r--r-- | libre/kdebase-konqueror-libre/PKGBUILD | 6 | ||||
-rw-r--r-- | libre/kdebase-runtime-libre/PKGBUILD | 6 | ||||
-rw-r--r-- | libre/kdelibs-libre/PKGBUILD | 25 | ||||
-rw-r--r-- | libre/kdenetwork-kopete-libre/PKGBUILD | 10 | ||||
-rw-r--r-- | libre/kdepim-libre/PKGBUILD | 8 | ||||
-rw-r--r-- | libre/kdeutils-ark-libre/PKGBUILD | 6 | ||||
-rw-r--r-- | libre/libretools/PKGBUILD | 60 | ||||
-rw-r--r-- | libre/libretools/libretools.install | 32 | ||||
-rw-r--r-- | libre/linux-libre-kmod-alx/PKGBUILD | 4 | ||||
-rw-r--r-- | libre/linux-libre-lts-kmod-alx/PKGBUILD | 4 | ||||
-rw-r--r-- | libre/linux-libre-lts/PKGBUILD | 16 | ||||
-rw-r--r-- | libre/linux-libre-lts/linux-libre-lts.install | 2 | ||||
-rw-r--r-- | libre/linux-libre/PKGBUILD | 16 | ||||
-rw-r--r-- | libre/linux-libre/linux-libre.install | 2 | ||||
-rw-r--r-- | libre/ronn/PKGBUILD | 32 | ||||
-rw-r--r-- | libre/ruby-hpricot/PKGBUILD | 25 | ||||
-rw-r--r-- | libre/ruby-mustache/PKGBUILD | 31 | ||||
-rw-r--r-- | libre/ruby-rdiscount/PKGBUILD | 38 | ||||
-rw-r--r-- | libre/sh-roundup/PKGBUILD | 44 | ||||
-rw-r--r-- | libre/sh-roundup/makefile-fix.patch | 11 | ||||
-rw-r--r-- | libre/syslinux/PKGBUILD | 8 | ||||
-rw-r--r-- | libre/syslinux/syslinux-install_update | 2 |
22 files changed, 299 insertions, 89 deletions
diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD index 62bca0307..d5a72e95c 100644 --- a/libre/kdebase-konqueror-libre/PKGBUILD +++ b/libre/kdebase-konqueror-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184487 2013-05-07 13:27:00Z andrea $ +# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu> @@ -6,7 +6,7 @@ _pkgname='kdebase-konqueror' pkgname='kdebase-konqueror-libre' -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://kde.org/applications/internet/konqueror/" @@ -15,7 +15,7 @@ groups=('kde' 'kdebase') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'nepomuk-widgets') source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz" "konq-about-fsdg.diff") -sha1sums=('c9949ef6dafbc567bb3f088bf9e156c3a5a9ec08' +sha1sums=('5465fffdaea70a5ca225283f45b9504775d0432d' 'd6cbb53c04179b8180f9439eca156b7ff2e76b3a') pkgdesc='KDE File Manager & Web Browser, without Google and nonfree software recommendation' depends=('kdebase-dolphin' 'kdebase-keditbookmarks') diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD index 6d3291252..4b6f40af9 100644 --- a/libre/kdebase-runtime-libre/PKGBUILD +++ b/libre/kdebase-runtime-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184473 2013-05-07 13:26:42Z andrea $ +# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdebase-runtime pkgname=kdebase-runtime-libre -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers" arch=('i686' 'x86_64' 'mips64el') @@ -26,7 +26,7 @@ install="${_pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz" 'duckduckgo_html.desktop' 'duckduckgo_lite.desktop') -sha1sums=('22869b2ee7eb4b5b341a6d596dd904c0b0b812d1' +sha1sums=('f406c8c9e42c2508a7acf88b9719f5fa5b4683a1' 'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd' 'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b') diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 96c8530a3..ea698dfd7 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 185044 2013-05-10 17:08:02Z andrea $ +# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdelibs pkgname=kdelibs-libre -pkgver=4.10.3 -pkgrel=3 +pkgver=4.10.4 +pkgrel=1 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdelibs' @@ -23,31 +23,24 @@ conflicts=('kdelibs') install=${_pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kde-applications-menu.patch' 'qt4.patch' - 'security-fix.patch' 'fix-xfreepixmap-call.patch' 'khtml-fsdg.diff') -sha1sums=('aa154998e227121be82f5b04442e908e7dece01b' +sha1sums=('b5db1b91bd96b44ebd1b5e71019bb95b59775237' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' 'ed1f57ee661e5c7440efcaba7e51d2554709701c' - '506562009a667f18481be0d2c5035b181fce38bb' - '556c5473219d8208ec920f46c08bf61fda5b60d9' 'a1502a964081ad583a00cf90c56e74bf60121830') -build() { - cd ${_pkgname}-${pkgver} +prepare() { + cd "${srcdir}"/${_pkgname}-${pkgver} # avoid file conflict with gnome-menus patch -p1 -i "${srcdir}"/kde-applications-menu.patch # qmake refers to Qt5 patch -p1 -i "${srcdir}"/qt4.patch # Don't ask the user to download a plugin, it's probably nonfree. patch -p1 -i "${srcdir}"/khtml-fsdg.diff +} - # KDEBUG#319428 - patch -p1 -i "${srcdir}"/security-fix.patch - # KDEBUG#319137 - patch -p1 -i "${srcdir}"/fix-xfreepixmap-call.patch - - cd ../ - +build() { + cd "${srcdir}" mkdir build cd build cmake ../${_pkgname}-${pkgver} \ diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD index 463f69c88..819bb02ce 100644 --- a/libre/kdenetwork-kopete-libre/PKGBUILD +++ b/libre/kdenetwork-kopete-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184589 2013-05-07 13:30:07Z andrea $ +# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgbase=kdenetwork pkgname=('kdenetwork-kopete-libre') -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -17,10 +17,10 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp' 'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'use-libotr3.patch') -sha1sums=('9c5e14b1ebc575777d1e6d09b593f62940a4fd1d' +sha1sums=('891277c8dcbf231452947e9b4c54324bad35fd1a' '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384') -build() { +prepare() { cd ${pkgbase}-${pkgver} patch -p1 -i "${srcdir}"/use-libotr3.patch cd ../ @@ -28,7 +28,9 @@ build() { sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' "${pkgbase}-${pkgver}/kopete/protocols/CMakeLists.txt" rm -rf "${pkgbase}-${pkgver}/kopete/protocols/skype" sed 's/, Skype//' -i "${pkgbase}-${pkgver}/doc/kopete/index.docbook" +} +build() { mkdir build cd build cmake ../${pkgbase}-${pkgver} \ diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD index 7ed1b1a01..007ed7f74 100644 --- a/libre/kdepim-libre/PKGBUILD +++ b/libre/kdepim-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185074 2013-05-10 20:52:59Z tomegun $ +# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -22,8 +22,8 @@ pkgname=('kdepim-akonadiconsole-libre' 'kdepim-ktimetracker-libre' 'kdepim-ktnef-libre' 'kdepim-libkdepim-libre') -pkgver=4.10.3 -pkgrel=2 +pkgver=4.10.4 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -31,7 +31,7 @@ groups=('kde' 'kdepim-libre') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'kde-agent' 'nepomuk-widgets') source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz") -sha1sums=('78ca9b822f905355ec00142a7de6c08c38b97c08') +sha1sums=('b1b8bdefd8a7b21c3a4518285ef8fd73890e8cf3') build() { mkdir build diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD index 90921bb7d..6b7a264ae 100644 --- a/libre/kdeutils-ark-libre/PKGBUILD +++ b/libre/kdeutils-ark-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184594 2013-05-07 13:30:17Z andrea $ +# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdeutils-ark pkgname=kdeutils-ark-libre -pkgver=4.10.3 +pkgver=4.10.4 pkgrel=1 pkgdesc='Archiving Tool, with unar support' url='http://kde.org/applications/utilities/ark/' @@ -20,7 +20,7 @@ replaces=('kdeutils-ark') conflicts=('kdeutils-ark') source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz" 'ark-unar-06.patch') -sha1sums=('26437751ddf6f466a948a402f253f66bfc19660e' +sha1sums=('3b98f04817a31b14b8899ddf024b03ff14420ea7' 'a0a836950f185d9b2245204579f969203036fdec') build() { diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index 815f28b96..29fedec00 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -5,38 +5,64 @@ pkgbase=libretools pkgname=(libretools libretools-mips64el) -pkgver=20130117 pkgdesc="Programs for Parabola development" -url="https://projects.parabolagnulinux.org/libretools.git/" -license=('GPL3+' 'GPL2') +url="https://projects.parabolagnulinux.org/packages/libretools.git/" +license=('GPL3' 'GPL2') -pkgrel=4 +pkgver=20130608 +_libretools_commit=9fc855b9c4af0e372fa50e1da1ec26d4f2fc5661 +_devtools_commit=bf8513ae631484a0c292ad085ea7ede9859f8e0f + +_packages_url=https://projects.parabolagnulinux.org/packages +source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2 + $_packages_url/devtools-par.git/snapshot/devtools-par-$_devtools_commit.tar.bz2) + +pkgrel=1 arch=('any') -groups=(base-devel) -depends=(openssh rsync git wget tokyocabinet) -conflicts=(chroottools devtools libretools-legacy) -source=(https://projects.parabolagnulinux.org/$pkgbase.git/snapshot/$pkgbase-$pkgver.tar) +makedepends=(emacs) # emacs --batch is used during the build to process text +checkdepends=(sh-roundup) build() { - cd "$srcdir/$pkgbase-$pkgver" - make + cd "$srcdir" + ln -sf devtools-par-$_devtools_commit devtools-par + cd "$srcdir/$pkgbase-$_libretools_commit" + make build-libretools build-libretools-mips64el build-doc +} + +check() { + cd "$srcdir/$pkgbase-$_libretools_commit" + + make check TESTENVFLAGS='--no-network --no-sudo' } package_libretools() { - backup=(etc/libretools.conf etc/libretools.d/chroot.conf) + backup=(etc/libretools.conf etc/libretools.d/chroot.conf etc/libretools.d/librefetch.conf) install=libretools.install + replaces=(chroottools) + conflicts=(devtools) + + depends=( + arch-install-scripts # `archroot` uses `pacstrap` + git # `createworkdir` (also mips-add in -mips64el) + openssh # `librerelease` + rsync # `librerelease` and `makechrootpkg.sh` + subversion # `diff-unfree` + tokyocabinet # `treepkg` + wget # `aur` and `lib/blacklist.sh` + ) + optdepends=('namcap: to check package files') - cd "$srcdir/$pkgbase-$pkgver" - make install-libretools DESTDIR="$pkgdir" - install -Dm755 rePKGBUILD.proto ${pkgdir}/usr/share/pacman/rePKGBUILD.proto + cd "$srcdir/$pkgbase-$_libretools_commit" + make install-libretools install-doc DESTDIR="$pkgdir" } package_libretools-mips64el() { pkgdesc="Scripts for Parabola development (for mips64el architecture)" - backup=('etc/libretools.d/mips64el.conf') + depends=("$pkgbase=$pkgver") - cd "$srcdir/$pkgbase-$pkgver" + cd "$srcdir/$pkgbase-$_libretools_commit" make install-libretools-mips64el DESTDIR="$pkgdir" } -md5sums=('77dcfb2fbf5b8a9894a13c5e6151b693') +md5sums=('5de4fdcc9db5e6f52915b6a721cadb37' + 'b28b1492fda205be7c577fc03cbc3399') diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install index 50f03ee88..ff6a238fe 100644 --- a/libre/libretools/libretools.install +++ b/libre/libretools/libretools.install @@ -1,26 +1,28 @@ #!/bin/sh +_makepkgconf_append='[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=("libre::/usr/bin/librefetch -p \"\$BUILDFILE\" %u %o")' + # arg 1: the new package version post_install() { - cat <<EOF -Please check https://wiki.parabolagnulinux.org/Package_maintainer_guide -and follow instructions there before using libretools. - -If you plan using fullpkg you should read https://wiki.parabolagnulinux.org/fullpkg -and install libretools-\$arch if avaliable - -EOF + if grep -q 'libre::' etc/makepkg.conf; then + libremessages msg2 "libretools: librefetch is already in /etc/makepkg.conf" + else + libremessages msg2 "libretools: Adding librefetch to /etc/makepkg.conf" + printf '%s\n' "$_makepkgconf_append" >> etc/makepkg.conf + fi } ## arg 1: the new package version ## arg 2: the old package version post_upgrade() { - cat <<EOF -Check your /etc/libretools.conf, it has changed substantially. - -If using fullpkg, you should install libretools-\$arch if avaliable - -EOF + post_install } -# vim:set ts=2 sw=2 et: +pre_remove() { + if fgrep -q "$_makepkgconf_append" etc/makepkg.conf; then + libremessages msg2 "libretools: removing librefetch from /etc/makepkg.conf" + sed -i '/libre::/d' + else + libremessages msg2 "libretools: librefetch is not in /etc/makepkg.conf as we added it" + fi +} diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index ec385c23a..e99585dd2 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.9.4 +_kernver=3.9.5 _kernrel=1 pkgname=('linux-libre-kmod-alx') _version=v3.9-rc4 _pkgver=3.9-rc4-2-su pkgver=3.9rc4.2 -pkgrel=5 +pkgrel=6 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 7c3e3ad47..09e07891d 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.0.80 +_kernver=3.0.81 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _version=v3.9-rc4 _pkgver=3.9-rc4-2-su pkgver=3.9rc4.2 -pkgrel=4 +pkgrel=5 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index baab66b5c..0e35aa970 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186439 2013-05-26 15:23:17Z tpowa $ +# $Id: PKGBUILD 188071 2013-06-08 08:49:41Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -7,7 +7,7 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=80 +_sublevel=81 pkgver=${_basekernel}.${_sublevel} pkgrel=1 _lxopkgver=${_basekernel}.80 # nearly always the same as pkgver @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu1_0loongsonlibre_mipsel.tar.bz2") md5sums=('f30a562307b6f71204370fcd33756466' - '6dfc33fc2587b36e2bf61ff1b26584c2' + '6538b7cc875c6960d47a8894a3dfea9d' 'fe0e9b4415b82f306fc1b63eb9a742a4' '69a689019ea0b6ed46b387907f14bc8a' 'c072b17032e80debc6a8626299245d46' @@ -204,14 +204,18 @@ _package() { # add vmlinux install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux" - # install fallback mkinitcpio.conf file and preset file for kernel - install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" # set correct depmod command for install + cp -f "${startdir}/${install}" "${startdir}/${install}.pkg" + true && install=${install}.pkg sed \ -e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \ -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \ - -i "${startdir}/${pkgbase}.install" + -i "${startdir}/${install}" + + # install fallback mkinitcpio.conf file and preset file for kernel + install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" + sed \ -e "1s|'linux*.*'|'${pkgbase}'|" \ -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \ diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index 3c8ebbdae..d0d47c6a0 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.80-1-LIBRE-LTS +KERNEL_VERSION= # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 76c1908f7..89f6a9178 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186437 2013-05-26 15:22:24Z tpowa $ +# $Id: PKGBUILD 188067 2013-06-08 08:17:48Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar> @@ -10,7 +10,7 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.9 -_sublevel=4 +_sublevel=5 pkgver=${_basekernel}.${_sublevel} pkgrel=1 _lxopkgver=${_basekernel}.4 # nearly always the same as pkgver @@ -31,7 +31,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('120df29f88622dabf7015a22c7cc8e25' - 'ae8a4997bfa4a6b9acfd0cefbb6e9aa0' + '558743403ba219c51570d29e03d362d5' 'b0bc969b9e8c1767b16cdc0504a7bad7' '42dfd3a3702433b68c079d6b3fd13c3c' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -181,14 +181,16 @@ _package() { # add vmlinux install -D -m644 vmlinux "${pkgdir}/usr/src/linux-${_kernver}/vmlinux" - # install fallback mkinitcpio.conf file and preset file for kernel - install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" - # set correct depmod command for install + cp -f "${startdir}/${install}" "${startdir}/${install}.pkg" + true && install=${install}.pkg sed \ -e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \ -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \ - -i "${startdir}/${pkgbase}.install" + -i "${startdir}/${install}" + + # install mkinitcpio preset file for kernel + install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" sed \ -e "1s|'linux*.*'|'${pkgbase}'|" \ -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \ diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 619ad6090..3f5daa725 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.9.4-1-LIBRE +KERNEL_VERSION= # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/ronn/PKGBUILD b/libre/ronn/PKGBUILD new file mode 100644 index 000000000..4bd097048 --- /dev/null +++ b/libre/ronn/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net + +_gemname=ronn +pkgname=$_gemname +pkgver=0.7.3 +pkgdesc="The opposite of roff; manual authoring tool" +url="http://rtomayko.github.io/ronn/" +license=('custom:MIT') + +provides=(ruby-$_gemname=$pkgver) + +pkgrel=4 +arch=('any') +depends=('ruby' 'ruby-hpricot' 'ruby-rdiscount' 'ruby-mustache') +makedepends=('rubygems') +source=(http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem) +noextract=($_gemname-$pkgver.gem) +md5sums=('c5aa4ef58d35d0cc635b769281e03225') + +package() { + cd "$srcdir" + local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" + gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" \ + "$_gemname-$pkgver.gem" + + install -Dm644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/COPYING \ + "$pkgdir"/usr/share/licenses/$pkgname/COPYING + shopt -s nullglob + for file in "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/man/*.{1..8}; do + install -Dm644 "$file" "$pkgdir"/usr/share/man/man${file##*.}/${file##*/} + done +} diff --git a/libre/ruby-hpricot/PKGBUILD b/libre/ruby-hpricot/PKGBUILD new file mode 100644 index 000000000..ad9aefc36 --- /dev/null +++ b/libre/ruby-hpricot/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net + +_gemname=hpricot +pkgname=ruby-$_gemname +pkgver=0.8.6 +pkgdesc="_why's old HTML parser" +url="http://github.com/hpricot/hpricot" +license=('custom:MIT') + +pkgrel=1 +arch=('i686' 'x86_64') +depends=('ruby') +makedepends=('rubygems') +source=(http://rubygems.org/downloads/${_gemname}-${pkgver}.gem) +noextract=(${_gemname}-${pkgver}.gem) +md5sums=('b0f1f02448037f4f6243c33d5f818fa4') + +package() { + cd "${srcdir}" + local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" + gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" \ + "$_gemname-$pkgver.gem" + install -Dm644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/COPYING \ + "$pkgdir"/usr/share/licenses/$pkgname/COPYING +} diff --git a/libre/ruby-mustache/PKGBUILD b/libre/ruby-mustache/PKGBUILD new file mode 100644 index 000000000..d7090cc0d --- /dev/null +++ b/libre/ruby-mustache/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> +# Maintainer (AUR): David Campbell <davekong@archlinux.us> + +_gemname=mustache +pkgname=ruby-$_gemname +pkgver=0.99.4 +pkgdesc="A framework-agnostic way to render logic-free views." +url="http://mustache.github.io/" +license=('custom:MIT') + +pkgrel=3 +arch=('any') +depends=('ruby>=2') +makedepends=('rubygems') +source=("http://gems.rubyforge.org/gems/mustache-${pkgver}.gem") +md5sums=('650194ec2c166feb087377647414b9dc') +noextract=($_gemname-$pkgver.gem) + +package() { + cd "${srcdir}" + local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" + gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" \ + "$_gemname-$pkgver.gem" + + install -Dm644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/LICENSE \ + "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + shopt -s nullglob + for file in "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/man/*.{1..8}; do + install -Dm644 "$file" "$pkgdir"/usr/share/man/man${file##*.}/${file##*/} + done +} diff --git a/libre/ruby-rdiscount/PKGBUILD b/libre/ruby-rdiscount/PKGBUILD new file mode 100644 index 000000000..76e4b58bd --- /dev/null +++ b/libre/ruby-rdiscount/PKGBUILD @@ -0,0 +1,38 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net +# Maintainer (AUR): Alexsandr Pavlov <kidoz at mail dot ru> +# Contributor: Massimiliano Torromeo <massimiliano.torromeo at gmail dot com> + +_gemname=rdiscount +pkgname=ruby-$_gemname +pkgver=1.6.5 +pkgdesc="C implementation of John Gruber's Markdown." +url="http://dafoster.net/projects/rdiscount/" + +# About the license: It is a 4-clause BSD license with the 3rd clause modified +# to mention documentation instead of advertising. Not to be confused with +# "Modified BSD", which the FSF uses to refer to a 3-clause BSD license +# (dropping the 3rd clause). Because of the way it is modified, it doesn't have +# the problems normally associated with the 4-clause BSD license. +license=('custom:modified-BSD4') + +pkgrel=2 +arch=('i686' 'x86_64') +depends=('ruby') +makedepends=('rubygems') +source=(http://rubygems.org/downloads/$_gemname-$pkgver.gem) +noextract=($_gemname-$pkgver.gem) +md5sums=('2de321f1ba826f80b84fe45c0d013fcf') + +package() { + cd "${srcdir}" + local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" + gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" \ + "$_gemname-$pkgver.gem" + + install -Dm644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/COPYING \ + "$pkgdir"/usr/share/licenses/$pkgname/COPYING + shopt -s nullglob + for file in "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/man/*.{1..8}; do + install -Dm644 "$file" "$pkgdir"/usr/share/man/man${file##*.}/${file##*/} + done +} diff --git a/libre/sh-roundup/PKGBUILD b/libre/sh-roundup/PKGBUILD new file mode 100644 index 000000000..7c17669d3 --- /dev/null +++ b/libre/sh-roundup/PKGBUILD @@ -0,0 +1,44 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net + +pkgname=sh-roundup +pkgver=0.0.5.git17 +_gitver='commit=695ae7609353a360556e1f465ac81ce447235179' + +pkgdesc='A unit testing framework for POSIX shell' +license=("custom:MIT") +url="http://bmizerany.github.io/roundup/" + +pkgrel=1 +arch=('any') +depends=(sh) +makedepends=(ronn) + +source=("libre://$pkgname-$pkgver.tar.gz" 'makefile-fix.patch') +md5sums=('8b1f85316d178eb9e809e168f52d0f2d' + '9efcd83d666c1e84302fe611610c60fa') + +mksource=("git://github.com/bmizerany/roundup.git#${_gitver}") +mkmd5sums=('SKIP') +mksource() { + cd "$srcdir" + rm -rf $pkgname-* + mv roundup $pkgname-$pkgver +} + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + patch -i ../makefile-fix.patch Makefile +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix="$pkgdir"/usr + make -j1 build man +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make -j1 install install-man + install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING +} + diff --git a/libre/sh-roundup/makefile-fix.patch b/libre/sh-roundup/makefile-fix.patch new file mode 100644 index 000000000..b97bebf23 --- /dev/null +++ b/libre/sh-roundup/makefile-fix.patch @@ -0,0 +1,11 @@ +--- Makefile.orig ++++ Makefile +@@ -79,7 +79,7 @@ + chmod 0755 $(bindir)/roundup + + install-man: man +- -for i in {1..9} ; do cp *.$$i $(mandir)/man$$i 2>/dev/null ; done ++ shopt -s nullglob; for file in *.{1..9}; do install -Dm644 $$file $(mandir)/man$${file##*.}/$${file##*/}; done + + .PHONY: pages + pages : doc diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD index d23deae0a..f9907d3f4 100644 --- a/libre/syslinux/PKGBUILD +++ b/libre/syslinux/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 185894 2013-05-19 17:17:51Z tpowa $ +# $Id: PKGBUILD 187808 2013-06-06 07:51:31Z tpowa $ # Maintainer: Thomas Bächler <thomas@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgname=syslinux -pkgver=5.01 -pkgrel=4 +pkgver=5.10 +pkgrel=3 arch=('i686' 'x86_64') pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)" url="http://www.syslinux.org" @@ -25,7 +25,7 @@ source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.t syslinux.cfg syslinux-install_update splash.png) -md5sums=('6c21244277fa4e444967ba45469de863' +md5sums=('8f51d6a5d2730f534ba90e71f3347bff' '25af85a05e7b212b7fb8b7587175e492' 'e5a69630e3f7083aad2d14362b6117b3' '4450792e13a0270c1b89bb6a66ce2fbc' diff --git a/libre/syslinux/syslinux-install_update b/libre/syslinux/syslinux-install_update index 6d52f7703..47d4d88be 100644 --- a/libre/syslinux/syslinux-install_update +++ b/libre/syslinux/syslinux-install_update @@ -334,7 +334,7 @@ _install() { update() { # Update c32 files in /boot, if /boot is not on same fs if [[ "$boot" = boot ]]; then - for file in "$bootpath"/*.{c32}; do + for file in "$bootpath"/*.c32; do file=${file##*/} cp "$libpath/$file" "$bootpath/$file" &> /dev/null done |