diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-08-04 10:41:31 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-08-04 10:41:31 +0200 |
commit | b796bed39624486a348d1cb2881c5a1e88f84954 (patch) | |
tree | 74f89104c89a9440733cc08bfde1c17efe2bd3db | |
parent | 589a2311981a3552f48d4c9001be0cb5a06563a9 (diff) | |
parent | f8ac5d4703080cc87ba2fe36f68df745d3a5f62f (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/kphotoalbum/PKGBUILD
community-testing/libextractor/PKGBUILD
community/mplayer2/PKGBUILD
community/preload/PKGBUILD
community/python2-pymongo/PKGBUILD
extra/virtuoso/PKGBUILD
testing/calligra/PKGBUILD
testing/hugin/PKGBUILD
testing/kdebase-runtime/PKGBUILD
testing/kdegraphics-gwenview/PKGBUILD
testing/kdepim-runtime/PKGBUILD
testing/libkexiv2/PKGBUILD
37 files changed, 513 insertions, 171 deletions
diff --git a/community/guake/PKGBUILD b/community/guake/PKGBUILD index 6f33d50f8..a607444d4 100644 --- a/community/guake/PKGBUILD +++ b/community/guake/PKGBUILD @@ -1,25 +1,23 @@ -# $Id: PKGBUILD 72161 2012-06-09 09:50:29Z bgyorgy $ +# $Id: PKGBUILD 74682 2012-08-02 06:19:50Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Wilson Pinto Júnior (N3RD3X) <n3rd3x@linuxmail.org> pkgname=guake -pkgver=0.4.3 +pkgver=0.4.4 pkgrel=1 pkgdesc='Drop-down terminal for GNOME' arch=('i686' 'x86_64' 'mips64el') url="http://guake.org/" license=('GPL') -depends=('python-notify' 'vte' 'python2-gconf' 'dbus-python' 'pyxdg') +depends=('python-notify' 'vte' 'python2-gconf' 'python2-dbus' 'python2-xdg' 'hicolor-icon-theme' 'xdg-utils') makedepends=('intltool') options=('!libtool') install=$pkgname.install source=(http://guake.org/files/$pkgname-$pkgver.tar.gz - guake-fix-notification.patch - guake-fix-pref.desktop.patch) -md5sums=('951e42f3c6b24912baab2f4f6c84e658' - '0b57227e6869dd84dd4fb0794ed0d082' - '0e042a6ac89f5e77c45a96c42494bc3d') + guake-fix-notification.patch) +md5sums=('532adada29b8f0bb79dc15904aa6b70c' + '0b57227e6869dd84dd4fb0794ed0d082') build() { cd "$srcdir/$pkgname-$pkgver" @@ -29,12 +27,6 @@ build() { # http://guake.org/ticket/416 patch -Np1 -i "$srcdir/guake-fix-notification.patch" - # http://guake.org/ticket/448 - patch -Np1 -i "$srcdir/guake-fix-pref.desktop.patch" - - # Do not disable autostart in GNOME - sed -i '/X-GNOME-Autostart-enabled/ d' data/guake.desktop.in - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --disable-schemas-install \ --with-gconf-schema-file-dir=/usr/share/gconf/schemas \ @@ -46,7 +38,4 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install - - # Remove autostart file - rm -r "$pkgdir/etc" } diff --git a/community/guake/guake.install b/community/guake/guake.install index 1e828c86b..8084333b1 100755 --- a/community/guake/guake.install +++ b/community/guake/guake.install @@ -2,6 +2,7 @@ pkgname=guake post_install() { usr/sbin/gconfpkg --install ${pkgname} + xdg-icon-resource forceupdate } pre_upgrade() { @@ -15,3 +16,7 @@ post_upgrade() { pre_remove() { usr/sbin/gconfpkg --uninstall ${pkgname} } + +post_remove() { + xdg-icon-resource forceupdate +} diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD index 2ee152337..1e39fe06c 100644 --- a/community/lxdm/PKGBUILD +++ b/community/lxdm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 72998 2012-06-27 05:02:11Z bpiotrowski $ +# $Id: PKGBUILD 74705 2012-08-02 08:51:42Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: AndyRTR <andyrtr@archlinux.org> # Contributor: kiefer <jorgelmadrid@gmail.com> pkgname=lxdm pkgver=0.4.1 -pkgrel=13 +pkgrel=14 pkgdesc='Lightweight X11 Display Manager' arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/lxdm/" @@ -19,22 +19,24 @@ backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession' 'etc/lxdm/PostLogout' 'etc/lxdm/PreReboot' 'etc/lxdm/PreShutdown') source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz glib2-2.32.0.patch lxdm.patch lxdm.conf.patch Xsession.patch - greeter-session.patch rc.d lxdm-pam service) + greeter-session.patch pam-env-vars.patch rc.d lxdm-pam service) md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821' 'a1e3c46a8bef691bc544028f5b6cfe22' 'baed9055e8825a5511712bc095197519' 'c50dd01b715b0a236407d48066191601' 'd2e4a4a22ee2aa1a986be154c647b6c6' '28475239d0c8b4fd778ec49f5ec72962' + '4c1d43e81e9a256e8d1ea7686c24b3d3' '705f394052fdd0dec22e95321d170de0' '9a76cae5b3a0fcbb6116fa08c7a587b5' - '4aaa9a7175cf327d9f7651c2586ef922') + 'e8cc66eb1a2405d2d9d184a727cbd9d8') build() { cd $srcdir/$pkgname-$pkgver patch -Np1 -i $srcdir/glib2-2.32.0.patch patch -Np1 -i $srcdir/greeter-session.patch + patch -Np1 -i $srcdir/pam-env-vars.patch ./configure --sysconfdir=/etc --prefix=/usr --libexecdir=/usr/lib/lxdm make diff --git a/community/lxdm/pam-env-vars.patch b/community/lxdm/pam-env-vars.patch new file mode 100644 index 000000000..ab8605ff1 --- /dev/null +++ b/community/lxdm/pam-env-vars.patch @@ -0,0 +1,50 @@ +diff --git a/src/lxdm.c b/src/lxdm.c +index 369aedf..cd1d486 100644 +--- a/src/lxdm.c ++++ b/src/lxdm.c +@@ -935,16 +935,23 @@ void setup_pam_session(LXSession *s,struct passwd *pw,char *session_name) + g_warning( "pam open session error \"%s\"\n", pam_strerror(s->pamh, err)); + } + +-void append_pam_environ(pam_handle_t *pamh,char **env) ++static char **append_pam_environ(pam_handle_t *pamh,char **env) + { +- int i,j,n; ++ int i,j,n,a; + char **penv; +- if(!pamh) return; ++ if(!pamh) return env; + penv=pam_getenvlist(pamh); +- if(!penv) return; ++ if(!penv) return env; ++ a=g_strv_length(penv); ++ if(a==0) ++ { ++ free(penv); ++ return env; ++ } ++ env=g_renew(char *,env,g_strv_length(env)+1+a+10); + for(i=0;penv[i]!=NULL;i++) + { +- //printf("PAM %s\n",penv[i]); ++ fprintf(stderr,"PAM %s\n",penv[i]); + n=strcspn(penv[i],"=")+1; + for(j=0;env[j]!=NULL;j++) + { +@@ -960,6 +967,7 @@ void append_pam_environ(pam_handle_t *pamh,char **env) + free(penv[i]); + } + free(penv); ++ return env; + } + + #endif +@@ -1540,7 +1548,7 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option) + if(s->child==0) + { + #if HAVE_LIBPAM +- append_pam_environ(s->pamh,env); ++ env=append_pam_environ(s->pamh,env); + pam_end(s->pamh,0); + #endif + switch_user(pw, session_exec, env); diff --git a/community/lxdm/service b/community/lxdm/service index b76e1190e..e1840476c 100644 --- a/community/lxdm/service +++ b/community/lxdm/service @@ -6,4 +6,4 @@ After=systemd-user-sessions.service ExecStart=/usr/sbin/lxdm [Install] -WantedBy=graphical.target +Alias=display-manager.service diff --git a/community/mariadb/PKGBUILD b/community/mariadb/PKGBUILD index 39a7feba4..c464a1a9b 100644 --- a/community/mariadb/PKGBUILD +++ b/community/mariadb/PKGBUILD @@ -1,19 +1,21 @@ -# $Id: PKGBUILD 74223 2012-07-23 03:08:05Z allan $ +# $Id: PKGBUILD 74694 2012-08-02 08:13:12Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> pkgbase=mariadb pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb') pkgver=5.5.25 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') license=('GPL') url="http://mariadb.org/" makedepends=('cmake' 'openssl' 'zlib') options=('!libtool') source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$pkgver.tar.gz - mysqld) + service rc.d tmpfiles.conf) md5sums=('943f67c267d73a4080ab497e11740daf' - '3bb5a9a96340feb0184bc057ee6e330b') + '9e7aa0fa646f48662df569259061fcef' + '3bb5a9a96340feb0184bc057ee6e330b' + '32f30449d3111714fe190931d08fdb8c') build() { cd "${srcdir}" @@ -113,7 +115,10 @@ package_mariadb() { make DESTDIR="${pkgdir}" install install -Dm644 "${pkgdir}"/usr/share/mysql/my-medium.cnf "${pkgdir}"/etc/mysql/my.cnf - install -Dm755 "${srcdir}"/mysqld "${pkgdir}"/etc/rc.d/mysqld + install -Dm755 "${srcdir}"/rc.d "${pkgdir}"/etc/rc.d/mysqld + + install -Dm644 "${srcdir}"/service "${pkgdir}"/usr/lib/systemd/system/mysql.service + install -Dm644 "${srcdir}"/tmpfiles.conf "${pkgdir}"/usr/lib/tmpfiles.d/mysql.conf # provided by libmariadbclient rm "${pkgdir}"/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded} diff --git a/community/mariadb/rc.d b/community/mariadb/rc.d new file mode 100755 index 000000000..e9fe8f5a8 --- /dev/null +++ b/community/mariadb/rc.d @@ -0,0 +1,77 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +getPID() { + echo $(pgrep -u mysql mysqld 2>/dev/null); +} + +case "$1" in + start) + stat_busy "Starting MariaDB Server" + [ ! -d /var/run/mysqld ] && install -d -g mysql -o mysql /var/run/mysqld &>/dev/null + if [ -z "$(getPID)" ]; then + /usr/bin/mysqld_safe --user=mysql &>/dev/null & + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + timeo=30 + while [ $timeo -gt 0 ]; do + response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break + echo "$response" | grep -q "mysqld is alive" && break + sleep 1 + let timeo=${timeo}-1 + done + if [ $timeo -eq 0 ]; then + stat_fail + exit 1 + else + echo $(getPID) > /var/run/mysqld/mysqld.pid + add_daemon mysqld + stat_done + fi + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping MariaDB Server" + if [ ! -z "$(getPID)" ]; then + timeo=30 + kill $(getPID) &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + fi + while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do + sleep 1 + let timeo=${timeo}-1 + done + if [ -z "$(getPID)" ]; then + rm -f /var/run/mysqld/mysqld.pid &>/dev/null + rm_daemon mysqld + stat_done + else + stat_fail + exit 1 + fi + else + stat_fail + exit 1 + fi + ;; + + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community/mariadb/service b/community/mariadb/service new file mode 100644 index 000000000..1b3a50082 --- /dev/null +++ b/community/mariadb/service @@ -0,0 +1,21 @@ +[Unit] +Description=MariaDB database server +After=syslog.target network.target + +[Service] +User=mysql +Group=mysql + +ExecStart=/usr/bin/mysqld --pid-file=/var/run/mysqld/mysqld.pid +ExecStop=/bin/kill -15 $MAINPID +PIDFile=/var/run/mysqld/mysqld.pid +WorkingDirectory=/usr + +# We rely on systemd, not mysqld_safe, to restart mysqld if it dies +Restart=always + +# Place temp files in a secure directory, not /tmp +PrivateTmp=true + +[Install] +WantedBy=multi-user.target diff --git a/community/mariadb/tmpfiles.conf b/community/mariadb/tmpfiles.conf new file mode 100644 index 000000000..74cd5f836 --- /dev/null +++ b/community/mariadb/tmpfiles.conf @@ -0,0 +1 @@ +d /var/run/mysqld 0755 mysql mysql - diff --git a/community/mpdscribble/PKGBUILD b/community/mpdscribble/PKGBUILD index dff74e354..d92c936a3 100644 --- a/community/mpdscribble/PKGBUILD +++ b/community/mpdscribble/PKGBUILD @@ -1,3 +1,4 @@ +# $Id: PKGBUILD 74713 2012-08-02 09:37:39Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowwski.pl> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: evr <evanroman at gmail> @@ -5,17 +6,18 @@ pkgname=mpdscribble pkgver=0.22 -pkgrel=3 +pkgrel=4 pkgdesc='An mpd client which submits track info to last.fm' url='http://mpd.wikia.com/wiki/Client:Mpdscribble' arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('libsoup' 'glib2' 'libmpdclient') install='mpdscribble.install' -source=("http://downloads.sourceforge.net/musicpd/mpdscribble-${pkgver}.tar.bz2" - 'mpdscribble') +source=(http://downloads.sourceforge.net/musicpd/mpdscribble-${pkgver}.tar.bz2 + rc.d service) md5sums=('652ee927b797e9a4cef45494e77047db' - 'f54c937c7b3ab8e4d39e4b903c2993fc') + 'f54c937c7b3ab8e4d39e4b903c2993fc' + '7e0a80c12225b0fe7be9c993f0079e95') build() { cd mpdscribble-${pkgver} @@ -33,9 +35,12 @@ package() { make DESTDIR="${pkgdir}" install - install -D "${srcdir}"/mpdscribble \ + install -D "${srcdir}"/rc.d \ "${pkgdir}"/etc/rc.d/mpdscribble + install -D "${srcdir}"/service \ + "${pkgdir}"/usr/lib/systemd/system/mpdscribble.service + # default config is really an example install -D -m644 "${pkgdir}"/etc/mpdscribble.conf \ "${pkgdir}"/usr/share/mpdscribble/mpdscribble.conf.example diff --git a/community/mpdscribble/rc.d b/community/mpdscribble/rc.d new file mode 100644 index 000000000..8071c0dbe --- /dev/null +++ b/community/mpdscribble/rc.d @@ -0,0 +1,37 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/bin/mpdscribble` +case "$1" in + start) + stat_busy "Starting mpdscribble" + [ -z "$PID" ] && /usr/bin/mpdscribble & + if [ $? -gt 0 ]; then + stat_fail + else + echo $PID > /var/run/mpdscribble.pid + add_daemon mpdscribble + stat_done + fi + ;; + stop) + stat_busy "Stopping mpdscribble" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm /var/run/mpdscribble.pid + rm_daemon mpdscribble + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/community/mpdscribble/service b/community/mpdscribble/service new file mode 100644 index 000000000..1475866ce --- /dev/null +++ b/community/mpdscribble/service @@ -0,0 +1,12 @@ +[Unit] +Description=last.fm updater for MPD +Wants=mpd.service +After=mpd.service + +[Service] +Type=forking +PIDFile=/run/mpdscribble.pid +ExecStart=/usr/bin/mpdscribble --pidfile /run/mpdscribble.pid + +[Install] +WantedBy=multi-user.target diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD index 72db058fe..5fca87a8a 100644 --- a/community/mplayer2/PKGBUILD +++ b/community/mplayer2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 73479 2012-07-08 09:30:47Z ibiru $ +# $Id: PKGBUILD 74686 2012-08-02 07:31:37Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Martin Panter <vadmium+aur@gmail.com> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> pkgname=mplayer2 -pkgver=20120517 -pkgrel=4 +pkgver=20120729 +pkgrel=1 pkgdesc="An advanced general-purpose media player. A fork of the original MPlayer project" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -18,19 +18,20 @@ depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 'ffmp if [ "$CARCH" != "mips64el" ]; then depends+=('libgl' 'libvdpau' 'lirc-utils') fi -makedepends=('mesa' 'unzip') +makedepends=('mesa' 'unzip' 'python') [ "$CARCH" != "mips64el" ] && makedepends+=('yasm') backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') provides=('mplayer') conflicts=('mplayer') options=(!emptydirs) source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz) -md5sums=('814cc9545937e13796df1d4747c3c5d0') +md5sums=('53a266106f4c0dd687af3f807727812c') build() { cd "${srcdir}"/$pkgname-$pkgver sed 's/gmplayer/mplayer/g' -i etc/mplayer.desktop + find -type f -exec sed -e 's/python3/python/' -i {} \; case $CARCH in mips64el) ;; diff --git a/community/mupdf/PKGBUILD b/community/mupdf/PKGBUILD index a7687df62..0f622554b 100644 --- a/community/mupdf/PKGBUILD +++ b/community/mupdf/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 69884 2012-04-25 14:08:08Z bpiotrowski $ +# $Id: PKGBUILD 74707 2012-08-02 09:04:30Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> @@ -7,12 +7,12 @@ pkgname=mupdf pkgver=1.0 -pkgrel=1 +pkgrel=2 pkgdesc="lightweight PDF viewer and toolkit written in portable C" arch=('i686' 'x86_64' 'mips64el') url="http://mupdf.com" license=('GPL3') -depends=('freetype2' 'libjpeg' 'jbig2dec' 'openjpeg' 'libxext' 'desktop-file-utils') +depends=('freetype2' 'libjpeg' 'jbig2dec' 'openjpeg' 'libxext' 'desktop-file-utils' 'xdg-utils') install=mupdf.install source=("http://mupdf.com/download/$pkgname-$pkgver-source.tar.gz") md5sums=('d986ab98e2b035b7abd61afc474562b3') diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index a6c022eb0..cb6cd70b2 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 74220 2012-07-23 03:07:53Z allan $ +# $Id: PKGBUILD 74696 2012-08-02 08:23:51Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Bartłomiej Piotrowski <barthalion@gmal.com> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> _cfgdir=/etc/nginx -_tmpdir=/var/tmp/nginx +_tmpdir=/var/lib/nginx pkgname=nginx pkgver=1.2.2 -pkgrel=2 +pkgrel=3 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server" arch=('i686' 'x86_64' 'mips64el') depends=('pcre' 'zlib' 'openssl') @@ -17,20 +17,20 @@ optdepends=('passenger') url="http://nginx.org" license=('custom') install=nginx.install -backup=("${_cfgdir:1}/fastcgi.conf" - "${_cfgdir:1}/fastcgi_params" - "${_cfgdir:1}/koi-win" - "${_cfgdir:1}/koi-utf" - "${_cfgdir:1}/mime.types" - "${_cfgdir:1}/nginx.conf" - "${_cfgdir:1}/scgi_params" - "${_cfgdir:1}/uwsgi_params" - "${_cfgdir:1}/win-utf" - "etc/logrotate.d/nginx") +backup=(${_cfgdir:1}/fastcgi.conf + ${_cfgdir:1}/fastcgi_params + ${_cfgdir:1}/koi-win + ${_cfgdir:1}/koi-utf + ${_cfgdir:1}/mime.types + ${_cfgdir:1}/nginx.conf + ${_cfgdir:1}/scgi_params + ${_cfgdir:1}/uwsgi_params + ${_cfgdir:1}/win-utf + etc/logrotate.d/nginx) source=(http://nginx.org/download/nginx-$pkgver.tar.gz - rc.d - service - nginx.logrotate) + rc.d + service + nginx.logrotate) md5sums=('53105bbe3ac9319db54d9eb46119695b' 'f62c7c9b5a53471d4666a4c49ad363fb' '62d494d23aef31d0b867161f9fffa6eb' @@ -79,26 +79,25 @@ build() { } package() { - cd "$srcdir/nginx-${pkgver}" + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install install -d "$pkgdir"/etc/logrotate.d - install -m644 $srcdir/nginx.logrotate $pkgdir/etc/logrotate.d/nginx + install -m644 "$srcdir"/nginx.logrotate "$pkgdir"/etc/logrotate.d/nginx sed -e 's|\<user\s\+\w\+;|user html;|g' \ - -e '44s|html|/usr/share/nginx/html|' \ - -e '54s|html|/usr/share/nginx/html|' \ - -i $pkgdir/etc/nginx/nginx.conf - rm $pkgdir/etc/nginx/*.default + -e '44s|html|/usr/share/nginx/html|' \ + -e '54s|html|/usr/share/nginx/html|' \ + -i "$pkgdir"/etc/nginx/nginx.conf + rm "$pkgdir"/etc/nginx/*.default - install -dm1777 $pkgdir/var/tmp - install -d $pkgdir/$_tmpdir + install -d "$pkgdir"/$_tmpdir - install -d $pkgdir/usr/share/nginx - mv $pkgdir/etc/nginx/html/ $pkgdir/usr/share/nginx + install -d "$pkgdir"/usr/share/nginx + mv "$pkgdir"/etc/nginx/html/ "$pkgdir"/usr/share/nginx - install -D -m755 $srcdir/rc.d $pkgdir/etc/rc.d/nginx - install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/nginx.service - install -D -m644 LICENSE $pkgdir/usr/share/licenses/nginx/LICENSE - rm -rf $pkgdir/var/run + install -D -m755 "$srcdir"/rc.d "$pkgdir"/etc/rc.d/nginx + install -Dm644 "$srcdir"/service "$pkgdir"/usr/lib/systemd/system/nginx.service + install -D -m644 LICENSE "$pkgdir"/usr/share/licenses/nginx/LICENSE + rm -rf "$pkgdir"/var/run } diff --git a/community/onboard/PKGBUILD b/community/onboard/PKGBUILD index c905b34e0..ef6ea46ef 100644 --- a/community/onboard/PKGBUILD +++ b/community/onboard/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 71667 2012-05-31 18:15:19Z ebelanger $ +# $Id: PKGBUILD 74690 2012-08-02 07:36:24Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=onboard pkgver=0.97.1 -pkgrel=1 +pkgrel=2 pkgdesc="On-screen keyboard useful on tablet PCs or for mobility impaired users" arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/onboard" license=('GPL') -depends=('python2-cairo' 'dbus-python' 'python2-gobject' 'libwnck3' 'python2-virtkey' 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'xdg-utils') +depends=('python2-cairo' 'python2-dbus' 'python2-gobject' 'libwnck3' 'python2-virtkey' 'gsettings-desktop-schemas' 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'xdg-utils') makedepends=('python2-distutils-extra') optdepends=('at-spi2-atk: auto-show when editing text' 'mousetweaks: hover click with mouse') diff --git a/community/pcmanfm/PKGBUILD b/community/pcmanfm/PKGBUILD index 57d3b90d4..417d469ff 100644 --- a/community/pcmanfm/PKGBUILD +++ b/community/pcmanfm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72347 2012-06-12 17:01:09Z bpiotrowski $ +# $Id: PKGBUILD 74709 2012-08-02 09:11:53Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: Unknown47 <unknown47r@gmail.com> # Contributor: Angel Velasquez <angvp@archlinux.org> @@ -6,7 +6,7 @@ pkgname=pcmanfm pkgver=0.9.10 -pkgrel=2 +pkgrel=3 pkgdesc="An extremely fast and lightweight file manager" arch=('i686' 'x86_64' 'mips64el') url="http://pcmanfm.sourceforge.net/" @@ -20,6 +20,7 @@ md5sums=('d34a3530a6c5dcd674d23021d71c3e95') build() { cd "$srcdir/$pkgname-$pkgver" + LDFLAGS+=' -lm' ./configure --sysconfdir=/etc --prefix=/usr make @@ -28,4 +29,6 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install + + sed -e 's|x-directory/normal|inode/directory|' -i $pkgdir/usr/share/applications/pcmanfm.desktop } diff --git a/community/preload/PKGBUILD b/community/preload/PKGBUILD index 612cee5ea..106b1f7b3 100644 --- a/community/preload/PKGBUILD +++ b/community/preload/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 64901 2012-02-18 20:00:16Z bpiotrowski $ +# $Id: PKGBUILD 74711 2012-08-02 09:27:00Z bpiotrowski $ # Maintainer: # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=preload pkgver=0.6.4 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64' 'mips64el') pkgdesc="Makes applications run faster by prefetching binaries and shared objects" url="http://sourceforge.net/projects/preload" @@ -16,9 +16,10 @@ backup=('etc/preload.conf') options=('!makeflags') install=$pkgname.install source=("http://downloads.sourceforge.net/sourceforge/preload/$pkgname-$pkgver.tar.gz" - rc.preload) + rc.d service) md5sums=('10786287b55afd3a2b433b4f898809f4' - 'bde0dd7867c77e7c4d10b481b5cddcd3') + 'bde0dd7867c77e7c4d10b481b5cddcd3' + 'db9350ab52fd643edbc88ebab2c8c1bb') build() { cd "${srcdir}"/$pkgname-$pkgver @@ -33,7 +34,9 @@ package() { cd "${srcdir}"/$pkgname-$pkgver make DESTDIR="${pkgdir}" install - install -D -m755 "${srcdir}"/rc.preload "${pkgdir}"/etc/rc.d/preload + install -Dm755 "${srcdir}"/rc.d "${pkgdir}"/etc/rc.d/preload + install -Dm644 "${srcdir}"/service "${pkgdir}"/usr/lib/systemd/system/preload.service + rm -rf "${pkgdir}"/etc/rc.d/init.d rm -rf "${pkgdir}"/var/lib/preload/preload.state diff --git a/community/preload/rc.d b/community/preload/rc.d new file mode 100644 index 000000000..a3cb01ba0 --- /dev/null +++ b/community/preload/rc.d @@ -0,0 +1,97 @@ +#!/bin/bash +# +# /etc/rc.d/init.d/preload +# +# Starts the preload daemon +# +# Heavily modified for Arch Linux by Leslie P. Polzer <polzer@gnu.org>. + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/preload` + +if [ -f /etc/conf.d/preload ]; then + . /etc/conf.d/preload +fi + +MIN_MEMORY=${MIN_MEMORY:-256} +# Check for > MIN_MEMORY MB +free -m | awk '/Mem:/ {exit ($2 >= ('"$MIN_MEMORY"'))?0:1}' || exit 0 + +RETVAL=0 + +# +# See how we were called. +# + +start() { + if [ -z "$PID" ]; then + stat_busy "Starting preload daemon: " + /usr/sbin/preload $PRELOAD_OPTS + RETVAL=$? + if [ $RETVAL -eq 0 ]; then + if [ -n $IONICE_OPTS ]; then + /usr/bin/ionice $IONICE_OPTS -p "`pidof -o %PPID /usr/sbin/preload`" + fi + add_daemon preload + stat_done + else + stat_fail + fi + fi + return $RETVAL +} + +stop() { + stat_busy "Stopping preload daemon: " + kill $PID &>/dev/null + RETVAL=$? + if [ $RETVAL -eq 0 ]; then + rm_daemon preload + stat_done + PID="" + else + stat_fail + fi + return $RETVAL +} + + +restart() { + $0 stop + sleep 1 + $0 start +} + +reload() { + trap "" SIGHUP + kill -HUP $PID +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + reload) + reload + ;; + restart) + restart + ;; + condrestart) + if [ ! -z $PID ]; then + restart + else + stat_fail + fi + ;; + *) + echo "Usage: $0 {start|stop|restart|condrestart|reload}" + exit 1 +esac + +exit $RETVAL diff --git a/community/preload/service b/community/preload/service new file mode 100644 index 000000000..e4202751f --- /dev/null +++ b/community/preload/service @@ -0,0 +1,11 @@ +[Unit] +Description=Adaptive readahead daemon + +[Service] +Type=simple +IOSchedulingClass=3 +EnvironmentFile=/etc/conf.d/preload +ExecStart=/usr/sbin/preload --foreground $PRELOAD_OPTS + +[Install] +WantedBy=multi-user.target diff --git a/community/python2-pymongo/PKGBUILD b/community/python2-pymongo/PKGBUILD index eb27d7d31..c7caf8fb3 100644 --- a/community/python2-pymongo/PKGBUILD +++ b/community/python2-pymongo/PKGBUILD @@ -3,18 +3,23 @@ # Contributor: lp76 <l.peduto@gmail.com> pkgname=python2-pymongo -pkgver=2.2 +pkgver=2.2.1 pkgrel=1 pkgdesc="Python driver for MongoDB" license=("APACHE") url="http://pypi.python.org/pypi/pymongo/" depends=('python2') -makedepends=('python2-distribute') +makedepends=('python2-distribute' 'python2-nose') source=(http://pypi.python.org/packages/source/p/pymongo/pymongo-$pkgver.tar.gz) arch=('i686' 'x86_64' 'mips64el') -md5sums=('101dd4ae59bdd487f67b3a3968a82c8c') +md5sums=('b9e9f844208971f42862d5a205cab1c7') package() { cd $srcdir/pymongo-$pkgver python2 setup.py install --root=$pkgdir --optimize=1 } + +check() { + cd $srcdir/pymongo-$pkgver +# python2 setup.py test +} diff --git a/community/qtcurve-kde4/PKGBUILD b/community/qtcurve-kde4/PKGBUILD index 0207a58d7..3033ab832 100644 --- a/community/qtcurve-kde4/PKGBUILD +++ b/community/qtcurve-kde4/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69997 2012-04-28 00:37:54Z svenstaro $ +# $Id: PKGBUILD 74684 2012-08-02 07:17:13Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qtcurve-kde4 -pkgver=1.8.12 +pkgver=1.8.13 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') groups=('qtcurve') @@ -15,7 +15,7 @@ depends=('kdebase-workspace') makedepends=('cmake' 'automoc4') source=("http://craigd.wikispaces.com/file/view/QtCurve-KDE4-${pkgver}.tar.bz2" 'bypass-kde-config.patch') -md5sums=('8a08d28204fab1b3db6813519f174014' +md5sums=('94ba22bc487a18f585249c2967878189' '3f6681147cc361bd2bfd4d7477f2a8d0') build() { diff --git a/community/spectrwm/PKGBUILD b/community/spectrwm/PKGBUILD index 1bf707f5a..236e1cc76 100644 --- a/community/spectrwm/PKGBUILD +++ b/community/spectrwm/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 73979 2012-07-18 00:30:45Z kkeen $ +# $Id: PKGBUILD 74745 2012-08-03 03:13:40Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=spectrwm -pkgver=1.1.2 +pkgver=1.2.0 pkgrel=1 pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way." arch=('i686' 'x86_64') url="http://www.spectrwm.org" _watch="https://opensource.conformal.com/snapshots/spectrwm/" license=('custom:ISC') -depends=('dmenu' 'libxrandr' 'libxtst' 'profont') +depends=('dmenu' 'xcb-util' 'xcb-util-wm' 'xcb-util-keysyms' 'libxrandr' 'libxft' 'profont') replaces=('scrotwm') makedepends=('libxt') optdepends=('scrot: screenshots' 'xlockmore: screenlocking' 'terminus-font: great font') @@ -18,7 +18,7 @@ backup=(etc/spectrwm.conf) source=(http://opensource.conformal.com/snapshots/$pkgname/$pkgname-$pkgver.tgz \ LICENSE \ baraction.sh) -md5sums=('20a7c31208ab7d92665862ad25ac2517' +md5sums=('81cca08d4a5f66023a7c246621b0cccc' 'a67cfe51079481e5b0eab1ad371379e3' '950d663692e1da56e0ac864c6c3ed80e') diff --git a/community/tinyxml/PKGBUILD b/community/tinyxml/PKGBUILD index 9826a68d9..2c357ef0d 100644 --- a/community/tinyxml/PKGBUILD +++ b/community/tinyxml/PKGBUILD @@ -1,10 +1,11 @@ +# $Id: PKGBUILD 74688 2012-08-02 07:33:41Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: Larry Hajali <larryhaja[at]gmail[dot]com> # Contributor: Hubert Grzeskowiak <arch at nemesis13 dot de> pkgname=tinyxml pkgver=2.6.2 -pkgrel=1 +pkgrel=2 pkgdesc="A simple, small, C++ XML parser that can be easily integrated into other programs." url='http://www.grinninglizard.com/tinyxml/' arch=('i686' 'x86_64' 'mips64el') @@ -32,15 +33,17 @@ build() { -e "s|^RELEASE_CFLAGS.*|& ${CXXFLAGS} -fPIC|" Makefile make - g++ -fPIC ${CXXFLAGS} -shared -o lib${pkgname}.so.0.$pkgver -Wl,-soname,lib${pkgname}.so.0 *.o + g++ -fPIC ${CXXFLAGS} -shared -o lib${pkgname}.so.0.$pkgver \ + -Wl,-soname,lib${pkgname}.so.0 $(ls *.o | grep -v xmltest) } -package() -{ +package() { cd "$srcdir"/$pkgname + install -d -m 0755 "$pkgdir"/usr/{lib,include} install -m 0755 lib${pkgname}.so.0.$pkgver "$pkgdir"/usr/lib/ install -m 0644 $pkgname.h tinystr.h "$pkgdir"/usr/include + (cd "$pkgdir"/usr/lib ln -s lib${pkgname}.so.0.$pkgver lib${pkgname}.so.0 ln -s lib${pkgname}.so.0.$pkgver lib${pkgname}.so diff --git a/community/unbound/PKGBUILD b/community/unbound/PKGBUILD index 82ba69b5f..f4a92c8e3 100644 --- a/community/unbound/PKGBUILD +++ b/community/unbound/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 71901 2012-06-03 05:58:48Z bisson $ +# $Id: PKGBUILD 74727 2012-08-02 13:31:20Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Hisato Tatekura <hisato_tatekura@excentrics.net> # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service> pkgname=unbound -pkgver=1.4.17 -pkgrel=2 +pkgver=1.4.18 +pkgrel=1 pkgdesc='Validating, recursive, and caching DNS resolver' url='http://unbound.net/' license=('custom:BSD') @@ -19,7 +19,7 @@ source=("http://unbound.net/downloads/${pkgname}-${pkgver}.tar.gz" 'unbound.service' 'unbound.conf' 'rc.d') -sha1sums=('fea4d812c03af4737ef671ac30b7b7400d346516' +sha1sums=('b64b4c9f7981df4e7589ebb770a31352a09db3fb' '5bc313cd978e4d6efe8c13600e838c70629be477' '5d473ec2943fd85367cdb653fcd58e186f07383f' 'dc96e772f467b32555df21d16fdb15e98194c228') diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD index 345b07f95..f6ad9251d 100644 --- a/core/curl/PKGBUILD +++ b/core/curl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160000 2012-05-27 15:59:46Z dreisner $ +# $Id: PKGBUILD 164670 2012-08-02 13:25:33Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=curl -pkgver=7.26.0 +pkgver=7.27.0 pkgrel=1 pkgdesc="An URL retrival utility and library" arch=('i686' 'x86_64' 'mips64el') @@ -16,8 +16,8 @@ depends=('ca-certificates' 'libssh2' 'openssl' 'zlib') options=('!libtool') source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} curlbuild.h) -md5sums=('3fa4d5236f2a36ca5c3af6715e837691' - '61b594830d5acba3c99e4af0ba39a14e' +md5sums=('f0e48fdb635b5939e02a9291b89e5336' + 'b5d6d54f97adcaf5c871174e5460f081' '751bd433ede935c8fae727377625a8ae') ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') diff --git a/extra/ecl/PKGBUILD b/extra/ecl/PKGBUILD index 23b641972..673a5afd2 100644 --- a/extra/ecl/PKGBUILD +++ b/extra/ecl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 159616 2012-05-25 22:32:35Z juergen $ +# $Id: PKGBUILD 164666 2012-08-02 09:27:21Z juergen $ # Contributor: John Proctor <jproctor@prium.net> # Maintainer: juergen <juergen@archlinux.org> pkgname=ecl -pkgver=12.2.1 -pkgrel=2 +pkgver=12.7.1 +pkgrel=1 pkgdesc="Embeddable Common Lisp" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/ecls/" @@ -13,8 +13,8 @@ depends=('bash' 'gmp') makedepends=('texinfo') provides=('common-lisp' 'cl-asdf') options=('!makeflags') -source=(http://downloads.sourceforge.net/project/ecls/ecls/12.2/ecl-12.2.1.tgz) -md5sums=('1a54b733e7cd07af2b1cb6d7f8b716d2') +source=(http://downloads.sourceforge.net/project/ecls/ecls/12.7/ecl-12.7.1.tar.gz) +md5sums=('ce8dd2136fbbc74e44a1c41b32db1f3c') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/fontforge/PKGBUILD b/extra/fontforge/PKGBUILD index e6ffa76ae..1525ae0f8 100644 --- a/extra/fontforge/PKGBUILD +++ b/extra/fontforge/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 148720 2012-02-05 11:48:07Z ibiru $ +# $Id: PKGBUILD 164687 2012-08-02 16:06:30Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=fontforge -pkgver=20120119 +pkgver=20120731_b pkgrel=1 pkgdesc='Outline and bitmap font editor' arch=('i686' 'x86_64' 'mips64el') @@ -12,13 +12,14 @@ url='http://fontforge.sourceforge.net/' license=('BSD') depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2' 'libspiro') options=('!libtool' '!makeflags') -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz") -sha1sums=('2c363af075e77bf35d21ee1939e3d6ab39a9f80c') +source=("http://downloads.sourceforge.net/project/fontforge/fontforge-source/fontforge_full-${pkgver//_/-}.tar.bz2") +sha1sums=('b520f532b48e557c177dffa29120225066cc4e84') # git clone git://fontforge.git.sourceforge.net/gitroot/fontforge/fontforge; cd fontforge; git archive --prefix=${pkgname}-${pkgver}/ master | xz > ../${pkgname}-${pkgver}.tar.xz +# source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz") build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver//_/-}" sed -i 's/python /python2 /g' Makefile.dynamic.in ./configure \ --prefix=/usr \ @@ -34,7 +35,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver//_/-}" make DESTDIR="${pkgdir}" install install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/misdnuser/PKGBUILD b/extra/misdnuser/PKGBUILD index 93dae37a5..8f82702c4 100644 --- a/extra/misdnuser/PKGBUILD +++ b/extra/misdnuser/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163040 2012-07-06 08:30:10Z tpowa $ +# $Id: PKGBUILD 164669 2012-08-02 12:42:25Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=misdnuser -pkgver=2.0.13_20120607 -pkgrel=2 +pkgver=2.0.14_20120802 +pkgrel=1 pkgdesc="Tools and library for mISDN" arch=('i686' 'x86_64') url="http://www.misdn.org" @@ -22,6 +22,7 @@ build() { #export CFLAGS+=" -g -O0" #export CXXFLAGS+=" -g -O0" cd ${srcdir}/${pkgname}-${pkgver} + make ./configure --prefix=/usr --sysconfdir=/etc --enable-capi --enable-softdsp --with-mISDN_group=uucp make } @@ -42,7 +43,8 @@ package() { install -D -m644 ${srcdir}/c2faxrecv-mISDNcapid.service ${pkgdir}/usr/lib/systemd/system/c2faxrecv-mISDNcapid.service install -D -m644 ${srcdir}/mISDNcapid.conf ${pkgdir}/usr/lib/tmpfiles.d/mISDNcapid.conf } -md5sums=('10b370c2010c9239161095e5d2a1cb3f' + +md5sums=('ea4c4b55eb2f5914bceb17b648e8f879' '2009563b144de037ecb20f8d727a772e' '8f305ee6e35fa12a8bec0632bfe7a076' '32ead7f063e007c784aa883d441f33c2' diff --git a/extra/virtuoso/PKGBUILD b/extra/virtuoso/PKGBUILD index 37fa9c3da..60299ddd2 100644 --- a/extra/virtuoso/PKGBUILD +++ b/extra/virtuoso/PKGBUILD @@ -1,19 +1,18 @@ -# $Id: PKGBUILD 163689 2012-07-17 19:51:54Z andrea $ +# $Id: PKGBUILD 164689 2012-08-02 16:10:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service> pkgbase=virtuoso pkgname=('virtuoso' 'virtuoso-base') -pkgver=6.1.5.20120717 -pkgrel=2 +pkgver=6.1.6 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://virtuoso.openlinksw.com/wiki/main/Main/' license=('GPL') makedepends=('libldap' 'bison' 'flex' 'gperf' 'net-tools' 'libxml2') options=('!libtool') -source=("ftp://ftp.archlinux.org/other/${pkgbase}/${pkgbase}-opensource-${pkgver}.tar.gz") -#source=("http://downloads.sourceforge.net/${pkgbase}/${pkgbase}-opensource-${pkgver}.tar.gz") -md5sums=('bee8d6ad91e888bab8fdd177063ca084') +source=("http://downloads.sourceforge.net/${pkgbase}/${pkgbase}-opensource-${pkgver}.tar.gz") +md5sums=('3991149c570f3738c3e819ce603e487f') build() { cd ${srcdir}/${pkgbase}-opensource-${pkgver} diff --git a/libre/iceape-i18n/PKGBUILD b/libre/iceape-i18n/PKGBUILD index 7bfca020f..d146e02dd 100644 --- a/libre/iceape-i18n/PKGBUILD +++ b/libre/iceape-i18n/PKGBUILD @@ -11,7 +11,7 @@ # - Run 'make'. It will take care of everything else for you. _debname=iceape -_debver=2.7.5 +_debver=2.7.6 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -22,9 +22,9 @@ pkgbase=iceape-i18n pkgname=($(for lang in ${_langpacks[@]} do echo $pkgbase-$lang | tr A-Z a-z done)) -_pkgver=2.7.5 +_pkgver=2.7.6 pkgver=${_debver}.${_debrel} -pkgrel=2 +pkgrel=1 pkgdesc="Language packs for Debian Iceape." arch=('any') @@ -58,26 +58,26 @@ package_iceape-i18n-$(echo $lang | tr A-Z a-z)() { " done -md5sums=('03a75ce1325fc748d0943cd39659e8ca' - '9fc2070dc6db8d94f322cb5e27523ea4' - '6cb55fe51fca1de674ca32b10edc7c8b' - '138121b288c269aa418ca0c33eb65326' - '8fd47eed7c79fe29c74a81d9b4a4864a' - '71f6007df53b17361965f38c01869738' - 'f253842c0a377e86c6c62f7db27db32d' - 'b93caebe5ceb08d2cde78fe40fff3c0c' - 'a36d0776b736609b1e72b8530cc9e755' - '9acd2d8e4fd39700aa99a21681403a72' - '60703c83180e8bb3abdcfbf26bf1289d' - 'dc708663d015830fb11e800f48d7492c' - '313e6a88a602e09b5f08d6ff8ccdc89a' - '31debae1dca6035695805d0de55c71f3' - '1f927d23eb1db49db3ffe2d3ee5e3da5' - '4b5e52235ce8a52d1144d5f6e45a069c' - '81d1a28544f9a6e92eafc48e57a45a35' - 'bb32f5938b885d2de225e4d8e2471d28' - '69d447db48244cc1546d0ce3447e8ab8' - '16d36a140dfbd9a001b28f4fcbc81df8' - '211bb03760a2eacf685f27f03e71da4d' - '83225015ad8f023ff0d9f9643c295e4c' - '67d3ec1632a4ed2aaf8e7a5df0284b1e') +md5sums=('ee7f337bb32aee98a9f2be1936843106' + '10102b3e8f81dbd91dacddb892ba68b9' + 'fef4de4746cc36bcf911fb0f7a7b2338' + 'd31e21bb4917155e159941400b86b9a8' + '76e7c36cc0fd7e200c8b0d220d05f084' + '804fbc692db4523e31fbe337c37cd958' + '7bd3d6b9d4bdfcd5c53002ed695c3be9' + 'b875123775d4aa52b747e9ef897cee4c' + 'a5ecf997b5afa853fd46840f1e9cc01e' + '352872240f6e1812fb27599f2d43ed5e' + '7f680543cca22102660e39d775ea4f1f' + '19c47a8901163e23fc937b2076812147' + '7c1b1105b5a70008c12b3a5195c5a789' + '3306f9408c61f622a185fd9e218199ef' + '88f466e2bd3ec4236f76d92b22cc5e12' + '8c655118c3cfc0063581f11f11f23817' + '0d481cfdd69a591881e358f6a4d45e3e' + '457aea13f02af3aa2bc690ab438e1f37' + '9b72f83a7e1142ab8839fd2350437dfc' + '7e640437184ff9874d50bba9ddd8b800' + '2f00074f37b3785df5781a750e4a8293' + '9b4295c47829adcc3832d2b9524c6a95' + '1dea8892db29f13a37acdb02ba635f80') diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD index ca386c03a..20aa8b8e7 100644 --- a/libre/iceape-libre/PKGBUILD +++ b/libre/iceape-libre/PKGBUILD @@ -3,7 +3,7 @@ # We're getting this from Debian Sid _debname=iceape -_debver=2.7.5 +_debver=2.7.6 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=${_debname} pkgname=${_debname}-libre pkgver=${_debver}.${_debrel} -pkgrel=3 +pkgrel=1 pkgdesc="A libre version of Debian Iceape, the Internet Suite based on Mozilla Seamonkey." arch=('i586' 'i686' 'x86_64' 'mips64el') license=('GPL2' 'MPL' 'LGPL') @@ -29,8 +29,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" ${_pkgname}-2.0-lang.patch clrf.patch libre.patch) -md5sums=('7a6e671485a75cd9495f346e0f8e4dcb' - '174e572e9d7b1b62a8e437f70fe771ba' +md5sums=('7177342dcd4d445b166c36935c1d4ca5' + '5adb3b2c718311e664d8541bb4a16304' '60ba9e8f2fafd20e41268af534a55ea7' '7266333e31731af8bb50c2eca8d0bd26' '25b6fe16ac24cd5c852213e5c1adb272' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index d2a5610df..93ee3ad0a 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -9,9 +9,9 @@ pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE-LTS k # pkgname=linux-custom # Build kernel with a different name _kernelname=-LIBRE-LTS _basekernel=3.0 -_sublevel=38 +_sublevel=39 pkgver=${_basekernel}.${_sublevel} -_lxopkgver=${_basekernel}.37 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.39 # nearly always the same as pkgver pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -32,9 +32,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'ext4-options.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - '8a2416fd6ac323184ab563958a6eb560' - '9cfcf3807201ce44aa720571232a10ce' - '8bb5c5aa217202c3ac3798ba7798e07d' + '9259948f76db87052be56da4c525d07a' + '5e3362ef81c99563852f1b7a8c5b5837' + '3d078c10d51f9c2f4d0ec6be531caf1d' 'c072b17032e80debc6a8626299245d46' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' @@ -42,7 +42,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' 'f36222e7ce20c8e4dc27376f9be60f6c' - 'f0c4e2fa00e3f9fd9d666742c32beefb') + 'eea9aa0065f636fc924a23b3ffd24343') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686 index 83bab0f8c..240eccfbf 100644 --- a/libre/linux-libre-lts/config.i686 +++ b/libre/linux-libre-lts/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 3.0.29-1 Kernel Configuration +# Linux/i386 3.0.39-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -192,9 +192,10 @@ CONFIG_TRACEPOINTS=y CONFIG_OPROFILE=m # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set CONFIG_HAVE_OPROFILE=y -# CONFIG_KPROBES is not set +CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_KRETPROBES=y CONFIG_USER_RETURN_NOTIFIER=y CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y @@ -992,7 +993,9 @@ CONFIG_IP_DCCP_TFRC_LIB=y # DCCP Kernel Hacking # # CONFIG_IP_DCCP_DEBUG is not set +CONFIG_NET_DCCPPROBE=m CONFIG_IP_SCTP=m +CONFIG_NET_SCTPPROBE=m # CONFIG_SCTP_DBG_MSG is not set # CONFIG_SCTP_DBG_OBJCNT is not set # CONFIG_SCTP_HMAC_NONE is not set @@ -1104,6 +1107,7 @@ CONFIG_XPS=y # Network testing # CONFIG_NET_PKTGEN=m +CONFIG_NET_TCPPROBE=m CONFIG_NET_DROP_MONITOR=y CONFIG_HAMRADIO=y @@ -5343,6 +5347,7 @@ CONFIG_FRAME_POINTER=y # CONFIG_RCU_TORTURE_TEST is not set CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_CPU_STALL_VERBOSE is not set +# CONFIG_KPROBES_SANITY_TEST is not set # CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set @@ -5386,6 +5391,7 @@ CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ALL_BRANCHES is not set CONFIG_STACK_TRACER=y CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_KPROBE_EVENT=y CONFIG_DYNAMIC_FTRACE=y CONFIG_FUNCTION_PROFILER=y CONFIG_FTRACE_MCOUNT_RECORD=y @@ -5417,6 +5423,7 @@ CONFIG_DEBUG_RODATA=y CONFIG_DOUBLEFAULT=y # CONFIG_IOMMU_STRESS is not set CONFIG_HAVE_MMIOTRACE_SUPPORT=y +# CONFIG_X86_DECODER_SELFTEST is not set CONFIG_IO_DELAY_TYPE_0X80=0 CONFIG_IO_DELAY_TYPE_0XED=1 CONFIG_IO_DELAY_TYPE_UDELAY=2 diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64 index fa7be5e5b..86b096eaf 100644 --- a/libre/linux-libre-lts/config.x86_64 +++ b/libre/linux-libre-lts/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 3.0.26-1 Kernel Configuration +# Linux/x86_64 3.0.39-1 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -193,9 +193,10 @@ CONFIG_TRACEPOINTS=y CONFIG_OPROFILE=m # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set CONFIG_HAVE_OPROFILE=y -# CONFIG_KPROBES is not set +CONFIG_KPROBES=y CONFIG_JUMP_LABEL=y CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_KRETPROBES=y CONFIG_USER_RETURN_NOTIFIER=y CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y @@ -960,7 +961,9 @@ CONFIG_IP_DCCP_TFRC_LIB=y # DCCP Kernel Hacking # # CONFIG_IP_DCCP_DEBUG is not set +CONFIG_NET_DCCPPROBE=m CONFIG_IP_SCTP=m +CONFIG_NET_SCTPPROBE=m # CONFIG_SCTP_DBG_MSG is not set # CONFIG_SCTP_DBG_OBJCNT is not set # CONFIG_SCTP_HMAC_NONE is not set @@ -1070,10 +1073,9 @@ CONFIG_BPF_JIT=y # Network testing # CONFIG_NET_PKTGEN=m +CONFIG_NET_TCPPROBE=m CONFIG_NET_DROP_MONITOR=y CONFIG_HAMRADIO=y -# CONFIG_CAN is not set -CONFIG_IRDA=m # # Packet Radio protocols @@ -1093,6 +1095,8 @@ CONFIG_BAYCOM_SER_FDX=m CONFIG_BAYCOM_SER_HDX=m CONFIG_BAYCOM_PAR=m CONFIG_YAM=m +# CONFIG_CAN is not set +CONFIG_IRDA=m # # IrDA protocols @@ -5083,6 +5087,7 @@ CONFIG_FRAME_POINTER=y # CONFIG_RCU_TORTURE_TEST is not set CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_CPU_STALL_VERBOSE is not set +# CONFIG_KPROBES_SANITY_TEST is not set # CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set @@ -5126,6 +5131,7 @@ CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ALL_BRANCHES is not set CONFIG_STACK_TRACER=y CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_KPROBE_EVENT=y CONFIG_DYNAMIC_FTRACE=y CONFIG_FUNCTION_PROFILER=y CONFIG_FTRACE_MCOUNT_RECORD=y @@ -5157,6 +5163,7 @@ CONFIG_DEBUG_RODATA=y # CONFIG_IOMMU_DEBUG is not set # CONFIG_IOMMU_STRESS is not set CONFIG_HAVE_MMIOTRACE_SUPPORT=y +# CONFIG_X86_DECODER_SELFTEST is not set CONFIG_IO_DELAY_TYPE_0X80=0 CONFIG_IO_DELAY_TYPE_0XED=1 CONFIG_IO_DELAY_TYPE_UDELAY=2 diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index 226061525..6f7899fe6 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.38-1-LIBRE-LTS +KERNEL_VERSION=3.0.39-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD index b571d605b..3de090703 100644 --- a/libre/virtualbox-libre-modules-lts/PKGBUILD +++ b/libre/virtualbox-libre-modules-lts/PKGBUILD @@ -7,7 +7,7 @@ pkgbase=virtualbox-libre-modules-lts pkgname=('virtualbox-libre-modules-lts' 'virtualbox-libre-parabola-modules-lts') pkgver=4.1.18 -pkgrel=3.1 +pkgrel=4 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') @@ -48,12 +48,12 @@ md5sums=('38db0a87cba659b484af868b0c2bd3ac' 'f7d275fc52e5f3cfafd85646c2914063') _extramodules=extramodules-3.0-LIBRE-LTS -_kernver=3.0.38-1-LIBRE-LTS - -export KERN_DIR=/usr/lib/modules/${_kernver}/build/ -export KERN_INCL=/usr/src/linux-${_kernver}/include/ build() { + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + export KERN_DIR=/usr/lib/modules/${_kernver}/build/ + export KERN_INCL=/usr/src/linux-${_kernver}/include/ + cd "$srcdir/VirtualBox-${pkgver}" patch -Np1 -i "$srcdir/libre.patch" |