summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/cups/PKGBUILD15
-rw-r--r--extra/cups/cups-systemd-socket.patch15
-rw-r--r--extra/easytag/PKGBUILD10
-rw-r--r--extra/gnutls/PKGBUILD8
-rw-r--r--extra/kaffeine/PKGBUILD38
-rw-r--r--extra/kaffeine/kaffeine-1.2.2-gcc4.7.patch32
-rw-r--r--extra/kaffeine/kaffeine.install12
-rw-r--r--extra/maxima/PKGBUILD14
-rw-r--r--extra/mesa/PKGBUILD17
-rw-r--r--extra/mesa/workaround-for-robustness-and-reset-with-intel.patch15
-rw-r--r--extra/nss/PKGBUILD91
-rw-r--r--extra/nss/nss-config.in145
-rw-r--r--extra/nss/nss.pc.in11
-rw-r--r--extra/nss/ssl-renegotiate-transitional.patch21
-rw-r--r--extra/r/PKGBUILD6
-rw-r--r--extra/varnish/PKGBUILD20
-rw-r--r--extra/varnish/varnish.install8
-rw-r--r--extra/varnish/varnish.service7
-rw-r--r--extra/yakuake/PKGBUILD31
-rw-r--r--extra/yakuake/yakuake.install11
20 files changed, 87 insertions, 440 deletions
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index f9e6cfabb..b3ebf1daf 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 207150 2014-03-07 19:58:24Z andyrtr $
+# $Id: PKGBUILD 210252 2014-04-13 07:29:52Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgbase="cups"
pkgname=('libcups' 'cups')
-pkgver=1.7.1
-pkgrel=4
+pkgver=1.7.2
+pkgrel=1
arch=('i686' 'x86_64')
license=('GPL')
url="http://www.cups.org/"
@@ -12,7 +12,7 @@ makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'pam' 'xdg-utils' 'krb5' 'op
'cups-filters' 'bc' 'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus'
'avahi' 'hicolor-icon-theme' 'systemd' 'inetutils' 'libpaper' 'valgrind')
source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
- http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.bz2
+ http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.bz2{,.sig}
cups.logrotate cups.pam
# improve build and linking
cups-no-export-ssllibs.patch
@@ -31,13 +31,14 @@ source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.b
cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
get-ppd-file-for-statically-configured-ipp-shared-queues.patch
ppd-poll-with-client-conf.patch)
-md5sums=('55277c40fd4b7183dc3671d39c5c42b7'
+md5sums=('f06a997d4b71b81b23324e27174f93e7'
+ 'SKIP'
'f861b18f4446c43918c8643dcbbd7f6d'
'96f82c38f3f540b53f3e5144900acf17'
'3ba9e3410df1dc3015463d615ef91b3b'
'cc4101beccb5ed6deb1c92707a575925'
'90c30380d4c8cd48a908cfdadae1ea24'
- 'cf2f881967b0531ec49bcb5d0e9573a8'
+ '7088c0123c06bce280925aa39ebd79c6'
'8fe27d4248cacbc02824e7937cab4088'
'df0c367c0022e3c7d8e01827e8a6c5e7'
'f30c2a161caaf27854581507cde8cac6'
@@ -51,7 +52,7 @@ md5sums=('55277c40fd4b7183dc3671d39c5c42b7'
prepare() {
cd ${pkgbase}-${pkgver}
-
+#return 1
# add systemd socket support - Fedora patch, also used in Gentoo
# modified now to the changes done by Gentoo in their svn ebuild
# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-print/cups/files/cups-1.5.0-systemd-socket.patch?revision=1.1
diff --git a/extra/cups/cups-systemd-socket.patch b/extra/cups/cups-systemd-socket.patch
index ad13a6da7..54a951200 100644
--- a/extra/cups/cups-systemd-socket.patch
+++ b/extra/cups/cups-systemd-socket.patch
@@ -32,11 +32,11 @@ diff -up cups-1.7rc1/config-scripts/cups-systemd.m4.systemd-socket cups-1.7rc1/c
+ [], [with_systemdsystemunitdir=$($PKGCONFIG --variable=systemdsystemunitdir systemd)])
+if test "x$with_systemdsystemunitdir" != xno; then
+ AC_MSG_CHECKING(for libsystemd-daemon)
++ AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
+ if $PKGCONFIG --exists libsystemd-daemon; then
+ AC_MSG_RESULT(yes)
+ SDCFLAGS=`$PKGCONFIG --cflags libsystemd-daemon`
+ SDLIBS=`$PKGCONFIG --libs libsystemd-daemon`
-+ AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
+ AC_DEFINE(HAVE_SYSTEMD)
+ else
+ AC_MSG_RESULT(no)
@@ -213,15 +213,6 @@ diff -up cups-1.7rc1/scheduler/listen.c.systemd-socket cups-1.7rc1/scheduler/lis
diff -up cups-1.7rc1/scheduler/main.c.systemd-socket cups-1.7rc1/scheduler/main.c
--- cups-1.7rc1/scheduler/main.c.systemd-socket 2013-07-12 11:16:53.212546887 +0200
+++ cups-1.7rc1/scheduler/main.c 2013-07-12 11:16:53.261546208 +0200
-@@ -26,6 +26,8 @@
- * launchd_checkin() - Check-in with launchd and collect the listening
- * fds.
- * launchd_checkout() - Update the launchd KeepAlive file as needed.
-+ * systemd_checkin() - Check-in with systemd and collect the
-+ * listening fds.
- * parent_handler() - Catch USR1/CHLD signals...
- * process_children() - Process all dead children...
- * select_timeout() - Calculate the select timeout value.
@@ -62,6 +64,10 @@
# endif /* !LAUNCH_JOBKEY_SERVICEIPC */
#endif /* HAVE_LAUNCH_H */
@@ -238,7 +229,7 @@ diff -up cups-1.7rc1/scheduler/main.c.systemd-socket cups-1.7rc1/scheduler/main.
static void launchd_checkout(void);
#endif /* HAVE_LAUNCHD */
+#ifdef HAVE_SYSTEMD
-+static void systemd_checkin(void);
++static int systemd_checkin(void);
+#endif /* HAVE_SYSTEMD */
static void parent_handler(int sig);
static void process_children(void);
@@ -278,7 +269,7 @@ diff -up cups-1.7rc1/scheduler/main.c.systemd-socket cups-1.7rc1/scheduler/main.
#endif /* HAVE_LAUNCHD */
+#ifdef HAVE_SYSTEMD
-+static void
++static int
+systemd_checkin(void)
+{
+ int n, fd;
diff --git a/extra/easytag/PKGBUILD b/extra/easytag/PKGBUILD
index fe517e1ba..660e92a2c 100644
--- a/extra/easytag/PKGBUILD
+++ b/extra/easytag/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 206159 2014-02-20 12:56:10Z guillaume $
+# $Id: PKGBUILD 210272 2014-04-13 11:24:53Z guillaume $
# Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
# Contributor: Kevin Piche <kevin@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
# Contributor: dorphell <dorphell@archlinux.org>
pkgname=easytag
-pkgver=2.1.10
+pkgver=2.2.0
pkgrel=1
-pkgdesc='Utility for viewing and editing tags for most audio formats'
+pkgdesc='Simple application for viewing and editing tags in audio files'
arch=('i686' 'x86_64')
license=('GPL')
url='http://easytag.sourceforge.net/'
@@ -16,9 +16,7 @@ depends=('id3lib' 'libid3tag' 'gtk2' 'libvorbis' 'flac' 'speex' 'wavpack' 'tagli
'desktop-file-utils' 'hicolor-icon-theme')
install=${pkgname}.install
source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('fe73a27aa4ad0a2ddc183a84d923ac214aeaf4a5752cb8640a2f840d9dd023d9')
-
-# TODO either 'svn delete' patch about mime or add it back here
+sha256sums=('29589972a3a8beb7823df74f1e845c1e61ab46508425894fa46b72c86cad56f7')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index deb8d7392..68fba3bb2 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 209911 2014-04-08 13:33:24Z andyrtr $
+# $Id: PKGBUILD 210253 2014-04-13 07:29:53Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgname=gnutls
-pkgver=3.2.13
+pkgver=3.3.0
pkgrel=1
pkgdesc="A library which provides a secure layer over a reliable transport layer"
arch=('i686' 'x86_64')
@@ -12,8 +12,8 @@ url="http://www.gnutls.org/"
install=gnutls.install
options=('!zipman')
depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle' 'p11-kit')
-source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('300e5f413054e2f4719c1c3b5179a611'
+source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/${pkgname}-${pkgver}.tar.xz{,.sig})
+md5sums=('4aeb8014feb4016c73a60f4e1ac73c9f'
'SKIP')
build() {
diff --git a/extra/kaffeine/PKGBUILD b/extra/kaffeine/PKGBUILD
deleted file mode 100644
index 5bad851f1..000000000
--- a/extra/kaffeine/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 191225 2013-07-21 20:40:01Z eric $
-# Maintainer:
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kaffeine
-pkgver=1.2.2
-pkgrel=3
-pkgdesc='KDE media player'
-license=('GPL')
-arch=('i686' 'x86_64')
-url="http://kaffeine.kde.org"
-depends=('kdebase-runtime' 'xine-lib')
-makedepends=('cmake' 'automoc4')
-install=kaffeine.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
- kaffeine-1.2.2-gcc4.7.patch)
-md5sums=('690e48d2e5fe123887109aa9b1bc1c31'
- '48afe5ec99b38fe02782db57a847033f')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- patch -p1 -i "${srcdir}/kaffeine-1.2.2-gcc4.7.patch"
-}
-
-build() {
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-}
diff --git a/extra/kaffeine/kaffeine-1.2.2-gcc4.7.patch b/extra/kaffeine/kaffeine-1.2.2-gcc4.7.patch
deleted file mode 100644
index e74563e0b..000000000
--- a/extra/kaffeine/kaffeine-1.2.2-gcc4.7.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 2da9df1e67004c3cfa879578c351300a99f23da1
-Author: Christoph Pfister <christophpfister@gmail.com>
-Date: Wed Apr 4 21:22:09 2012 +0200
-
- fix build for gcc 4.7
-
-diff --git a/src/dvb/dvbepg.cpp b/src/dvb/dvbepg.cpp
-index 7fc8f68..e70d8b8 100644
---- a/src/dvb/dvbepg.cpp
-+++ b/src/dvb/dvbepg.cpp
-@@ -690,15 +690,15 @@ void AtscEpgFilter::processEitSection(const char *data, int size)
- // 1980-01-06T000000 minus 15 secs (= UTC - GPS in 2011)
- QDateTime baseDateTime = QDateTime(QDate(1980, 1, 5), QTime(23, 59, 45), Qt::UTC);
-
-- for (AtscEitSectionEntry entry = eitSection.entries(); (entryCount > 0) && entry.isValid();
-- --entryCount, entry.advance()) {
-+ for (AtscEitSectionEntry eitEntry = eitSection.entries();
-+ (entryCount > 0) && eitEntry.isValid(); --entryCount, eitEntry.advance()) {
- DvbEpgEntry epgEntry;
- epgEntry.channel = channel;
-- epgEntry.begin = baseDateTime.addSecs(entry.startTime());
-- epgEntry.duration = QTime().addSecs(entry.duration());
-- epgEntry.title = entry.title();
-+ epgEntry.begin = baseDateTime.addSecs(eitEntry.startTime());
-+ epgEntry.duration = QTime().addSecs(eitEntry.duration());
-+ epgEntry.title = eitEntry.title();
-
-- quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(entry.eventId()));
-+ quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(eitEntry.eventId()));
- DvbSharedEpgEntry entry = epgEntries.value(id);
-
- if (entry.isValid() && (entry->channel == epgEntry.channel) &&
diff --git a/extra/kaffeine/kaffeine.install b/extra/kaffeine/kaffeine.install
deleted file mode 100644
index 5c501dc49..000000000
--- a/extra/kaffeine/kaffeine.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/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD
index 83e206abb..72b009bfb 100644
--- a/extra/maxima/PKGBUILD
+++ b/extra/maxima/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 207716 2014-03-13 19:21:04Z juergen $
+# $Id: PKGBUILD 210270 2014-04-13 08:41:15Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Damir Perisa <damir@archlinux.org>
pkgname=maxima
-pkgver=5.32.1
-pkgrel=3
+pkgver=5.33.0
+pkgrel=1
pkgdesc="A sophisticated computer algebra system"
arch=('i686' 'x86_64')
license=('GPL')
@@ -17,14 +17,18 @@ optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/
options=('!makeflags' '!zipman') # don't zip info pages or they won't work inside maxima
install=maxima.install
source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" "$pkgname.desktop")
-sha1sums=('8667c9e26fdb2889ceb0641b0abc7372aadd591a'
+sha1sums=('0b57f1ada8676979c6d431d6e114c7b04e1e8c8c'
'4398ebb1ec85ccfa12f37516a56d60c26f74b18b')
-build() {
+prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
# set correct python executable to create docs
sed -i "s|${PYTHONBIN:-python}|python2|" doc/info/extract_categories.sh
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info \
--libexecdir=/usr/lib --enable-sbcl --with-default-lisp=sbcl
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index 2bab10435..e882ec5e0 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,20 +1,29 @@
-# $Id: PKGBUILD 207954 2014-03-15 14:36:28Z lcarlier $
+# $Id: PKGBUILD 210291 2014-04-13 14:05:33Z lcarlier $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgbase=mesa
pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
pkgver=10.1.0
-pkgrel=4
+pkgrel=5
arch=('i686' 'x86_64')
makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto'
'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd')
url="http://mesa3d.sourceforge.net"
license=('custom')
source=(ftp://ftp.freedesktop.org/pub/mesa/10.1/MesaLib-${pkgver}.tar.bz2
- LICENSE)
+ LICENSE
+ workaround-for-robustness-and-reset-with-intel.patch)
md5sums=('3ec43f79dbcd9aa2a4a27bf1f51655b6'
- '5c65a0fe315dd347e09b1f2826a1df5a')
+ '5c65a0fe315dd347e09b1f2826a1df5a'
+ 'b6b744a948b0de9cd14a2a971b7472de')
+
+prepare () {
+ cd ${srcdir}/?esa-*
+
+ # workaround for FS#39803 - https://bugs.freedesktop.org/show_bug.cgi?id=75723
+ patch -Np1 -i ../workaround-for-robustness-and-reset-with-intel.patch
+}
build() {
cd ${srcdir}/?esa-*
diff --git a/extra/mesa/workaround-for-robustness-and-reset-with-intel.patch b/extra/mesa/workaround-for-robustness-and-reset-with-intel.patch
new file mode 100644
index 000000000..dc4a213bb
--- /dev/null
+++ b/extra/mesa/workaround-for-robustness-and-reset-with-intel.patch
@@ -0,0 +1,15 @@
+diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
+index e113654..5790680 100644
+--- a/src/mesa/drivers/dri/i965/brw_context.c
++++ b/src/mesa/drivers/dri/i965/brw_context.c
+@@ -645,7 +645,7 @@ brwCreateContext(gl_api api,
+
+ brw_init_driver_functions(brw, &functions);
+
+- if (notify_reset)
++ if (notify_reset && brw->gen >= 6)
+ functions.GetGraphicsResetStatus = brw_get_graphics_reset_status;
+
+ struct gl_context *ctx = &brw->ctx;
+
+
diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD
deleted file mode 100644
index 239b798bf..000000000
--- a/extra/nss/PKGBUILD
+++ /dev/null
@@ -1,91 +0,0 @@
-# $Id: PKGBUILD 209931 2014-04-09 10:55:38Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=nss
-pkgver=3.16
-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.10.4
-depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh')
-makedepends=('perl')
-options=('!strip' '!makeflags' 'staticlibs')
-source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz
- nss.pc.in
- nss-config.in
- ssl-renegotiate-transitional.patch)
-sha1sums=('981dc6ef2f1e69ec7e2b277ce27c7005e9837f95'
- 'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd'
- 'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c'
- '8a964a744ba098711b80c0d279a2993524e8eb92')
-
-prepare() {
- cd $pkgname-$pkgver
-
- # Adds transitional SSL renegotiate support - patch from Debian
- patch -Np3 -i ../ssl-renegotiate-transitional.patch
-
- # Respect LDFLAGS
- sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/' \
- -i nss/coreconf/rules.mk
-}
-
-
-build() {
- cd $pkgname-$pkgver/nss
-
- export BUILD_OPT=1
- export NSS_USE_SYSTEM_SQLITE=1
- export NSS_ENABLE_ECC=1
- 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 -C coreconf
- make -C lib/dbm
- make
-}
-
-package() {
- 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/extra/nss/nss-config.in b/extra/nss/nss-config.in
deleted file mode 100644
index f8f893e71..000000000
--- a/extra/nss/nss-config.in
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/bin/sh
-
-prefix=@prefix@
-
-major_version=@MOD_MAJOR_VERSION@
-minor_version=@MOD_MINOR_VERSION@
-patch_version=@MOD_PATCH_VERSION@
-
-usage()
-{
- cat <<EOF
-Usage: nss-config [OPTIONS] [LIBRARIES]
-Options:
- [--prefix[=DIR]]
- [--exec-prefix[=DIR]]
- [--includedir[=DIR]]
- [--libdir[=DIR]]
- [--version]
- [--libs]
- [--cflags]
-Dynamic Libraries:
- nss
- nssutil
- ssl
- smime
-EOF
- exit $1
-}
-
-if test $# -eq 0; then
- usage 1 1>&2
-fi
-
-lib_ssl=yes
-lib_smime=yes
-lib_nss=yes
-lib_nssutil=yes
-
-while test $# -gt 0; do
- case "$1" in
- -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
- *) optarg= ;;
- esac
-
- case $1 in
- --prefix=*)
- prefix=$optarg
- ;;
- --prefix)
- echo_prefix=yes
- ;;
- --exec-prefix=*)
- exec_prefix=$optarg
- ;;
- --exec-prefix)
- echo_exec_prefix=yes
- ;;
- --includedir=*)
- includedir=$optarg
- ;;
- --includedir)
- echo_includedir=yes
- ;;
- --libdir=*)
- libdir=$optarg
- ;;
- --libdir)
- echo_libdir=yes
- ;;
- --version)
- echo ${major_version}.${minor_version}.${patch_version}
- ;;
- --cflags)
- echo_cflags=yes
- ;;
- --libs)
- echo_libs=yes
- ;;
- ssl)
- lib_ssl=yes
- ;;
- smime)
- lib_smime=yes
- ;;
- nss)
- lib_nss=yes
- ;;
- nssutil)
- lib_nssutil=yes
- ;;
- *)
- usage 1 1>&2
- ;;
- esac
- shift
-done
-
-# Set variables that may be dependent upon other variables
-if test -z "$exec_prefix"; then
- exec_prefix=`pkg-config --variable=exec_prefix nss`
-fi
-if test -z "$includedir"; then
- includedir=`pkg-config --variable=includedir nss`
-fi
-if test -z "$libdir"; then
- libdir=`pkg-config --variable=libdir nss`
-fi
-
-if test "$echo_prefix" = "yes"; then
- echo $prefix
-fi
-
-if test "$echo_exec_prefix" = "yes"; then
- echo $exec_prefix
-fi
-
-if test "$echo_includedir" = "yes"; then
- echo $includedir
-fi
-
-if test "$echo_libdir" = "yes"; then
- echo $libdir
-fi
-
-if test "$echo_cflags" = "yes"; then
- echo -I$includedir
-fi
-
-if test "$echo_libs" = "yes"; then
- libdirs="-Wl,-rpath-link,$libdir -L$libdir"
- if test -n "$lib_ssl"; then
- libdirs="$libdirs -lssl${major_version}"
- fi
- if test -n "$lib_smime"; then
- libdirs="$libdirs -lsmime${major_version}"
- fi
- if test -n "$lib_nss"; then
- libdirs="$libdirs -lnss${major_version}"
- fi
- if test -n "$lib_nssutil"; then
- libdirs="$libdirs -lnssutil${major_version}"
- fi
- echo $libdirs
-fi
-
diff --git a/extra/nss/nss.pc.in b/extra/nss/nss.pc.in
deleted file mode 100644
index d47b9e146..000000000
--- a/extra/nss/nss.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=%prefix%
-exec_prefix=%exec_prefix%
-libdir=%libdir%
-includedir=%includedir%
-
-Name: NSS
-Description: Network Security Services
-Version: %NSS_VERSION%
-Requires: nspr >= %NSPR_VERSION%
-Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
-Cflags: -I${includedir}
diff --git a/extra/nss/ssl-renegotiate-transitional.patch b/extra/nss/ssl-renegotiate-transitional.patch
deleted file mode 100644
index f457c5551..000000000
--- a/extra/nss/ssl-renegotiate-transitional.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Enable transitional scheme for ssl renegotiation:
-
-(from mozilla/security/nss/lib/ssl/ssl.h)
-Disallow unsafe renegotiation in server sockets only, but allow clients
-to continue to renegotiate with vulnerable servers.
-This value should only be used during the transition period when few
-servers have been upgraded.
-
-diff --git a/mozilla/security/nss/lib/ssl/sslsock.c b/mozilla/security/nss/lib/ssl/sslsock.c
-index f1d1921..c074360 100644
---- a/mozilla/security/nss/lib/ssl/sslsock.c
-+++ b/mozilla/security/nss/lib/ssl/sslsock.c
-@@ -181,7 +181,7 @@ static sslOptions ssl_defaults = {
- PR_FALSE, /* noLocks */
- PR_FALSE, /* enableSessionTickets */
- PR_FALSE, /* enableDeflate */
-- 2, /* enableRenegotiation (default: requires extension) */
-+ 3, /* enableRenegotiation (default: transitional) */
- PR_FALSE, /* requireSafeNegotiation */
- };
-
diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD
index baa09e78b..ed57820e1 100644
--- a/extra/r/PKGBUILD
+++ b/extra/r/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 209657 2014-03-31 18:56:07Z ronald $
+# $Id: PKGBUILD 210268 2014-04-13 08:32:33Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
# Contributor: K. Piche <kpiche@rogers.com>
pkgname=r
-pkgver=3.0.3
+pkgver=3.1.0
pkgrel=1
pkgdesc="Language and environment for statistical computing and graphics"
arch=('i686' 'x86_64')
@@ -22,7 +22,7 @@ source=("http://cran.r-project.org/src/base/R-${pkgver%%.*}/R-${pkgver}.tar.gz"
'r.desktop'
'r.png'
'R.conf')
-sha1sums=('82e83415d27a2fbbdcacb41c4aa14d8b36fdf470'
+sha1sums=('a9d13932c739cc12667c6a17fabd9361624a1708'
'd7fa521345b230a4187d60d07d06ce4b6d573e3f'
'a69a07ec363440efc18ce0a7f2af103375dea978'
'43668da6cfd1b4455a99f23e79e2059294dddac9')
diff --git a/extra/varnish/PKGBUILD b/extra/varnish/PKGBUILD
index 32567111c..b69d6ca31 100644
--- a/extra/varnish/PKGBUILD
+++ b/extra/varnish/PKGBUILD
@@ -1,25 +1,27 @@
-# $Id: PKGBUILD 200724 2013-12-03 14:59:11Z dreisner $
+# $Id: PKGBUILD 210293 2014-04-13 15:14:17Z dreisner $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Douglas Soares de Andrade
# Contributor: Roberto Alsina <ralsina@kde.org>
pkgname=varnish
-pkgver=3.0.5
+pkgver=4.0.0
pkgrel=1
pkgdesc="High-performance HTTP accelerator"
arch=('i686' 'x86_64')
url="http://www.varnish-cache.org/"
license=('BSD')
depends=('gcc' 'libedit' 'pcre')
+makedepends=('python-docutils')
+optdepends=('python: needed for vmod development')
backup=('etc/varnish/default.vcl')
install=$pkgname.install
source=("http://repo.varnish-cache.org/source/$pkgname-$pkgver.tar.gz"
varnish-vcl-reload
varnish.service)
-md5sums=('674d44775cc927aee4601edb37f60198'
+md5sums=('05af2deae29f37b166392a0237756250'
'03196dee7fc68e75069393d52c370762'
- '276f1761b3c7c6a83688038659194bbb')
+ '699d118a069c2e63e49c81f275ce2658')
build() {
cd "$pkgname-$pkgver"
@@ -34,11 +36,17 @@ build() {
}
package() {
- make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+ cd "$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" install
install -m755 "$srcdir/varnish-vcl-reload" "$pkgdir/usr/bin"
install -Dm644 "$srcdir/$pkgname.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+ # config
+ install -Dm644 "etc/example.vcl" "$pkgdir/etc/varnish/default.vcl"
+ install -Dm644 "etc/builtin.vcl" "$pkgdir/usr/share/doc/varnish/builtin.vcl"
+
# license
- install -Dm644 "$pkgname-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
diff --git a/extra/varnish/varnish.install b/extra/varnish/varnish.install
index 1cbb1f16e..66e825f70 100644
--- a/extra/varnish/varnish.install
+++ b/extra/varnish/varnish.install
@@ -4,3 +4,11 @@
post_remove() {
rm -rf var/lib/varnish
}
+
+post_upgrade() {
+ if [ "$(vercmp 4.0.0-1 "$2")" -eq 1 ]; then
+ echo ":: You must update your VCL to be compatible with 4.0.0. See the following"
+ echo " upgrade guide to port your configuration:"
+ echo " https://www.varnish-cache.org/docs/trunk/whats-new/upgrading.html"
+ fi
+}
diff --git a/extra/varnish/varnish.service b/extra/varnish/varnish.service
index 01fda89c2..54c5ac835 100644
--- a/extra/varnish/varnish.service
+++ b/extra/varnish/varnish.service
@@ -1,10 +1,15 @@
[Unit]
-Description=Web Application Accelerator
+Description=High-perfomance HTTP accelerator
After=network.target
[Service]
ExecStart=/usr/bin/varnishd -a 0.0.0.0:80,[::]:80 -f /etc/varnish/default.vcl -T localhost:6082 -s malloc,64M -u nobody -g nobody -F
ExecReload=/usr/bin/varnish-vcl-reload
+PrivateTmp=true
+PrivateDevices=true
+LimitNOFILE=131072
+LimitMEMLOCK=82000
+LimitCORE=infinity
[Install]
WantedBy=multi-user.target
diff --git a/extra/yakuake/PKGBUILD b/extra/yakuake/PKGBUILD
deleted file mode 100644
index 1642a8bd4..000000000
--- a/extra/yakuake/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 169308 2012-10-19 06:54:12Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: James Rayner <iphitus@gmail.com>
-# Contributor: leeghoofd <abcdefg@solcon.nl>
-
-pkgname=yakuake
-pkgver=2.9.9
-pkgrel=1
-pkgdesc="A drop-down terminal emulator based on KDE konsole technology"
-arch=('i686' 'x86_64')
-url='http://yakuake.kde.org/'
-license=('GPL')
-depends=('kdebase-konsole')
-makedepends=('cmake' 'automoc4')
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-md5sums=('ef97612710b28d62e43a58bed49cbead')
-
-build() {
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/yakuake/yakuake.install b/extra/yakuake/yakuake.install
deleted file mode 100644
index c0797237a..000000000
--- a/extra/yakuake/yakuake.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-14 18:16:58 +0000