diff options
Diffstat (limited to 'extra')
495 files changed, 4618 insertions, 5569 deletions
diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD index a552605ac..3ca1c1ce8 100644 --- a/extra/accountsservice/PKGBUILD +++ b/extra/accountsservice/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 182980 2013-04-16 15:48:01Z heftig $ +# $Id: PKGBUILD 185560 2013-05-15 07:14:20Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=accountsservice -pkgver=0.6.31 +pkgver=0.6.32 pkgrel=1 pkgdesc="D-Bus interface for user account query and manipulation" arch=(i686 x86_64 'mips64el') @@ -12,7 +12,7 @@ depends=('glib2' 'polkit' 'systemd') makedepends=('intltool' 'gobject-introspection' 'vala') options=('!libtool') source=($url/$pkgname-$pkgver.tar.xz more-exclusions.patch) -md5sums=('d594f1da95c6a83c0463695ca31815b2' +md5sums=('0c2c87f3bf982bdab54be887fed25bc5' '1d5cf127e5aac407fe7c37b2f4fd503c') build() { diff --git a/extra/alsa-lib/PKGBUILD b/extra/alsa-lib/PKGBUILD index b67790a53..f40c2a88f 100644 --- a/extra/alsa-lib/PKGBUILD +++ b/extra/alsa-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184466 2013-05-07 10:49:12Z tpowa $ +# $Id: PKGBUILD 186216 2013-05-22 06:35:12Z tpowa $ # Maintainer: judd <jvinet@zeroflux.org> pkgname=alsa-lib -pkgver=1.0.27 -pkgrel=2 +pkgver=1.0.27.1 +pkgrel=1 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64' 'mips64el') url="http://www.alsa-project.org" @@ -12,20 +12,7 @@ optdepends=('python2: for python smixer plugin') makedepends=('python2') license=('GPL') options=(!libtool) -source=(ftp://ftp.alsa-project.org/pub/lib/$pkgname-$pkgver.tar.bz2 - alsa-lib-1.0.27-segfault.patch - alsa-lib-1.0.27-kernel.patch - alsa-lib-1.0.27-inline.patch - alsa-lib-1.0.27-inline2.patch) - -prepare() { - cd "$srcdir/$pkgname-$pkgver" - # add upstream patches - patch -Np1 -i "$srcdir/alsa-lib-1.0.27-segfault.patch" - patch -Np1 -i "$srcdir/alsa-lib-1.0.27-kernel.patch" - patch -Np1 -i "$srcdir/alsa-lib-1.0.27-inline.patch" - patch -Np1 -i "$srcdir/alsa-lib-1.0.27-inline2.patch" -} +source=(ftp://ftp.alsa-project.org/pub/lib/$pkgname-$pkgver.tar.bz2) build() { cd "$srcdir/$pkgname-$pkgver" @@ -37,8 +24,4 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums=('f090c7dbd0fe57d786d82e411eac2d08' - '755cfcd116c28feac437eb6b5bdc51bb' - '277e2bc587de25e3294a0f597ae9246e' - 'db14deccb57d8dbcfc6f6d22bed45c1e' - '92ca1fec0cb99bfc302896cf9393a936') +md5sums=('17102aaab10e9d4b19f6b02937bab015') diff --git a/extra/alsa-lib/alsa-lib-1.0.27-inline.patch b/extra/alsa-lib/alsa-lib-1.0.27-inline.patch deleted file mode 100644 index cc5cb8d75..000000000 --- a/extra/alsa-lib/alsa-lib-1.0.27-inline.patch +++ /dev/null @@ -1,155 +0,0 @@ -From 30122df4faf7ccc79b9525db95f55c5a8ed6fe4d Mon Sep 17 00:00:00 2001 -From: Takashi Iwai <tiwai@suse.de> -Date: Thu, 25 Apr 2013 09:52:33 +0200 -Subject: [PATCH] Use __inline__ for exported headers - -Some programs are still using C90. - -Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=817077 -Signed-off-by: Takashi Iwai <tiwai@suse.de> ---- - include/control.h | 4 ++-- - include/iatomic.h | 14 +++++++------- - include/pcm.h | 2 +- - include/pcm_extplug.h | 4 ++-- - include/use-case.h | 4 ++-- - 5 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/include/control.h b/include/control.h -index 27fe2ac..5fdf379 100644 ---- a/include/control.h -+++ b/include/control.h -@@ -234,7 +234,7 @@ int snd_ctl_open_lconf(snd_ctl_t **ctl, const char *name, int mode, snd_config_t - int snd_ctl_open_fallback(snd_ctl_t **ctl, snd_config_t *root, const char *name, const char *orig_name, int mode); - int snd_ctl_close(snd_ctl_t *ctl); - int snd_ctl_nonblock(snd_ctl_t *ctl, int nonblock); --static inline int snd_ctl_abort(snd_ctl_t *ctl) { return snd_ctl_nonblock(ctl, 2); } -+static __inline__ int snd_ctl_abort(snd_ctl_t *ctl) { return snd_ctl_nonblock(ctl, 2); } - int snd_async_add_ctl_handler(snd_async_handler_t **handler, snd_ctl_t *ctl, - snd_async_callback_t callback, void *private_data); - snd_ctl_t *snd_async_handler_get_ctl(snd_async_handler_t *handler); -@@ -532,7 +532,7 @@ int snd_hctl_open(snd_hctl_t **hctl, const char *name, int mode); - int snd_hctl_open_ctl(snd_hctl_t **hctlp, snd_ctl_t *ctl); - int snd_hctl_close(snd_hctl_t *hctl); - int snd_hctl_nonblock(snd_hctl_t *hctl, int nonblock); --static inline int snd_hctl_abort(snd_hctl_t *hctl) { return snd_hctl_nonblock(hctl, 2); } -+static __inline__ int snd_hctl_abort(snd_hctl_t *hctl) { return snd_hctl_nonblock(hctl, 2); } - int snd_hctl_poll_descriptors_count(snd_hctl_t *hctl); - int snd_hctl_poll_descriptors(snd_hctl_t *hctl, struct pollfd *pfds, unsigned int space); - int snd_hctl_poll_descriptors_revents(snd_hctl_t *ctl, struct pollfd *pfds, unsigned int nfds, unsigned short *revents); -diff --git a/include/iatomic.h b/include/iatomic.h -index e92dbfd..5711fe8 100644 ---- a/include/iatomic.h -+++ b/include/iatomic.h -@@ -980,7 +980,7 @@ static __inline__ int atomic_dec_and_test(volatile atomic_t *v) - return result; - } - --static inline int atomic_add_negative(int i, volatile atomic_t *v) -+static __inline__ int atomic_add_negative(int i, volatile atomic_t *v) - { - unsigned long flags; - int result; -@@ -1160,36 +1160,36 @@ typedef struct { - - void snd_atomic_read_wait(snd_atomic_read_t *t); - --static inline void snd_atomic_write_init(snd_atomic_write_t *w) -+static __inline__ void snd_atomic_write_init(snd_atomic_write_t *w) - { - w->begin = 0; - w->end = 0; - } - --static inline void snd_atomic_write_begin(snd_atomic_write_t *w) -+static __inline__ void snd_atomic_write_begin(snd_atomic_write_t *w) - { - w->begin++; - wmb(); - } - --static inline void snd_atomic_write_end(snd_atomic_write_t *w) -+static __inline__ void snd_atomic_write_end(snd_atomic_write_t *w) - { - wmb(); - w->end++; - } - --static inline void snd_atomic_read_init(snd_atomic_read_t *r, snd_atomic_write_t *w) -+static __inline__ void snd_atomic_read_init(snd_atomic_read_t *r, snd_atomic_write_t *w) - { - r->write = w; - } - --static inline void snd_atomic_read_begin(snd_atomic_read_t *r) -+static __inline__ void snd_atomic_read_begin(snd_atomic_read_t *r) - { - r->end = r->write->end; - rmb(); - } - --static inline int snd_atomic_read_ok(snd_atomic_read_t *r) -+static __inline__ int snd_atomic_read_ok(snd_atomic_read_t *r) - { - rmb(); - return r->end == r->write->begin; -diff --git a/include/pcm.h b/include/pcm.h -index e440030..95b8aed 100644 ---- a/include/pcm.h -+++ b/include/pcm.h -@@ -451,7 +451,7 @@ int snd_pcm_poll_descriptors_count(snd_pcm_t *pcm); - int snd_pcm_poll_descriptors(snd_pcm_t *pcm, struct pollfd *pfds, unsigned int space); - int snd_pcm_poll_descriptors_revents(snd_pcm_t *pcm, struct pollfd *pfds, unsigned int nfds, unsigned short *revents); - int snd_pcm_nonblock(snd_pcm_t *pcm, int nonblock); --static inline int snd_pcm_abort(snd_pcm_t *pcm) { return snd_pcm_nonblock(pcm, 2); } -+static __inline__ int snd_pcm_abort(snd_pcm_t *pcm) { return snd_pcm_nonblock(pcm, 2); } - int snd_async_add_pcm_handler(snd_async_handler_t **handler, snd_pcm_t *pcm, - snd_async_callback_t callback, void *private_data); - snd_pcm_t *snd_async_handler_get_pcm(snd_async_handler_t *handler); -diff --git a/include/pcm_extplug.h b/include/pcm_extplug.h -index 884f322..e3b71bc 100644 ---- a/include/pcm_extplug.h -+++ b/include/pcm_extplug.h -@@ -188,7 +188,7 @@ int snd_pcm_extplug_set_slave_param_minmax(snd_pcm_extplug_t *extplug, int type, - /** - * set the parameter constraint with a single value - */ --static inline int snd_pcm_extplug_set_param(snd_pcm_extplug_t *extplug, int type, unsigned int val) -+static __inline__ int snd_pcm_extplug_set_param(snd_pcm_extplug_t *extplug, int type, unsigned int val) - { - return snd_pcm_extplug_set_param_list(extplug, type, 1, &val); - } -@@ -196,7 +196,7 @@ static inline int snd_pcm_extplug_set_param(snd_pcm_extplug_t *extplug, int type - /** - * set the parameter constraint for slave PCM with a single value - */ --static inline int snd_pcm_extplug_set_slave_param(snd_pcm_extplug_t *extplug, int type, unsigned int val) -+static __inline__ int snd_pcm_extplug_set_slave_param(snd_pcm_extplug_t *extplug, int type, unsigned int val) - { - return snd_pcm_extplug_set_slave_param_list(extplug, type, 1, &val); - } -diff --git a/include/use-case.h b/include/use-case.h -index defd4ea..93b3456 100644 ---- a/include/use-case.h -+++ b/include/use-case.h -@@ -354,7 +354,7 @@ int snd_use_case_mgr_reset(snd_use_case_mgr_t *uc_mgr); - * \param list Returned allocated list - * \return Number of list entries if success, otherwise a negative error code - */ --static inline int snd_use_case_card_list(const char **list[]) -+static __inline__ int snd_use_case_card_list(const char **list[]) - { - return snd_use_case_get_list(NULL, NULL, list); - } -@@ -365,7 +365,7 @@ static inline int snd_use_case_card_list(const char **list[]) - * \param list Returned list of verbs - * \return Number of list entries if success, otherwise a negative error code - */ --static inline int snd_use_case_verb_list(snd_use_case_mgr_t *uc_mgr, -+static __inline__ int snd_use_case_verb_list(snd_use_case_mgr_t *uc_mgr, - const char **list[]) - { - return snd_use_case_get_list(uc_mgr, "_verbs", list); --- -1.7.11.7 - diff --git a/extra/alsa-lib/alsa-lib-1.0.27-inline2.patch b/extra/alsa-lib/alsa-lib-1.0.27-inline2.patch deleted file mode 100644 index e99bae864..000000000 --- a/extra/alsa-lib/alsa-lib-1.0.27-inline2.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a8f405b8f90d752c3609b9e918dc949c4efadf87 Mon Sep 17 00:00:00 2001 -From: Takashi Iwai <tiwai@suse.de> -Date: Thu, 25 Apr 2013 09:55:49 +0200 -Subject: [PATCH] Add definition of __inline__ for non-GCC - -Signed-off-by: Takashi Iwai <tiwai@suse.de> ---- - include/asoundlib-head.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/include/asoundlib-head.h b/include/asoundlib-head.h -index 6edbab0..71b5c29 100644 ---- a/include/asoundlib-head.h -+++ b/include/asoundlib-head.h -@@ -40,6 +40,10 @@ - #include <errno.h> - #include <stdarg.h> - -+#ifndef __GNUC__ -+#define __inline__ inline -+#endif -+ - #include <alsa/asoundef.h> - #include <alsa/version.h> - #include <alsa/global.h> --- -1.7.11.7 - diff --git a/extra/alsa-lib/alsa-lib-1.0.27-kernel.patch b/extra/alsa-lib/alsa-lib-1.0.27-kernel.patch deleted file mode 100644 index 3d4eaf3cb..000000000 --- a/extra/alsa-lib/alsa-lib-1.0.27-kernel.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 886f0cc3c274643de464e646535afb4ceee1d816 Mon Sep 17 00:00:00 2001 -From: Daniel Mack <zonque@gmail.com> -Date: Thu, 18 Apr 2013 10:37:50 +0200 -Subject: [PATCH] bring pcm.h and pcm.c in sync with the kernel list - -In particular, this adds definitions and descriptions for G.723 and -DSD types. - -Signed-off-by: Daniel Mack <zonque@gmail.com> -Signed-off-by: Takashi Iwai <tiwai@suse.de> ---- - include/pcm.h | 14 +++++++++++++- - src/pcm/pcm.c | 12 ++++++++++++ - 2 files changed, 25 insertions(+), 1 deletion(-) - -diff --git a/include/pcm.h b/include/pcm.h -index d94ba90..e440030 100644 ---- a/include/pcm.h -+++ b/include/pcm.h -@@ -199,7 +199,19 @@ typedef enum _snd_pcm_format { - SND_PCM_FORMAT_U18_3LE, - /** Unsigned 18bit Big Endian in 3bytes format */ - SND_PCM_FORMAT_U18_3BE, -- SND_PCM_FORMAT_LAST = SND_PCM_FORMAT_U18_3BE, -+ /* G.723 (ADPCM) 24 kbit/s, 8 samples in 3 bytes */ -+ SND_PCM_FORMAT_G723_24, -+ /* G.723 (ADPCM) 24 kbit/s, 1 sample in 1 byte */ -+ SND_PCM_FORMAT_G723_24_1B, -+ /* G.723 (ADPCM) 40 kbit/s, 8 samples in 3 bytes */ -+ SND_PCM_FORMAT_G723_40, -+ /* G.723 (ADPCM) 40 kbit/s, 1 sample in 1 byte */ -+ SND_PCM_FORMAT_G723_40_1B, -+ /* Direct Stream Digital (DSD) in 1-byte samples (x8) */ -+ SND_PCM_FORMAT_DSD_U8, -+ /* Direct Stream Digital (DSD) in 2-byte samples (x16) */ -+ SND_PCM_FORMAT_DSD_U16_LE, -+ SND_PCM_FORMAT_LAST = SND_PCM_FORMAT_DSD_U16_LE, - - #if __BYTE_ORDER == __LITTLE_ENDIAN - /** Signed 16 bit CPU endian */ -diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c -index 2a87a7b..438fb3f 100644 ---- a/src/pcm/pcm.c -+++ b/src/pcm/pcm.c -@@ -1558,6 +1558,12 @@ static const char *const snd_pcm_format_names[] = { - FORMAT(S18_3BE), - FORMAT(U18_3LE), - FORMAT(U18_3BE), -+ FORMAT(G723_24), -+ FORMAT(G723_24_1B), -+ FORMAT(G723_40), -+ FORMAT(G723_40_1B), -+ FORMAT(DSD_U8), -+ FORMAT(DSD_U16_LE), - }; - - static const char *const snd_pcm_format_aliases[SND_PCM_FORMAT_LAST+1] = { -@@ -1611,6 +1617,12 @@ static const char *const snd_pcm_format_descriptions[] = { - FORMATD(S18_3BE, "Signed 18 bit Big Endian in 3bytes"), - FORMATD(U18_3LE, "Unsigned 18 bit Little Endian in 3bytes"), - FORMATD(U18_3BE, "Unsigned 18 bit Big Endian in 3bytes"), -+ FORMATD(G723_24, "G.723 (ADPCM) 24 kbit/s, 8 samples in 3 bytes"), -+ FORMATD(G723_24_1B, "G.723 (ADPCM) 24 kbit/s, 1 sample in 1 byte"), -+ FORMATD(G723_40, "G.723 (ADPCM) 40 kbit/s, 8 samples in 3 bytes"), -+ FORMATD(G723_40_1B, "G.723 (ADPCM) 40 kbit/s, 1 sample in 1 byte"), -+ FORMATD(DSD_U8, "Direct Stream Digital, 1-byte (x8), oldest bit in MSB"), -+ FORMATD(DSD_U16_LE, "Direct Stream Digital, 2-byte (x16), little endian, oldest bits in MSB"), - }; - - static const char *const snd_pcm_type_names[] = { --- -1.7.11.7 - diff --git a/extra/alsa-lib/alsa-lib-1.0.27-segfault.patch b/extra/alsa-lib/alsa-lib-1.0.27-segfault.patch deleted file mode 100644 index 72df46185..000000000 --- a/extra/alsa-lib/alsa-lib-1.0.27-segfault.patch +++ /dev/null @@ -1,102 +0,0 @@ -From e1e40c25535af35fa5cdf7ffc95a01fbff098ddd Mon Sep 17 00:00:00 2001 -From: Takashi Iwai <tiwai@suse.de> -Date: Mon, 15 Apr 2013 18:12:17 +0200 -Subject: [PATCH] Fix doubly call of dlclose() in dlobj caching code - -When multiple dlobj_cache items point to the same dlobj, dlclose() may -be called wrongly multiple times when these items are cleared, because -we manage the dlobj_cache list as a flat list. This results in a bad -segfault we've seen in openal-soft, for example. - -For fixing this, we need the refcounting of dlobj itself. But, in -this case, we don't have to manage yet another list, since dlopen() -does a proper refcounting by itself. That is, we can just call always -dlopen() at each time a new function is assigned, and also call -dlclose() for each released dlobj_cache item at cleanup. - -Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=814250 - -Signed-off-by: Takashi Iwai <tiwai@suse.de> ---- - src/dlmisc.c | 31 +++++++++++-------------------- - 1 file changed, 11 insertions(+), 20 deletions(-) - -diff --git a/src/dlmisc.c b/src/dlmisc.c -index 3788382..2de0234 100644 ---- a/src/dlmisc.c -+++ b/src/dlmisc.c -@@ -208,8 +208,7 @@ void *snd_dlobj_cache_get(const char *lib, const char *name, - { - struct list_head *p; - struct dlobj_cache *c; -- void *func, *dlobj = NULL; -- int dlobj_close = 0; -+ void *func, *dlobj; - - snd_dlobj_lock(); - list_for_each(p, &pcm_dlobj_list) { -@@ -220,7 +219,6 @@ void *snd_dlobj_cache_get(const char *lib, const char *name, - continue; - if (!lib && c->lib) - continue; -- dlobj = c->dlobj; - if (strcmp(c->name, name) == 0) { - c->refcnt++; - func = c->func; -@@ -228,17 +226,16 @@ void *snd_dlobj_cache_get(const char *lib, const char *name, - return func; - } - } -+ -+ dlobj = snd_dlopen(lib, RTLD_NOW); - if (dlobj == NULL) { -- dlobj = snd_dlopen(lib, RTLD_NOW); -- if (dlobj == NULL) { -- if (verbose) -- SNDERR("Cannot open shared library %s", -+ if (verbose) -+ SNDERR("Cannot open shared library %s", - lib ? lib : "[builtin]"); -- snd_dlobj_unlock(); -- return NULL; -- } -- dlobj_close = 1; -+ snd_dlobj_unlock(); -+ return NULL; - } -+ - func = snd_dlsym(dlobj, name, version); - if (func == NULL) { - if (verbose) -@@ -257,8 +254,7 @@ void *snd_dlobj_cache_get(const char *lib, const char *name, - free((void *)c->lib); - free(c); - __err: -- if (dlobj_close) -- snd_dlclose(dlobj); -+ snd_dlclose(dlobj); - snd_dlobj_unlock(); - return NULL; - } -@@ -298,16 +294,11 @@ void snd_dlobj_cache_cleanup(void) - struct list_head *p, *npos; - struct dlobj_cache *c; - -- /* clean up caches only when really no user is present */ - snd_dlobj_lock(); -- list_for_each(p, &pcm_dlobj_list) { -- c = list_entry(p, struct dlobj_cache, list); -- if (c->refcnt) -- goto unlock; -- } -- - list_for_each_safe(p, npos, &pcm_dlobj_list) { - c = list_entry(p, struct dlobj_cache, list); -+ if (c->refcnt) -+ continue; - list_del(p); - snd_dlclose(c->dlobj); - free((void *)c->name); /* shut up gcc warning */ --- -1.7.11.7 - diff --git a/extra/alsa-utils/PKGBUILD b/extra/alsa-utils/PKGBUILD index af7ad9d40..6dfe5274a 100644 --- a/extra/alsa-utils/PKGBUILD +++ b/extra/alsa-utils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183071 2013-04-17 07:11:00Z tpowa $ +# $Id: PKGBUILD 186452 2013-05-26 17:55:09Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=alsa-utils -pkgver=1.0.27 -pkgrel=4 +pkgver=1.0.27.1 +pkgrel=2 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64' 'mips64el') url="http://www.alsa-project.org" @@ -13,25 +13,18 @@ depends=("alsa-lib>1.0.24" 'dialog' 'pciutils' 'ncurses' 'psmisc' 'libsamplerate makedepends=('xmlto' 'docbook-xsl') license=('GPL') source=(ftp://ftp.alsa-project.org/pub/utils/$pkgname-${pkgver}.tar.bz2 - 90alsa - alsa-restore-1.0.27.service.patch - alsactl-fix-buffer-overflow-1.0.27.patch - arecord-1.0.27.patch) + 90alsa) backup=(etc/conf.d/alsa) -prepare() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i ${srcdir}/alsa-restore-1.0.27.service.patch - patch -Np1 -i ${srcdir}/alsactl-fix-buffer-overflow-1.0.27.patch - patch -Np1 -i ${srcdir}/arecord-1.0.27.patch -} - build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --disable-alsaconf \ + ./configure --prefix=/usr --disable-alsaconf --sbindir=/usr/bin \ --with-udev-rules-dir=/usr/lib/udev/rules.d \ --with-systemdsystemunitdir=/usr/lib/systemd/system make + # fix udev rules genaration + cd alsactl + make 90-alsa-restore.rules } package() { @@ -39,11 +32,12 @@ package() { make DESTDIR=${pkgdir} install install -D -m755 ../90alsa ${pkgdir}/etc/pm/sleep.d/90alsa + # install alsa udev rule file + install -D -m644 alsactl/90-alsa-restore.rules \ + ${pkgdir}/usr/lib/udev/rules.d/90-alsa-restore.rules + # dir where to save ALSA state install -d ${pkgdir}/var/lib/alsa } -md5sums=('cbfb21a24f63fb052b3392195639ce48' - '529216f6a46e61a546640e08ea7a0879' - '0a27f7b80351d6baa274c32d859bf037' - 'cd577445636542f9f60b420e4ffe3f0f' - 'cecb38f03bd245d0584bfd63370e9a05') +md5sums=('3d81357b997744a139881ef72bc6921a' + '529216f6a46e61a546640e08ea7a0879') diff --git a/extra/alsa-utils/alsa b/extra/alsa-utils/alsa deleted file mode 100755 index 1e7b57fa3..000000000 --- a/extra/alsa-utils/alsa +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/conf.d/alsa -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Restoring ALSA Levels" - if [[ ! -e /var/lib/alsa/asound.state ]]; then - /usr/sbin/alsactl $ALSA_ARGS store || { stat_fail; exit 1; } - fi - if /usr/sbin/alsactl $ALSA_ARGS restore; then - stat_done - add_daemon alsa - else - stat_fail - exit 1 - fi - - POWERSAVE=${POWERSAVE:-0} - if [[ -e /sys/module/snd_ac97_codec/parameters/power_save ]] \ - && (( $POWERSAVE )); then - echo $POWERSAVE > /sys/module/snd_ac97_codec/parameters/power_save - [[ -c /dev/dsp ]] && echo 1 > /dev/dsp - fi - if [[ -e /sys/module/snd_hda_intel/parameters/power_save ]] \ - && (( $POWERSAVE )); then - echo $POWERSAVE > /sys/module/snd_hda_intel/parameters/power_save - [[ -c /dev/dsp ]] && echo 1 > /dev/dsp - fi - ;; - stop) - SAVE_VOLUME=${SAVE_VOLUME:-yes} - if [[ "$SAVE_VOLUME" = "yes" ]]; then - stat_busy "Saving ALSA Levels" - /usr/sbin/alsactl $ALSA_ARGS store || { stat_fail; exit 1; } - else - stat_busy "Stopping ALSA" - fi - if [ "$MUTE_VOLUME" == "yes" ]; then - /usr/bin/amixer -q set Master 0 mute || { stat_fail; exit 1; } - fi - stat_done - rm_daemon alsa - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - force-restart) - stat_busy "Trying to TERM or KILL processes that are blocking ALSA..." - FILES="$(ls -1 /dev/snd/* | grep -vi control)" - fuser -k -SIGTERM $FILES - fuser -k $FILES - stat_done - $0 restart - ;; - *) - echo "usage: $0 {start|stop|restart|force-restart}" -esac diff --git a/extra/alsa-utils/alsa-restore-1.0.27.service.patch b/extra/alsa-utils/alsa-restore-1.0.27.service.patch deleted file mode 100644 index b3a9d48fd..000000000 --- a/extra/alsa-utils/alsa-restore-1.0.27.service.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- alsa-utils-1.0.27/alsactl/alsa-restore.service.in.old 2013-04-15 14:37:57.326541394 +0200 -+++ alsa-utils-1.0.27/alsactl/alsa-restore.service.in 2013-04-15 14:38:10.179673494 +0200 -@@ -12,6 +12,6 @@ - Conflicts=shutdown.target - - [Service] --Type=oneshop -+Type=oneshot - ExecStart=-@sbindir@/alsactl restore - StandardOutput=syslog diff --git a/extra/alsa-utils/alsa.conf.d b/extra/alsa-utils/alsa.conf.d deleted file mode 100644 index bd50dcca2..000000000 --- a/extra/alsa-utils/alsa.conf.d +++ /dev/null @@ -1,15 +0,0 @@ -# Arguments for alsactl -# example: ALSA_ARGS="--file /var/lib/alsa/asound.state" -ALSA_ARGS="--file /var/lib/alsa/asound.state" - -# Enables powersaving mode for AC97 and hda_intel audio chips. -# Set to 1 to enable powersaving. -# Set to 0 to disable powersaving (default). -POWERSAVE=0 - -# Whether to save volume levels when stopped ("yes" or "no"). -SAVE_VOLUME="yes" - -# Whether to mute the master volume when stopped ("yes" or "no"). -# Useful for bad audio cards which make a noise on system poweroff. -MUTE_VOLUME="no" diff --git a/extra/alsa-utils/alsactl-fix-buffer-overflow-1.0.27.patch b/extra/alsa-utils/alsactl-fix-buffer-overflow-1.0.27.patch deleted file mode 100644 index d4b526614..000000000 --- a/extra/alsa-utils/alsactl-fix-buffer-overflow-1.0.27.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Jaroslav Kysela <perex@perex.cz> -Date: Mon, 15 Apr 2013 12:44:13 +0000 (+0200) -Subject: alsactl: Fix the string size for the lock file contents -X-Git-Url: http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff_plain;h=95788fea25c1a59985828d4b91af0772d077600b - -alsactl: Fix the string size for the lock file contents - -The string length is 10 characters + LF + '\0' = 12 characters. - -Signed-off-by: Jaroslav Kysela <perex@perex.cz> ---- - -diff --git a/alsactl/lock.c b/alsactl/lock.c -index d34d013..fce208b 100644 ---- a/alsactl/lock.c -+++ b/alsactl/lock.c -@@ -35,7 +35,7 @@ static int state_lock_(const char *file, int lock, int timeout) - int fd = -1, err = 0; - struct flock lck; - struct stat st; -- char lcktxt[11]; -+ char lcktxt[12]; - char *nfile; - - if (!do_lock) diff --git a/extra/alsa-utils/arecord-1.0.27.patch b/extra/alsa-utils/arecord-1.0.27.patch deleted file mode 100644 index f9edb2d21..000000000 --- a/extra/alsa-utils/arecord-1.0.27.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Jaroslav Kysela <perex@perex.cz> -Date: Wed, 17 Apr 2013 06:34:34 +0000 (+0200) -Subject: arecord: add a missing break to the capture loop -X-Git-Url: http://git.alsa-project.org/?p=alsa-utils.git;a=commitdiff_plain;h=b4f34ac26037c10ac51c4bb29203500165848977 - -arecord: add a missing break to the capture loop - -Signed-off-by: Jaroslav Kysela <perex@perex.cz> ---- - -diff --git a/aplay/aplay.c b/aplay/aplay.c -index 5bdc39c..000d25b 100644 ---- a/aplay/aplay.c -+++ b/aplay/aplay.c -@@ -3021,6 +3021,9 @@ static void capture(char *orig_name) - fd = -1; - } - -+ if (in_aborting) -+ break; -+ - /* repeat the loop when format is raw without timelimit or - * requested counts of data are recorded - */ diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD index 72551800a..0c302fd47 100644 --- a/extra/amarok/PKGBUILD +++ b/extra/amarok/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 180679 2013-03-25 19:15:28Z bpiotrowski $ +# $Id: PKGBUILD 185605 2013-05-15 22:40:19Z andrea $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=amarok replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') -pkgver=2.7.0 -pkgrel=4 +pkgver=2.7.1 +pkgrel=1 pkgdesc="The powerful music player for KDE" arch=("i686" "x86_64" 'mips64el') url="http://amarok.kde.org/" @@ -23,7 +23,7 @@ optdepends=("libgpod: support for Apple iPod audio devices" "clamz: allow to download songs from Amazon.com") install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('d0ae4a2cb81a54ae94ca24fdb3aed88d7f3a921e') +sha1sums=('445eba6aaadface756410cf0f568a3770d437d2d') build() { mkdir build diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD index d3c7e43b1..ade163a66 100644 --- a/extra/anjuta/PKGBUILD +++ b/extra/anjuta/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183314 2013-04-21 22:06:32Z heftig $ +# $Id: PKGBUILD 186137 2013-05-21 08:51:28Z heftig $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Harley Laue <losinggeneration@yahoo.com> pkgbase=anjuta pkgname=('libanjuta' 'anjuta') -pkgver=3.8.1 +pkgver=3.8.3 pkgrel=1 pkgdesc="GNOME Integrated Development Environment (IDE)" arch=('i686' 'x86_64' 'mips64el') @@ -14,21 +14,12 @@ makedepends=(gdl vte3 autogen devhelp glade libgda subversion gnome-icon-theme v python) url="http://www.anjuta.org/" options=('!libtool' '!emptydirs') -source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz - fix-compile-error.patch anjuta-glade.xml.diff) -sha256sums=('ef5d8a5032d4c2025e1870bef044fa025f01096a86f8f226eb178688a960c5b9' - 'd072af4c1c52ce65f84026b83baa642a9bcfa06b10913b356b5cd99d98931b1d' - 'e480c41a92198c9158f7d66f248b83464e6d0745d5756dae581b204d5439cc4d') +source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) +sha256sums=('06afea1de911067419b774eda2548a729668f93c5463726b353f5db686493f95') build() { cd "$pkgbase-$pkgver" - patch -Np1 -i ../fix-compile-error.patch - patch -Np1 -i ../anjuta-glade.xml.diff - - # Bump vala version - sed -i '/vala/s/-0\.18/-0.20/' configure.ac - ./autogen.sh --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --enable-glade-catalog --enable-compile-warnings=minimum make diff --git a/extra/anjuta/anjuta-glade.xml.diff b/extra/anjuta/anjuta-glade.xml.diff deleted file mode 100644 index a33c530e5..000000000 --- a/extra/anjuta/anjuta-glade.xml.diff +++ /dev/null @@ -1,101 +0,0 @@ -diff -u -rN anjuta-3.8.1/libanjuta/anjuta-glade.xml anjuta-3.8.0/libanjuta/anjuta-glade.xml ---- anjuta-3.8.1/libanjuta/anjuta-glade.xml 1970-01-01 01:00:00.000000000 +0100 -+++ anjuta-3.8.0/libanjuta/anjuta-glade.xml 2012-09-26 22:53:46.000000000 +0200 -@@ -0,0 +1,97 @@ -+<?xml version="1.0" encoding="UTF-8"?> -+ -+<glade-catalog name="anjuta" supports="gtkbuilder" -+ library="gladeanjuta" depends="gtk+"> -+ -+ <glade-widget-classes> -+ <glade-widget-class name="AnjutaVcsStatusTreeView" title="Status Tree View" -+ generic-name="vcsstatus"> -+ -+ <properties> -+ <property id="show-status" default="True" /> -+ <property id="conflicted-selectable" default="True" /> -+ <property id="status-codes" ignore="True"> -+ <displayable-values> -+ <value id="ANJUTA_VCS_STATUS_MODIFIED" name="Modified" /> -+ <value id="ANJUTA_VCS_STATUS_ADDED" name="Added" /> -+ <value id="ANJUTA_VCS_STATUS_DELETED" name="Deleted" /> -+ <value id="ANJUTA_VCS_STATUS_CONFLICTED" name="Conflicted" /> -+ <value id="ANJUTA_VCS_STATUS_UPTODATE" name="Up to date" /> -+ <value id="ANJUTA_VCS_STATUS_LOCKED" name="Locked" /> -+ <value id="ANJUTA_VCS_STATUS_MISSING" name="Missing" /> -+ <value id="ANJUTA_VCS_STATUS_UNVERSIONED" name="Unversioned" /> -+ <value id="ANJUTA_VCS_STATUS_IGNORED" name="Ignored" /> -+ </displayable-values> -+ </property> -+ </properties> -+ </glade-widget-class> -+ -+ <glade-widget-class name="AnjutaDropEntry" title="Drop Entry" -+ generic-name="dropentry" /> -+ -+ <glade-widget-class name="AnjutaFileList" title="File List" -+ generic-name="filelist"> -+ -+ <properties> -+ <property id="show-add-button" default="False" /> -+ </properties> -+ </glade-widget-class> -+ -+ <glade-widget-class name="AnjutaPkgConfigChooser" title="pkg-config chooser" -+ generic-name="pkg_config_chooser" /> -+ -+ <glade-widget-class name="AnjutaColumnTextView" title="Column Text View" -+ generic-name="columntextview" /> -+ -+ <glade-widget-class name="AnjutaFileDropEntry" title="File Drop Entry" -+ generic-name="filedropentry" /> -+ -+ <glade-widget-class name="AnjutaEntry" title="Entry" -+ generic-name="entry"> -+ -+ <properties> -+ <property translatable="True" id="help-text" default="" /> -+ </properties> -+ </glade-widget-class> -+ -+ <glade-widget-class name="AnjutaEnvironmentEditor" title="Environment editor" -+ generic-name="environment_editor" /> -+ -+ <glade-widget-class name="AnjutaTreeComboBox" title="Tree combo box" -+ generic-name="combo"> -+ <properties> -+ <property id="glade-type" disabled="True"/> -+ <property id="label" disabled="True"/> -+ <property id="use-underline" disabled="True"/> -+ <property id="stock" disabled="True"/> -+ </properties> -+ </glade-widget-class> -+ <glade-widget-class name="AnjutaPmChooserButton" title="Project node chooser" -+ generic-name="button" parent="AnjutaTreeComboBox"> -+ <properties> -+ <property id="glade-type" disabled="True"/> -+ <property id="label" disabled="True"/> -+ <property id="use-underline" disabled="True"/> -+ <property id="stock" disabled="True"/> -+ </properties> -+ </glade-widget-class> -+ <glade-widget-class name="GbfProjectView" title="Project node view" -+ generic-name="view" parent="GtkTreeView"> -+ </glade-widget-class> -+ -+ </glade-widget-classes> -+ -+ <glade-widget-group name="Anjuta" title="Anjuta"> -+ <glade-widget-class-ref name="AnjutaVcsStatusTreeView" /> -+ <glade-widget-class-ref name="AnjutaDropEntry" /> -+ <glade-widget-class-ref name="AnjutaFileList" /> -+ <glade-widget-class-ref name="AnjutaPkgConfigChooser" /> -+ <glade-widget-class-ref name="AnjutaColumnTextView" /> -+ <glade-widget-class-ref name="AnjutaFileDropEntry" /> -+ <glade-widget-class-ref name="AnjutaEntry" /> -+ <glade-widget-class-ref name="AnjutaEnvironmentEditor" /> -+ <glade-widget-class-ref name="AnjutaTreeComboBox" /> -+ <glade-widget-class-ref name="AnjutaPmChooserButton" /> -+ <glade-widget-class-ref name="GbfProjectView" /> -+ </glade-widget-group> -+</glade-catalog> diff --git a/extra/anjuta/fix-compile-error.patch b/extra/anjuta/fix-compile-error.patch deleted file mode 100644 index bc8fa7c41..000000000 --- a/extra/anjuta/fix-compile-error.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -u -r anjuta-3.8.0/libanjuta/anjuta-token.c anjuta-3.8.0-fix/libanjuta/anjuta-token.c ---- anjuta-3.8.0/libanjuta/anjuta-token.c 2013-01-14 22:45:09.000000000 +0100 -+++ anjuta-3.8.0-fix/libanjuta/anjuta-token.c 2013-03-31 13:56:11.722332230 +0200 -@@ -329,7 +329,7 @@ - if (string == NULL) - { - /* Value doesn't contain a newline */ -- fprintf (stderr, "(%lu)", length); -+ fprintf (stderr, "(%lu)", (long unsigned)length); - } - else - { -diff -u -r anjuta-3.8.0/plugins/dir-project/dir-project.c anjuta-3.8.0-fix/plugins/dir-project/dir-project.c ---- anjuta-3.8.0/plugins/dir-project/dir-project.c 2012-11-19 00:34:57.000000000 +0100 -+++ anjuta-3.8.0-fix/plugins/dir-project/dir-project.c 2013-03-31 13:55:35.922610895 +0200 -@@ -268,7 +268,7 @@ - { - ptr++; - } while (*ptr == '?'); -- g_string_append_printf (regex, "(.{%d})", ptr - next); -+ g_string_append_printf (regex, "(.{%ld})", (long)(ptr - next)); - } - else if (*ptr == '\\') - { diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD index dbe9af7b7..08e5895df 100644 --- a/extra/avahi/PKGBUILD +++ b/extra/avahi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184361 2013-05-06 19:36:36Z foutrelis $ +# $Id: PKGBUILD 186027 2013-05-20 14:49:50Z bisson $ # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=avahi pkgver=0.6.31 -pkgrel=7 +pkgrel=9 pkgdesc='Multicast/unicast DNS-SD framework' url='http://www.avahi.org/' license=('LGPL') @@ -30,34 +30,32 @@ backup=('etc/avahi/hosts' 'etc/avahi/services/sftp-ssh.service' 'usr/lib/avahi/service-types.db' 'usr/share/avahi/service-types') -source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz" - 'rc.d.patch') -sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684' - '625ad7c131c0c1c383caeddef18fc7a32d8f3ab9') +source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz") +sha1sums=('7e05bd78572c9088b03b1207a0ad5aba38490684') conflicts=('howl' 'mdnsresponder') provides=('howl' 'mdnsresponder') install=install -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" + sed 's:netdev:network:g' -i avahi-daemon/avahi-dbus.conf + sed 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' -i */*.action +} - sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf - patch -p1 -i ../rc.d.patch - - [ "$CARCH" = "mips64el" ] && \ - extra="--disable-mono" - +build() { + cd "${srcdir}/${pkgname}-${pkgver}" export MOC_QT3=/usr/bin/moc-qt3 export MOC_QT4=/usr/bin/moc-qt4 + export PYTHON=/usr/bin/python2 + [ "$CARCH" = "mips64el" ] && extra="--disable-mono" - # pygtk requires python2; make it explicit in case other python are installed: FS#21865 - PYTHON=python2 \ ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ + --sbindir=/usr/bin \ --disable-static \ --disable-monodoc \ --enable-compat-libdns_sd \ @@ -66,8 +64,8 @@ build() { --with-avahi-priv-access-group=network \ --with-autoipd-user=avahi \ --with-autoipd-group=avahi \ - $extra \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ + $extra make } @@ -75,12 +73,9 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - - cd "${pkgdir}" - sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover} - sed -i 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' etc/avahi/avahi-dnsconfd.action + rm -fr "${pkgdir}"/etc/rc.d # howl and mdnsresponder compatability - (cd usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl) - (cd usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc) + cd "${pkgdir}"/usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl + cd "${pkgdir}"/usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc } diff --git a/extra/avahi/rc.d.patch b/extra/avahi/rc.d.patch deleted file mode 100644 index fd735734b..000000000 --- a/extra/avahi/rc.d.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -aur old/initscript/archlinux/avahi-daemon.in new/initscript/archlinux/avahi-daemon.in ---- old/initscript/archlinux/avahi-daemon.in 2011-06-24 03:07:00.916170590 +0200 -+++ new/initscript/archlinux/avahi-daemon.in 2011-06-24 03:16:32.220596377 +0200 -@@ -33,6 +33,7 @@ - - case "$1" in - start) -+ ck_daemon dbus && { echo -n "Start dbus first." >&2; stat_die; } - stat_busy "Starting $DESC" - $DAEMON -D > /dev/null 2>&1 - if [ $? -gt 0 ]; then diff --git a/extra/banshee/PKGBUILD b/extra/banshee/PKGBUILD index e1ae6bf4c..6c1d840d9 100644 --- a/extra/banshee/PKGBUILD +++ b/extra/banshee/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: György Balló <ballogy@freestart.hu> pkgname=banshee -pkgver=2.6.0 -pkgrel=2 +pkgver=2.6.1 +pkgrel=1 pkgdesc="Music management and playback for GNOME" arch=('i686' 'x86_64') url="http://banshee.fm/" @@ -18,7 +18,7 @@ optdepends=('gstreamer0.10-good-plugins: Extra media codecs' options=('!libtool') install=$pkgname.install source=(http://download.gnome.org/sources/$pkgname/2.6/$pkgname-$pkgver.tar.xz) -sha256sums=('a47cc741f8ef2f81726ec4872e8179b17efa271c0c991e912e384fabf777394a') +md5sums=('3c7775eecc079a018c468e9b4ab6cbe3') build() { export MONO_SHARED_DIR="$srcdir/.wabi" diff --git a/extra/baobab/PKGBUILD b/extra/baobab/PKGBUILD index 8242786a5..19ddaa5b7 100644 --- a/extra/baobab/PKGBUILD +++ b/extra/baobab/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183333 2013-04-21 22:08:32Z heftig $ +# $Id: PKGBUILD 185372 2013-05-13 18:01:12Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=baobab -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="A graphical directory tree analyzer" arch=(i686 x86_64 mips64el) @@ -13,7 +13,7 @@ makedepends=('intltool' 'itstool' 'vala' 'gobject-introspection') groups=('gnome') install=$pkgname.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('740c123cbc49f0e479a9c67d7cc7a6330b2a9d3e6a7ffde55665a1130d9209bb') +sha256sums=('68ce73e34378909a384d17355d2b80c14423dc54ace6a363dc93653cf608614a') build() { cd "$pkgname-$pkgver" diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD index 8d3a91031..12f32c9a3 100644 --- a/extra/bitlbee/PKGBUILD +++ b/extra/bitlbee/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183180 2013-04-18 13:14:56Z dreisner $ +# $Id: PKGBUILD 186657 2013-05-30 12:20:27Z dreisner $ # Contributor: FUBAR <mrfubar@gmail.com> # Contributor: simo <simo@archlinux.org> @@ -9,7 +9,7 @@ pkgname=bitlbee pkgver=3.2 -pkgrel=2 +pkgrel=3 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC' url='http://www.bitlbee.org/' license=('GPL') @@ -35,6 +35,7 @@ build() { ./configure \ --prefix=/usr \ --etcdir=/etc/bitlbee \ + --sbindir=/usr/bin \ --pidfile=/run/bitlbee/bitlbee.pid \ --ipcsocket=/run/bitlbee/bitlbee.sock \ --systemdsystemunitdir=/usr/lib/systemd/system \ diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD index 5b1d35995..fc4d04b4e 100644 --- a/extra/bluez/PKGBUILD +++ b/extra/bluez/PKGBUILD @@ -5,7 +5,7 @@ pkgname=bluez pkgver=4.101 -pkgrel=1 +pkgrel=1.1 pkgdesc="Libraries and tools for the Bluetooth protocol stack" url="http://www.bluez.org/" arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/bmp/0.9.7.1-visualization.patch b/extra/bmp/0.9.7.1-visualization.patch deleted file mode 100644 index ac03323f6..000000000 --- a/extra/bmp/0.9.7.1-visualization.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- beep/vis.c 2004-12-04 10:04:29.000000000 +0100 -+++ beep/vis.c 2005-02-17 12:02:25.391044008 +0100 -@@ -223,7 +223,8 @@ vis_draw(Widget * w) - /* FIXME: The check "shouldn't" be neccessary? */ - /* if (GTK_IS_WINDOW(vis->vs_window)) { */ - GDK_THREADS_ENTER(); -- gdk_draw_indexed_image(vis->vs_window, vis->vs_widget.gc, -+ if (GDK_IS_DRAWABLE(vis->vs_window)) -+ gdk_draw_indexed_image(vis->vs_window, vis->vs_widget.gc, - vis->vs_widget.x, vis->vs_widget.y, - vis->vs_widget.width, vis->vs_widget.height, - GDK_RGB_DITHER_NORMAL, (guchar *) rgb_data, diff --git a/extra/bmp/PKGBUILD b/extra/bmp/PKGBUILD deleted file mode 100644 index 10231f63f..000000000 --- a/extra/bmp/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 148682 2012-02-05 11:46:44Z ibiru $ -# Maintainer: Kevin Piche <kevin@archlinux.org> -# Contributor: Ben <contrasutra@myrealbox.com> - -pkgname=bmp -pkgver=0.9.7.1 -pkgrel=9.2 -pkgdesc="gtk2 port of xmms" -arch=(i686 x86_64 mips64el) -url="http://sourceforge.net/projects/beepmp/" -license=('GPL') -depends=('id3lib' 'libglade' 'libsm' 'libvorbis' 'alsa-lib' 'unzip' 'desktop-file-utils') -makedepends=('libxt') -options=('!libtool' '!makeflags') -install=bmp.install -source=(http://downloads.sourceforge.net/sourceforge/beepmp/${pkgname}-${pkgver}.tar.gz \ - ${pkgver}-visualization.patch bmp-${pkgver}-crossfade-0.3.9.patch) -md5sums=('c25d5a8d49cc5851d13d525a20023c4c' - 'fa1bdf5a8d03e8539a6bed5caa471176' - '42ad4109ddb66024d4c6d1f3e572ab86') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 -i ../${pkgver}-visualization.patch - patch -p1 -i ../${pkgname}-${pkgver}-crossfade-0.3.9.patch - LIBS+="-lgmodule-2.0 -lm" ./configure --prefix=/usr --mandir=/usr/share/man - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} -# vim: ts=2 sw=2 et ft=sh diff --git a/extra/bmp/bmp-0.9.7.1-crossfade-0.3.9.patch b/extra/bmp/bmp-0.9.7.1-crossfade-0.3.9.patch deleted file mode 100644 index 4c1e46da9..000000000 --- a/extra/bmp/bmp-0.9.7.1-crossfade-0.3.9.patch +++ /dev/null @@ -1,108 +0,0 @@ -Patch taken from xmms-crossfade 3.10 tarball. Required for crossfade to -work. http://www.eisenlohr.org/xmms-crossfade/ - -diff -ur bmp-0.9.7.1/beep/mainwin.c bmp-0.9.7.1.patched/beep/mainwin.c ---- bmp-0.9.7.1/beep/mainwin.c 2005-05-09 10:45:39.000000000 +0200 -+++ bmp-0.9.7.1.patched/beep/mainwin.c 2005-11-25 00:03:59.000000000 +0100 -@@ -655,9 +655,11 @@ - mainwin_set_shade(!cfg.player_shaded); - } - -+gboolean is_quitting = FALSE; - void - mainwin_quit_cb(void) - { -+ is_quitting = TRUE; - gtk_widget_hide(equalizerwin); - gtk_widget_hide(playlistwin); - gtk_widget_hide(mainwin); -@@ -1318,7 +1320,7 @@ - change_song(guint pos) - { - if (bmp_playback_get_playing()) -- bmp_playback_stop(); -+ bmp_playback_stop_for_restart(); - - playlist_set_position(pos); - bmp_playback_initiate(); -diff -ur bmp-0.9.7.1/beep/playback.c bmp-0.9.7.1.patched/beep/playback.c ---- bmp-0.9.7.1/beep/playback.c 2005-01-26 06:56:15.000000000 +0100 -+++ bmp-0.9.7.1.patched/beep/playback.c 2005-11-25 00:03:59.000000000 +0100 -@@ -89,7 +89,7 @@ - return; - - if (bmp_playback_get_playing()) -- bmp_playback_stop(); -+ bmp_playback_stop_for_restart(); - - vis_clear_data(mainwin_vis); - vis_clear_data(playlistwin_vis); -@@ -135,6 +135,15 @@ - get_current_input_plugin()->pause(ip_data.paused); - } - -+gboolean input_stopped_for_restart = FALSE; -+void -+bmp_playback_stop_for_restart(void) -+{ -+ input_stopped_for_restart = TRUE; -+ bmp_playback_stop(); -+ input_stopped_for_restart = FALSE; -+} -+ - void - bmp_playback_stop(void) - { -diff -ur bmp-0.9.7.1/beep/playback.h bmp-0.9.7.1.patched/beep/playback.h ---- bmp-0.9.7.1/beep/playback.h 2004-12-04 10:04:26.000000000 +0100 -+++ bmp-0.9.7.1.patched/beep/playback.h 2005-11-25 00:03:59.000000000 +0100 -@@ -26,6 +26,7 @@ - void bmp_playback_initiate(void); - void bmp_playback_pause(void); - void bmp_playback_stop(void); -+void bmp_playback_stop_for_restart(void); - gboolean bmp_playback_play_file(const gchar * filename); - gboolean bmp_playback_get_playing(void); - gboolean bmp_playback_get_paused(void); -diff -ur bmp-0.9.7.1/beep/playlist.c bmp-0.9.7.1.patched/beep/playlist.c ---- bmp-0.9.7.1/beep/playlist.c 2005-08-11 09:25:51.000000000 +0200 -+++ bmp-0.9.7.1.patched/beep/playlist.c 2005-11-25 00:03:59.000000000 +0100 -@@ -817,7 +817,7 @@ - if (bmp_playback_get_playing()) { - /* We need to stop before changing playlist_position */ - PLAYLIST_UNLOCK(); -- bmp_playback_stop(); -+ bmp_playback_stop_for_restart(); - PLAYLIST_LOCK(); - restart_playing = TRUE; - } -@@ -868,7 +868,7 @@ - if (bmp_playback_get_playing()) { - /* We need to stop before changing playlist_position */ - PLAYLIST_UNLOCK(); -- bmp_playback_stop(); -+ bmp_playback_stop_for_restart(); - PLAYLIST_LOCK(); - restart_playing = TRUE; - } -@@ -1018,7 +1018,7 @@ - if (bmp_playback_get_playing()) { - /* We need to stop before changing playlist_position */ - PLAYLIST_UNLOCK(); -- bmp_playback_stop(); -+ bmp_playback_stop_for_restart(); - PLAYLIST_LOCK(); - restart_playing = TRUE; - } -@@ -1047,7 +1047,10 @@ - { - GList *plist_pos_list; - -- bmp_playback_stop(); -+ if (cfg.repeat) -+ bmp_playback_stop_for_restart(); -+ else -+ bmp_playback_stop(); - - PLAYLIST_LOCK(); - plist_pos_list = find_playlist_position_list(); diff --git a/extra/bmp/bmp.install b/extra/bmp/bmp.install deleted file mode 100644 index 2eaa60550..000000000 --- a/extra/bmp/bmp.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/extra/cairo-perl/PKGBUILD b/extra/cairo-perl/PKGBUILD index b6fa0a72c..91b9e4fb2 100644 --- a/extra/cairo-perl/PKGBUILD +++ b/extra/cairo-perl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183105 2013-04-17 15:04:54Z jgc $ +# $Id: PKGBUILD 186371 2013-05-26 09:24:20Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=cairo-perl pkgver=1.103 -pkgrel=1 +pkgrel=2 pkgdesc="Perl wrappers for cairo" arch=(i686 x86_64 'mips64el') license=('LGPL') diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 25086fd32..cd20d86ff 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184364 2013-05-06 19:36:46Z foutrelis $ +# $Id: PKGBUILD 186633 2013-05-30 10:57:28Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> @@ -17,8 +17,8 @@ pkgname=('calligra-filters' 'calligra-handbook' 'calligra-braindump' 'calligra-flow') -pkgver=2.6.3 -pkgrel=4 +pkgver=2.6.4 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') @@ -29,7 +29,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs' 'eigen2' 'kdeedu-marble' [ "$CARCH" != "mips64el" ] && makedepends+=('vc') groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('90d6bb619191abbcc94094379d47e225') +md5sums=('a38fdc882888469ea8b0dea949c05dda') build() { mkdir build diff --git a/extra/capi4hylafax/PKGBUILD b/extra/capi4hylafax/PKGBUILD index cd19fe056..2eb3af3eb 100644 --- a/extra/capi4hylafax/PKGBUILD +++ b/extra/capi4hylafax/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 159422 2012-05-24 06:11:44Z tpowa $ +# $Id: PKGBUILD 186226 2013-05-22 09:28:57Z tpowa $ #Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=capi4hylafax pkgver=010300 -pkgrel=8 +pkgrel=9 pkgdesc="capi plugin for hylafax to enable isdn faxing" arch=(i686 x86_64 'mips64el') url="ftp://ftp.avm.de/tools" @@ -11,18 +11,24 @@ license=('GPL') depends=('glibc' 'isdn4k-utils' 'hylafax' 'gcc-libs' 'libtiff' 'dialog') source=(ftp://ftp.avm.de/tools/capi4hylafax.linux/capi4hylafax-01.03.00.tar.gz config.faxCAPI - capi4hylafax.rc c2faxrecv.service - capi4hylafax.conf) + capi4hylafax.conf + capi4hylafax-compile-gcc48-fix.patch) install=capi4hylafax.install backup=(var/spool/hylafax/etc/config.faxCAPI) -build() { +prepare() { cd "$srcdir"/$pkgname-01.03.00 -# fix config file + # fix compiling with gcc48 + patch -Np1 -i $srcdir/capi4hylafax-compile-gcc48-fix.patch + # fix config file sed -i -e 's#/etc/config.faxCAPI#/var/spool/hylafax/etc/config.faxCAPI#g' src/defaults.h.in autoreconf --force --install +} + +build() { + cd "$srcdir"/$pkgname-01.03.00 ./configure make } @@ -33,7 +39,6 @@ package() { install -m755 -D src/faxrecv/c2faxrecv "$pkgdir"/usr/bin/c2faxrecv install -m755 -D setupconffile "$pkgdir"/usr/bin/c2faxaddmodem install -m644 -D "$srcdir"/config.faxCAPI "$pkgdir"/var/spool/hylafax/etc/config.faxCAPI - install -m755 -D "$srcdir"/capi4hylafax.rc "$pkgdir"/etc/rc.d/capi4hylafax # adding FIFO mkfifo "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI chown 10 "$pkgdir"/var/spool/hylafax/FIFO.faxCAPI @@ -59,6 +64,10 @@ EOF } md5sums=('d37dc652ac80d1525ef8693be55ee67f' '653b60695d21c128f020a86274ca9192' - '1fe40c58289fa3ba625ce6fe2fdb3d07' 'e2c085a00189ded0a659642c689a1be2' '7c41d4fa5c5ef7b1372813341fd0d02b') +md5sums=('d37dc652ac80d1525ef8693be55ee67f' + '653b60695d21c128f020a86274ca9192' + 'e2c085a00189ded0a659642c689a1be2' + '7c41d4fa5c5ef7b1372813341fd0d02b' + 'fa01597396c5493f90243a8d9e2841c0') diff --git a/extra/capi4hylafax/capi4hylafax-compile-gcc48-fix.patch b/extra/capi4hylafax/capi4hylafax-compile-gcc48-fix.patch new file mode 100644 index 000000000..88d948366 --- /dev/null +++ b/extra/capi4hylafax/capi4hylafax-compile-gcc48-fix.patch @@ -0,0 +1,11 @@ +--- capi4hylafax-01.03.00/src/standard/aStdLib.cpp.old 2013-05-21 16:55:37.031658830 +0200 ++++ capi4hylafax-01.03.00/src/standard/aStdLib.cpp 2013-05-21 16:55:42.314905957 +0200 +@@ -233,7 +233,7 @@ + + tUInt a_pointer2string (void *pointer, tWiChar *string) { + tULong p = (tULong) pointer; +- tWiChar *fmt = (sizeof (p) > 4) ? L" . : . " : L" : "; // must be symmetric! ++ const tWiChar *fmt = (sizeof (p) > 4) ? L" . : . " : L" : "; // must be symmetric! + unsigned i = s_strlen (fmt); + + string[i] = '\0'; diff --git a/extra/capi4hylafax/capi4hylafax.rc b/extra/capi4hylafax/capi4hylafax.rc deleted file mode 100755 index 51025b020..000000000 --- a/extra/capi4hylafax/capi4hylafax.rc +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/c2faxrecv` -case "$1" in - start) - stat_busy "Starting capi4hylafax" - if [ -z "$PID" ]; then - /usr/bin/c2faxrecv > /dev/null & - faxmodem faxCAPI - fi - if [ ! -f /var/run/faxq.pid ]; then - stat_fail - echo "ERROR: hylafax is not running" - exit 1 - fi - if [ ! -f /var/run/hfaxd.pid ]; then - stat_fail - echo "ERROR: hylafax is not running" - exit 1 - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon capi4hylafax - stat_done - fi - ;; - stop) - stat_busy "Stopping capi4hylafax" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon capi4hylafax - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/cd-discid/PKGBUILD b/extra/cd-discid/PKGBUILD index 8814b9ac1..5dc3c5ec4 100644 --- a/extra/cd-discid/PKGBUILD +++ b/extra/cd-discid/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 150504 2012-02-18 11:38:44Z pierre $ +# $Id: PKGBUILD 185504 2013-05-14 12:01:48Z eric $ # Maintainer: # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Jochem Kossen <j.kossen@home.nl> pkgname=cd-discid -pkgver=0.9 -pkgrel=4.1 +pkgver=1.4 +pkgrel=1 pkgdesc="A backend utility to get CDDB discid information from a CD-ROM disc" arch=('i686' 'x86_64' 'mips64el') -url="http://lly.org/~rcw/cd-discid/" +url="http://linukz.org/cd-discid.shtml" license=('GPL') depends=('glibc') -source=("http://lly.org/~rcw/$pkgname/${pkgname}_${pkgver}.orig.tar.gz") -md5sums=('64677b8b63d1db0db015043f5455171a') +source=("http://linukz.org/download/${pkgname}-${pkgver}.tar.gz") +md5sums=('85027b71d08fbbfb11ac2f0db6e8cea7') build() { - cd "${srcdir}"/$pkgname-$pkgver + cd $pkgname-$pkgver make } package() { - cd "${srcdir}"/$pkgname-$pkgver - make DESTDIR="${pkgdir}" INSTALL=/usr/bin/install install + cd $pkgname-$pkgver + make DESTDIR="${pkgdir}" PREFIX=/usr STRIP="/usr/bin/true" install } diff --git a/extra/cheese/PKGBUILD b/extra/cheese/PKGBUILD index c07352cef..ecb976ca3 100644 --- a/extra/cheese/PKGBUILD +++ b/extra/cheese/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183338 2013-04-21 22:08:39Z heftig $ +# $Id: PKGBUILD 186990 2013-06-02 19:42:17Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=cheese -pkgver=3.8.1 -pkgrel=1 +pkgver=3.8.2 +pkgrel=2 pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others" arch=(i686 x86_64 'mips64el') license=('GPL') @@ -16,12 +16,16 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org/projects/cheese/" install=cheese.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('e9f7a7855c52451cfc59ffa23962eaa5fda7c9bc629bb975f4328af061d01eeb') +sha256sums=('79d21f2a7ebf1e91b2c2aa595f3a6dcf899258b1d2e307371440540c3d3a4ec3') build() { cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --disable-schemas-compile + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } diff --git a/extra/chromaprint/PKGBUILD b/extra/chromaprint/PKGBUILD index b290cfd3f..defbf418b 100644 --- a/extra/chromaprint/PKGBUILD +++ b/extra/chromaprint/PKGBUILD @@ -1,25 +1,21 @@ -# $Id: PKGBUILD 179542 2013-03-06 13:51:08Z bisson $ +# $Id: PKGBUILD 185532 2013-05-14 19:17:44Z heftig $ # Contributor: Wieland Hoffmann <the_mineo@web.de> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=chromaprint pkgver=0.7 -pkgrel=4 +pkgrel=5 pkgdesc='Library that implements a custom algorithm for extracting fingerprints from any audio source' url='http://acoustid.org/chromaprint/' arch=('i686' 'x86_64' 'mips64el') license=('LGPL') depends=('ffmpeg') -makedepends=('cmake') -source=("https://github.com/downloads/lalinsky/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'ffmpeg.patch') -sha1sums=('6a961585e82d26d357eb792216becc0864ddcdb2' - '4c99e8be678ccd0373ab1c0b52c068d6fabe21a2') +makedepends=('cmake' 'git') +source=('git+https://bitbucket.org/acoustid/chromaprint.git#commit=dd51f8e') +sha1sums=('SKIP') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -p1 -i ../ffmpeg.patch + cd "${srcdir}/${pkgname}" cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -30,6 +26,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}" make DESTDIR="${pkgdir}" install } diff --git a/extra/chromaprint/ffmpeg.patch b/extra/chromaprint/ffmpeg.patch deleted file mode 100644 index 4c41ca664..000000000 --- a/extra/chromaprint/ffmpeg.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur old/examples/fpcalc.c new/examples/fpcalc.c ---- old/examples/fpcalc.c 2012-09-06 04:05:36.000000000 +1000 -+++ new/examples/fpcalc.c 2013-03-07 00:43:11.950928188 +1100 -@@ -65,6 +65,9 @@ - goto done; - } - -+ /* request regular signed 16-bit packed format */ -+ codec_ctx->request_sample_fmt = AV_SAMPLE_FMT_S16; -+ - if (avcodec_open(codec_ctx, codec) < 0) { - fprintf(stderr, "ERROR: couldn't open the codec\n"); - goto done; -@@ -146,6 +149,7 @@ - int ostride[6] = { 2 }; - int len = buffer_size / istride[0]; - if (av_audio_convert(convert_ctx, obuf, ostride, ibuf, istride, len) < 0) { -+ fprintf(stderr, "WARNING: unable to convert %d samples\n", buffer_size); - break; - } - buffer = buffer2; diff --git a/extra/cifs-utils/PKGBUILD b/extra/cifs-utils/PKGBUILD index e6a70c6df..621c57386 100644 --- a/extra/cifs-utils/PKGBUILD +++ b/extra/cifs-utils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 182654 2013-04-12 07:11:03Z tpowa $ +# $Id: PKGBUILD 185803 2013-05-19 09:33:05Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=cifs-utils pkgver=6.0 -pkgrel=1 +pkgrel=2 pkgdesc="CIFS filesystem user-space tools" arch=(i686 x86_64 'mips64el') url="http://wiki.samba.org/index.php/LinuxCIFS_utils" @@ -14,7 +14,7 @@ build() { cd "$srcdir/$pkgname-$pkgver" # systemd support is broken in mount.cifs # https://bugs.archlinux.org/task/30958 - ./configure --prefix=/usr --disable-systemd + ./configure --prefix=/usr --sbindir=/usr/bin --disable-systemd make } diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD index 070495a47..039a58c76 100644 --- a/extra/clamav/PKGBUILD +++ b/extra/clamav/PKGBUILD @@ -1,30 +1,26 @@ -# $Id: PKGBUILD 183595 2013-04-24 06:52:38Z bisson $ +# $Id: PKGBUILD 186028 2013-05-20 14:50:00Z bisson $ # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Gregor Ibic <gregor.ibic@intelicom.si> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=clamav pkgver=0.97.8 -pkgrel=1 +pkgrel=2 pkgdesc='Anti-virus toolkit for Unix' url='http://www.clamav.net/' license=('GPL') options=('!libtool') arch=('i686' 'x86_64' 'mips64el') depends=('bzip2' 'libltdl') -backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf' 'etc/conf.d/clamav') +backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf') source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" - 'rc.d' - 'conf.d' 'service' 'service.fresh' 'logrotate' 'tmpfiles.d' 'config.patch') sha1sums=('078c0ac2b4e69d27eecd7544a8361abcd859e73c' - 'c9d508c1e5972f0f849d8694c1872455fa9e74de' - 'cb116cdab49a810381a515cbcfb6a6c148547f07' - 'df522b0488f3901e491f148c9300f6bae348c605' + 'b6ac0c5de1e5b41232b10d4f84e86201c370eaeb' 'cda9a087e5593992150cb456e34c5f6f589aca82' '7cace58743a36dae3e63e5e0c6cc73ea5ef9a6ee' 'a224ea9b4d0f4f196827347d54bed51e11c197ea' @@ -41,6 +37,7 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ --prefix=/usr \ + --sbindir=/usr/bin \ --sysconfdir=/etc/clamav \ --with-dbdir=/var/lib/clamav \ --disable-clamav \ @@ -61,8 +58,6 @@ package() { install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/clamd.service install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/clamav.conf install -Dm644 ../logrotate "${pkgdir}"/etc/logrotate.d/clamav - install -Dm644 ../conf.d "${pkgdir}"/etc/conf.d/clamav - install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/clamav install -d -o 64 -g 64 "${pkgdir}"/run/clamav install -d -o 64 -g 64 "${pkgdir}"/var/log/clamav diff --git a/extra/clamav/conf.d b/extra/clamav/conf.d deleted file mode 100644 index 9cd44d9f8..000000000 --- a/extra/clamav/conf.d +++ /dev/null @@ -1,8 +0,0 @@ -# clamav startup script config options - -# change these to "yes" to start -START_FRESHCLAM="no" -START_CLAMD="no" - -# Options to pass to freshclam (man freshclam for more info). -FRESHCLAM_OPTS="-c 12" diff --git a/extra/clamav/rc.d b/extra/clamav/rc.d deleted file mode 100644 index 127c86c0f..000000000 --- a/extra/clamav/rc.d +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -[[ -f /etc/conf.d/clamav ]] && source /etc/conf.d/clamav - -PID_FC=$(pidof -o %PPID /usr/bin/freshclam) -PID_CD=$(pidof -o %PPID /usr/sbin/clamd) - -case "$1" in - start) - if [[ $START_CLAMD = yes ]]; then - stat_busy "Starting ClamD" - [[ -z $PID_CD ]] && /usr/sbin/clamd - if [[ $? -gt 0 ]]; then - stat_fail - else - add_daemon clamav - stat_done - fi - fi - sleep 1 - if [[ $START_FRESHCLAM = yes ]]; then - stat_busy "Starting FreshClam" - [[ -z $PID_FC ]] && /usr/bin/freshclam -p /run/clamav/freshclam.pid -d $FRESHCLAM_OPTS - if [[ $? -gt 0 ]]; then - stat_fail - else - add_daemon clamav - stat_done - fi - fi - ;; - stop) - if [[ $START_CLAMD = yes ]]; then - stat_busy "Stopping ClamD" - [[ -n $PID_CD ]] && kill $PID_CD &> /dev/null - if [[ $? -gt 0 ]]; then - stat_fail - else - rm_daemon clamav - stat_done - fi - fi - - if [[ $START_FRESHCLAM = yes ]]; then - stat_busy "Stopping FreshClam" - [[ -n $PID_FC ]] && kill $PID_FC &> /dev/null - if [[ $? -gt 0 ]]; then - stat_fail - else - rm_daemon clamav - stat_done - fi - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/clamav/service b/extra/clamav/service index 5bf9eb14e..86608c40e 100644 --- a/extra/clamav/service +++ b/extra/clamav/service @@ -4,7 +4,7 @@ Description=clamav daemon [Service] Type=forking PIDFile=/run/clamav/clamd.pid -ExecStart=/usr/sbin/clamd +ExecStart=/usr/bin/clamd [Install] WantedBy=multi-user.target diff --git a/extra/clutter-gst/PKGBUILD b/extra/clutter-gst/PKGBUILD index 54891f7b8..2b701d62a 100644 --- a/extra/clutter-gst/PKGBUILD +++ b/extra/clutter-gst/PKGBUILD @@ -1,29 +1,36 @@ -# $Id: PKGBUILD 183340 2013-04-21 22:08:41Z heftig $ +# $Id: PKGBUILD 186989 2013-06-02 19:40:09Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=clutter-gst -pkgver=2.0.2 +pkgver=2.0.4 pkgrel=2 pkgdesc="GStreamer bindings for clutter" arch=('i686' 'x86_64' 'mips64el') url="http://www.clutter-project.org/" -license=('LGPL') -depends=('clutter' 'gst-plugins-base-libs' 'libxdamage') -makedepends=('gobject-introspection') +license=(LGPL) +depends=(clutter gst-plugins-base-libs libxdamage gst-plugins-bad) +makedepends=(gobject-introspection) options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('577957598d6ee407348dc5d78879da2b212ae54fb3071f86f8409e393dde34c4') +sha256sums=('bad69cca7dd9c0d54d4f9fc27cba59dd8d8b329db058844716dbdecec6caba97') build() { cd $pkgname-$pkgver ./configure \ --prefix=/usr \ --sysconfdir=/etc - rm libtool - ln -s /usr/bin/libtool . + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } +check() { + cd $pkgname-$pkgver + make check +} + package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install diff --git a/extra/clutter/PKGBUILD b/extra/clutter/PKGBUILD index 2da7dc023..2433a321b 100644 --- a/extra/clutter/PKGBUILD +++ b/extra/clutter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183339 2013-04-21 22:08:40Z heftig $ +# $Id: PKGBUILD 186662 2013-05-30 12:24:29Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=clutter -pkgver=1.14.2 +pkgver=1.14.4 pkgrel=2 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces" arch=('i686' 'x86_64' 'mips64el') @@ -14,12 +14,16 @@ license=('LGPL') depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi' 'libxkbcommon') makedepends=('gobject-introspection') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('b2bdf7090f7ba34a69e07a58d43ff8088c81d6dbb56677ae4b103b6cba1920a8') +sha256sums=('c996d91fff6fff24d9e23dcd545439ebc6b999fb1cf9ee44c28ca54c49c0ee1c') build() { cd "$pkgname-$pkgver" ./configure --prefix=/usr --enable-introspection \ --enable-wayland-{backend,compositor} --enable-egl-backend --enable-evdev-input + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD index f6ae39a5c..35d1b4d71 100644 --- a/extra/cmake/PKGBUILD +++ b/extra/cmake/PKGBUILD @@ -1,33 +1,24 @@ -# $Id: PKGBUILD 179599 2013-03-07 17:46:37Z andrea $ +# $Id: PKGBUILD 186227 2013-05-22 10:21:47Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=cmake -pkgver=2.8.10.2 -pkgrel=5 +pkgver=2.8.11 +pkgrel=1 pkgdesc="A cross-platform open-source make system" arch=('i686' 'x86_64' 'mips64el') url="http://www.cmake.org/" license=('custom') depends=('curl' 'libarchive' 'shared-mime-info') -makedepends=('qt5-base' 'emacs') -optdepends=('qt5-base: cmake-gui') +makedepends=('qt4' 'emacs') +optdepends=('qt4: cmake-gui') install="${pkgname}.install" -source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz" - 'qt4.patch') -md5sums=('097278785da7182ec0aea8769d06860c' - '4933fbe934d3989923f0a60a78dac44e') +source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz") +md5sums=('be6008f2299613d23fe82ab53ef7472e') build() { cd ${pkgname}-${pkgver} - # qmake refers to Qt5 - patch -p1 -i "${srcdir}"/qt4.patch - - # Qt is built with reduce-relocations - export CFLAGS="${CFLAGS} -fPIC" - export CXXFLAGS="${CXXFLAGS} -fPIC" - ./bootstrap --prefix=/usr \ --mandir=/share/man \ --docdir=/share/doc/cmake \ diff --git a/extra/cogl/PKGBUILD b/extra/cogl/PKGBUILD index 7a7a29698..39f90d60c 100644 --- a/extra/cogl/PKGBUILD +++ b/extra/cogl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183342 2013-04-21 22:08:43Z heftig $ +# $Id: PKGBUILD 186660 2013-05-30 12:23:15Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=cogl pkgver=1.14.0 -pkgrel=2 +pkgrel=3 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer" arch=(mips64el) url="http://www.clutter-project.org/" @@ -18,6 +18,10 @@ build() { cd "$pkgname-$pkgver" ./configure --prefix=/usr \ --enable-wayland-egl-{platform,server} --enable-gles{1,2} + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD index a079913f0..1f01a480d 100644 --- a/extra/colord/PKGBUILD +++ b/extra/colord/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184190 2013-05-03 11:21:48Z heftig $ +# $Id: PKGBUILD 185329 2013-05-13 11:18:43Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> pkgname=colord -pkgver=0.1.34 +pkgver=1.0.0 pkgrel=1 pkgdesc="System daemon for managing color devices" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ options=('!libtool') install=colord.install backup=(etc/colord.conf) source=($url/releases/$pkgname-$pkgver.tar.xz) -sha1sums=('e4168ca34c2ce228276299efaf12d2f9fb7ecb2e') +sha1sums=('a01547080f0905dacca37c5ded3886431144a36a') build() { cd $pkgname-$pkgver diff --git a/extra/cpio/PKGBUILD b/extra/cpio/PKGBUILD index 94d607333..d635193cc 100644 --- a/extra/cpio/PKGBUILD +++ b/extra/cpio/PKGBUILD @@ -1,22 +1,24 @@ -# $Id: PKGBUILD 149526 2012-02-08 11:43:48Z tpowa $ +# $Id: PKGBUILD 185699 2013-05-17 11:26:28Z tpowa $ # Maintainer: judd <jvinet@zeroflux.org> pkgname=cpio pkgver=2.11 -pkgrel=3.1 +pkgrel=4 pkgdesc="A tool to copy files into or out of a cpio or tar archive" arch=(i686 x86_64 'mips64el') license=('GPL') url="http://www.gnu.org/software/cpio" depends=('glibc') source=(ftp://ftp.gnu.org/gnu/cpio/cpio-${pkgver}.tar.gz - gets.patch) + cpio-2.11-stdio.in.patch) install=cpio.install -md5sums=('1112bb6c45863468b5496ba128792f6c' - 'e9e9d1d64a2caa4b9f49b08dc09298db') + +prepare() { + cd ${srcdir}/${pkgname}-${pkgver} + patch -Np1 -i ${srcdir}/cpio-2.11-stdio.in.patch +} build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -p1 -i "$srcdir/gets.patch" ./configure --prefix=/usr --mandir=/usr/share/man make } @@ -25,10 +27,11 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install rm -f ${pkgdir}/usr/bin/mt ${pkgdir}/pkg/usr/share/man/man1/mt.1 - mv ${pkgdir}/usr/bin ${pkgdir}/bin rm -rf ${pkgdir}/usr/libexec # remove mt manpage it conflicts with mt-st from extra rm $pkgdir/usr/share/man/man1/mt.1 || return 1 # remove infodir rm $pkgdir/usr/share/info/dir } +md5sums=('1112bb6c45863468b5496ba128792f6c' + 'd7e58f2a1ec286febd09ea75042cf96e') diff --git a/extra/cpio/cpio-2.11-stdio.in.patch b/extra/cpio/cpio-2.11-stdio.in.patch new file mode 100644 index 000000000..f7016ba71 --- /dev/null +++ b/extra/cpio/cpio-2.11-stdio.in.patch @@ -0,0 +1,13 @@ +diff -urNp cpio-2.11-orig/gnu/stdio.in.h cpio-2.11/gnu/stdio.in.h +--- cpio-2.11-orig/gnu/stdio.in.h 2010-03-10 10:27:03.000000000 +0100 ++++ cpio-2.11/gnu/stdio.in.h 2012-06-04 10:23:23.804471185 +0200 +@@ -139,7 +139,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not + so any use of gets warrants an unconditional warning. Assume it is + always declared, since it is required by C89. */ + #undef gets ++#if HAVE_RAW_DECL_GETS + _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); ++#endif + + #if @GNULIB_FOPEN@ + # if @REPLACE_FOPEN@ diff --git a/extra/cpio/gets.patch b/extra/cpio/gets.patch deleted file mode 100644 index 0203b645e..000000000 --- a/extra/cpio/gets.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -ru cpio-2.11.orig/gnu/stdio.in.h cpio-2.11/gnu/stdio.in.h ---- cpio-2.11.orig/gnu/stdio.in.h 2012-12-22 22:48:06.596855514 +0100 -+++ cpio-2.11/gnu/stdio.in.h 2012-12-22 22:49:21.496002937 +0100 -@@ -135,12 +135,6 @@ - "use gnulib module fflush for portable POSIX compliance"); - #endif - --/* It is very rare that the developer ever has full control of stdin, -- so any use of gets warrants an unconditional warning. Assume it is -- always declared, since it is required by C89. */ --#undef gets --_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); -- - #if @GNULIB_FOPEN@ - # if @REPLACE_FOPEN@ - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index 02a3f657c..b598ce0f3 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180282 2013-03-19 15:32:07Z andyrtr $ +# $Id: PKGBUILD 185777 2013-05-18 15:46:13Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase="cups" pkgname=('libcups' 'cups') pkgver=1.6.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.cups.org/" @@ -46,6 +46,7 @@ build() { autoconf -I config-scripts ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --sbindir=/usr/bin \ --libdir=/usr/lib \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ --with-logdir=/var/log/cups \ @@ -84,7 +85,6 @@ backup=(etc/cups/client.conf) # install client.conf man page and config file install -dm755 ${pkgdir}/usr/share/man/man5 - #install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/man/client.conf.5.gz ${pkgdir}/usr/share/man/man5/ install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/man/client.conf.5 ${pkgdir}/usr/share/man/man5/ install -dm755 ${pkgdir}/etc/cups touch ${pkgdir}/etc/cups/client.conf diff --git a/extra/cups/cups.install b/extra/cups/cups.install index fc015f951..121eeb0f3 100644 --- a/extra/cups/cups.install +++ b/extra/cups/cups.install @@ -1,6 +1,6 @@ post_install() { if [ -x usr/bin/xdg-icon-resource ]; then - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null fi echo ">> If you use an HTTPS connection to CUPS, the first time you access" echo ">> the interface it may take a very long time before the site comes up." @@ -10,13 +10,9 @@ post_install() { post_upgrade() { if [ -x usr/bin/xdg-icon-resource ]; then - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null fi - if [ "`vercmp $2 1.4.7-2`" -lt 0 ]; then - # important upgrade notice - echo "daemon script has been renamed to /etc/rc.d/cupsd" - echo "change your entry in /etc/rc.conf" - fi + if [ "`vercmp $2 1.6.0`" -lt 0 ]; then # important upgrade notice echo "* avahi-daemon should now run before you start cupsd for" @@ -24,7 +20,8 @@ post_upgrade() { echo "* check your config with cupsd -t" echo " and fix all Browsing related settings" fi - if [ "`vercmp $2 1.6.1-3`" -lt 0 ]; then + + if [ "`vercmp $2 1.6.1-3`" -lt 0 ]; then # important upgrade notice echo "> It's now safe to load usblp kernel module." echo "> There's no more need to blacklist it." @@ -33,6 +30,6 @@ post_upgrade() { post_remove() { if [ -x usr/bin/xdg-icon-resource ]; then - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null fi } diff --git a/extra/cvs/PKGBUILD b/extra/cvs/PKGBUILD index 9121db0d8..52db75700 100644 --- a/extra/cvs/PKGBUILD +++ b/extra/cvs/PKGBUILD @@ -1,14 +1,16 @@ -# $Id: PKGBUILD 146046 2012-01-04 17:18:48Z dan $ +# $Id: PKGBUILD 185415 2013-05-14 01:35:08Z dan $ # Contributor: dorphell <dorphell@archlinux.org> +# Maintainer: Dan McGee <dan@archlinux.org> pkgname=cvs pkgver=1.11.23 -pkgrel=8.1 +pkgrel=9 pkgdesc="Concurrent Versions System - a source control system" arch=(i686 x86_64 'mips64el') url="http://cvs.nongnu.org/" license=('GPL') depends=('krb5' 'zlib') +makedepends=('vim') optdepends=('openssh: for using cvs over ssh' 'inetutils: for using cvs over rsh') install=cvs.install @@ -30,7 +32,9 @@ build() { # CVE-2010-3864, https://www.redhat.com/security/data/cve/CVE-2010-3846.html patch -Np1 < ../cvs-1.11.23-cve-2010-3846.patch - autoreconf + sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in + find . -name Makefile.am | xargs sed -i -e 's/^INCLUDES/AM_CPPFLAGS/' + AUTOMAKE='automake --add-missing' autoreconf ./configure --prefix=/usr make } diff --git a/extra/cyrus-sasl/0003_saslauthd_mdoc.patch b/extra/cyrus-sasl/0003_saslauthd_mdoc.patch deleted file mode 100644 index 694f4bb67..000000000 --- a/extra/cyrus-sasl/0003_saslauthd_mdoc.patch +++ /dev/null @@ -1,35 +0,0 @@ -0003_saslauthd_mdoc.dpatch by <fabbe@debian.org> - -Use the correct path for the saslauthd.conf file, and use another -date format (cosmetic). - -diff -urNad trunk~/saslauthd/saslauthd.mdoc trunk/saslauthd/saslauthd.mdoc ---- trunk~/saslauthd/saslauthd.mdoc 2006-05-29 22:52:42.000000000 +0300 -+++ trunk/saslauthd/saslauthd.mdoc 2006-07-12 15:05:25.000000000 +0300 -@@ -10,7 +10,7 @@ - .\" manpage in saslauthd.8 whenever you change this source - .\" version. Only the pre-formatted manpage is installed. - .\" --.Dd 10 24 2002 -+.Dd October 24 2002 - .Dt SASLAUTHD 8 - .Os "CMU-SASL" - .Sh NAME -@@ -216,7 +216,7 @@ - .Em (All platforms that support OpenLDAP 2.0 or higher) - .Pp - Authenticate against an ldap server. The ldap configuration parameters are --read from /usr/local/etc/saslauthd.conf. The location of this file can be -+read from /etc/saslauthd.conf. The location of this file can be - changed with the -O parameter. See the LDAP_SASLAUTHD file included with the - distribution for the list of available parameters. - .It Li sia -@@ -249,7 +249,7 @@ - .Bl -tag -width "/var/run/saslauthd/mux" - .It Pa /var/run/saslauthd/mux - The default communications socket. --.It Pa /usr/local/etc/saslauthd.conf -+.It Pa /etc/saslauthd.conf - The default configuration file for ldap support. - .El - .Sh SEE ALSO diff --git a/extra/cyrus-sasl/0012_xopen_crypt_prototype.patch b/extra/cyrus-sasl/0012_xopen_crypt_prototype.patch deleted file mode 100644 index d50ec8343..000000000 --- a/extra/cyrus-sasl/0012_xopen_crypt_prototype.patch +++ /dev/null @@ -1,20 +0,0 @@ -0012_xopen_crypt_prototype.dpatch by <dannf@debian.org> - -When _XOPEN_SOURCE is defined, the subsequent #include <unistd.h> -will define a correct function prototype for the crypt function. -This avoids segfaults on architectures where the size of a pointer -is greater than the size of an integer (ia64 and amd64 are examples). -This may be detected by looking for build log lines such as the -following: -auth_shadow.c:183: warning: implicit declaration of function ‘crypt’ -auth_shadow.c:183: warning: cast to pointer from integer of different -size - -diff -urNad trunk~/saslauthd/auth_shadow.c trunk/saslauthd/auth_shadow.c ---- trunk~/saslauthd/auth_shadow.c 2006-05-29 22:52:42.000000000 +0300 -+++ trunk/saslauthd/auth_shadow.c 2006-11-08 13:44:23.000000000 +0200 -@@ -1,3 +1,4 @@ -+#define _XOPEN_SOURCE - #define PWBUFSZ 256 /***SWB***/ - - /* MODULE: auth_shadow */ diff --git a/extra/cyrus-sasl/0016_pid_file_lock_creation_mask.patch b/extra/cyrus-sasl/0016_pid_file_lock_creation_mask.patch deleted file mode 100644 index e9170cef3..000000000 --- a/extra/cyrus-sasl/0016_pid_file_lock_creation_mask.patch +++ /dev/null @@ -1,27 +0,0 @@ -0016_pid_file_lock_creation_mask.dpatch by Sam Hocevar <sam@zoy.org> - -pid_file_lock is created with a mask of 644 instead of 0644. -This patch fixes this octal/decimal confusion as well as the -(harmless) one in the previous umask() call. - -diff -urNad trunk~/saslauthd/saslauthd-main.c trunk/saslauthd/saslauthd-main.c ---- trunk~/saslauthd/saslauthd-main.c 2006-05-29 22:52:42.000000000 +0300 -+++ trunk/saslauthd/saslauthd-main.c 2007-06-26 12:07:10.000000000 +0300 -@@ -276,7 +276,7 @@ - exit(1); - } - -- umask(077); -+ umask(0077); - - pid_file_size = strlen(run_path) + sizeof(PID_FILE_LOCK) + 1; - if ((pid_file_lock = malloc(pid_file_size)) == NULL) { -@@ -287,7 +287,7 @@ - strlcpy(pid_file_lock, run_path, pid_file_size); - strlcat(pid_file_lock, PID_FILE_LOCK, pid_file_size); - -- if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 644)) < 0) { -+ if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 0644)) < 0) { - rc = errno; - logger(L_ERR, L_FUNC, "could not open pid lock file: %s", pid_file_lock); - logger(L_ERR, L_FUNC, "open: %s", strerror(rc)); diff --git a/extra/cyrus-sasl/0018_auth_rimap_quotes.patch b/extra/cyrus-sasl/0018_auth_rimap_quotes.patch deleted file mode 100644 index 13fa999f0..000000000 --- a/extra/cyrus-sasl/0018_auth_rimap_quotes.patch +++ /dev/null @@ -1,35 +0,0 @@ -0016_auth_rimap_quotes.dpatch by <fabbe@debian.org> - -All lines beginning with `## DP:' are a description of the patch. -Avoid infinite loop when username/password has a double quote character. -Upstream change: https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sasl/saslauthd/auth_rimap.c.diff?r1=1.12;r2=1.13 - -diff -urNad etch~/saslauthd/auth_rimap.c etch/saslauthd/auth_rimap.c ---- etch~/saslauthd/auth_rimap.c 2007-03-29 15:16:20.000000000 +0300 -+++ etch/saslauthd/auth_rimap.c 2008-02-13 13:42:53.000000000 +0200 -@@ -162,6 +162,7 @@ - num_quotes = 0; - p1 = s; - while ((p1 = strchr(p1, '"')) != NULL) { -+ p1++; - num_quotes++; - } - -@@ -438,7 +439,7 @@ - syslog(LOG_WARNING, "auth_rimap: writev: %m"); - memset(qlogin, 0, strlen(qlogin)); - free(qlogin); -- memset(qpass, 0, strlen(qlogin)); -+ memset(qpass, 0, strlen(qpass)); - free(qpass); - (void)close(s); - return strdup(RESP_IERROR); -@@ -447,7 +448,7 @@ - /* don't need these any longer */ - memset(qlogin, 0, strlen(qlogin)); - free(qlogin); -- memset(qpass, 0, strlen(qlogin)); -+ memset(qpass, 0, strlen(qpass)); - free(qpass); - - /* read and parse the LOGIN response */ diff --git a/extra/cyrus-sasl/0019_ldap_deprecated.patch b/extra/cyrus-sasl/0019_ldap_deprecated.patch deleted file mode 100644 index 8825256cb..000000000 --- a/extra/cyrus-sasl/0019_ldap_deprecated.patch +++ /dev/null @@ -1,22 +0,0 @@ -0019_ldap_deprecated.dpatch by dann frazier <dannf@debian.org> - -The function ldap_get_values, used in saslauthd/lak.c, is deprecated. -Therefore, its prototype is not included by default when compiling -against the ldap.h headers. As a result, the compiler cannot know the -return type of the function at compile time, and will implicitly -convert to a pointer. This has implications on 64-bit systems. -This patch sets the deprecation mode on, so that the function prototype -gets included when compiling. -(Description by Fabian Fagerholm <fabbe@debian.org>) - -diff -urNad trunk~/saslauthd/lak.c trunk/saslauthd/lak.c ---- trunk~/saslauthd/lak.c 2006-06-04 12:26:20.000000000 +0300 -+++ trunk/saslauthd/lak.c 2008-02-15 14:32:11.000000000 +0200 -@@ -55,6 +55,7 @@ - #include <openssl/des.h> - #endif - -+#define LDAP_DEPRECATED 1 - #include <ldap.h> - #include <lber.h> - #include <sasl.h> diff --git a/extra/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch b/extra/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch deleted file mode 100644 index a49b553f0..000000000 --- a/extra/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch +++ /dev/null @@ -1,26 +0,0 @@ -0022_gcc4.4_preprocessor_syntax.dpatch by <fabbe@paniq.net> - -The #elif preprocessor directive requires a test condition. -GCC 4.4 enforces this rule. - -diff -urNad trunk~/plugins/digestmd5.c trunk/plugins/digestmd5.c ---- trunk~/plugins/digestmd5.c 2006-06-04 12:26:19.000000000 +0300 -+++ trunk/plugins/digestmd5.c 2009-01-26 13:29:40.000000000 +0200 -@@ -2715,7 +2715,7 @@ - "DIGEST-MD5", /* mech_name */ - #ifdef WITH_RC4 - 128, /* max_ssf */ --#elif WITH_DES -+#elif defined(WITH_DES) - 112, - #else - 1, -@@ -4034,7 +4034,7 @@ - "DIGEST-MD5", - #ifdef WITH_RC4 /* mech_name */ - 128, /* max ssf */ --#elif WITH_DES -+#elif defined(WITH_DES) - 112, - #else - 1, diff --git a/extra/cyrus-sasl/0027_db5_support.patch b/extra/cyrus-sasl/0027_db5_support.patch deleted file mode 100644 index 522824074..000000000 --- a/extra/cyrus-sasl/0027_db5_support.patch +++ /dev/null @@ -1,24 +0,0 @@ -Author: OndÅ™ej Surý <ondrej@debian.org> -Description: Support newer Berkeley DB versions ---- a/sasldb/db_berkeley.c -+++ b/sasldb/db_berkeley.c -@@ -101,7 +101,7 @@ static int berkeleydb_open(const sasl_ut - ret = db_create(mbdb, NULL, 0); - if (ret == 0 && *mbdb != NULL) - { --#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 -+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) - ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660); - #else - ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660); ---- a/utils/dbconverter-2.c -+++ b/utils/dbconverter-2.c -@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p - ret = db_create(mbdb, NULL, 0); - if (ret == 0 && *mbdb != NULL) - { --#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1 -+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1)) - ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664); - #else - ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664); diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD index e35c47f05..7915d580f 100644 --- a/extra/cyrus-sasl/PKGBUILD +++ b/extra/cyrus-sasl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180680 2013-03-25 19:15:31Z bpiotrowski $ +# $Id: PKGBUILD 186312 2013-05-24 16:21:18Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # This package spans multiple repositories. @@ -7,53 +7,33 @@ pkgbase=('cyrus-sasl') pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql') #pkgname=libsasl -pkgver=2.1.23 -pkgrel=12 +pkgver=2.1.26 +pkgrel=3 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" arch=('i686' 'x86_64' 'mips64el') url="http://cyrusimap.web.cmu.edu/" license=('custom') options=('!makeflags' '!libtool') -makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl') -source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz - cyrus-sasl-2.1.19-checkpw.c.patch - cyrus-sasl-2.1.22-crypt.patch +makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl' 'sqlite2') +source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz cyrus-sasl-2.1.22-qa.patch - cyrus-sasl-2.1.22-automake-1.10.patch - cyrus-sasl-2.1.23-authd-fix.patch - 0003_saslauthd_mdoc.patch + cyrus-sasl-2.1.26-size_t.patch 0010_maintainer_mode.patch 0011_saslauthd_ac_prog_libtool.patch - 0012_xopen_crypt_prototype.patch - 0016_pid_file_lock_creation_mask.patch - 0018_auth_rimap_quotes.patch - 0019_ldap_deprecated.patch - 0022_gcc4.4_preprocessor_syntax.patch 0025_ld_as_needed.patch 0026_drop_krb5support_dependency.patch - 0027_db5_support.patch 0030-dont_use_la_files_for_opening_plugins.patch saslauthd.service saslauthd.conf.d saslauthd tmpfiles.conf) -md5sums=('2eb0e48106f0e9cd8001e654f267ecbc' - 'e27ddff076342e7a3041c4759817d04b' - 'd7e6886e88af04d05f3dec7f0a59ccf7' +md5sums=('a7f4e5e559a0e37b3ffc438c9456e425' '79b8a5e8689989e2afd4b7bda595a7b1' - 'f4131b077ddb5240b375d749162f1b7a' - 'c7ad2c70c1ef814eb4b119f316c064f2' - 'caeeac3feba19cbbd36e7345cc805600' + 'f45aa8c42b32e0569ab3d14a83485b37' 'f45d8b60e8f74dd7f7c2ec1665fa602a' '9d93880514cb5ff5da969f1ceb64a661' - 'dfdc052a7e678db9f687482c5d52f34e' - '4a09f6b24b91f8450892a78e378860da' - '213abe7c5dfe0d7f446992787da1e780' - '5a0321177ad30cb5518c8b6812e3961a' - '0c965748970eea29fa295524821d43f0' '62bf892fe4d1df41ff748e91a1afaf67' 'b7848957357e7c02d6490102be496bf9' - 'd86a5aa2e3b5b7c1bad6f8b548b7ea36' '8e7106f32e495e9ade69014fd1b3352a' '3499dcd610ad1ad58e0faffde2aa7a23' '49219af5641150edec288a3fdb65e7c1' @@ -61,25 +41,18 @@ md5sums=('2eb0e48106f0e9cd8001e654f267ecbc' '45bb0192d2f188066240b9a66ee6365f') build() { + export CFLAGS="$CFLAGS -fPIC" + cd "${srcdir}/cyrus-sasl-${pkgver}" - patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.19-checkpw.c.patch" - patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-crypt.patch" patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-qa.patch" - patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-automake-1.10.patch" - patch -Np0 -i "${srcdir}/cyrus-sasl-2.1.23-authd-fix.patch" - patch -Np1 -i "${srcdir}/0003_saslauthd_mdoc.patch" + patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.26-size_t.patch" patch -Np1 -i "${srcdir}/0010_maintainer_mode.patch" patch -Np1 -i "${srcdir}/0011_saslauthd_ac_prog_libtool.patch" - patch -Np1 -i "${srcdir}/0012_xopen_crypt_prototype.patch" - patch -Np1 -i "${srcdir}/0016_pid_file_lock_creation_mask.patch" - patch -Np1 -i "${srcdir}/0018_auth_rimap_quotes.patch" - patch -Np1 -i "${srcdir}/0019_ldap_deprecated.patch" - patch -Np1 -i "${srcdir}/0022_gcc4.4_preprocessor_syntax.patch" patch -Np1 -i "${srcdir}/0025_ld_as_needed.patch" patch -Np1 -i "${srcdir}/0026_drop_krb5support_dependency.patch" - patch -Np1 -i "${srcdir}/0027_db5_support.patch" patch -Np1 -i "${srcdir}/0030-dont_use_la_files_for_opening_plugins.patch" + sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.in rm -f config/config.guess config/config.sub rm -f config/ltconfig config/ltmain.sh config/libtool.m4 rm -fr autom4te.cache @@ -148,6 +121,7 @@ package_libsasl() { rm -f "${pkgdir}"/usr/lib/sasl2/libsql.so* rm -f "${pkgdir}"/usr/lib/sasl2/libgssapiv2.so* rm -f "${pkgdir}"/usr/lib/sasl2/libldapdb.so* + rm -f "${pkgdir}"/usr/lib/sasl2/libgs2.so* install -m755 -d "${pkgdir}/usr/share/licenses/libsasl" install -m644 COPYING "${pkgdir}/usr/share/licenses/libsasl/" } @@ -176,6 +150,7 @@ package_cyrus-sasl-gssapi() { cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" install -m755 -d "${pkgdir}/usr/lib/sasl2" cp -a .libs/libgssapiv2.so* "${pkgdir}/usr/lib/sasl2/" + cp -a .libs/libgs2.so* "${pkgdir}/usr/lib/sasl2/" install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi" ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi/" @@ -196,7 +171,7 @@ package_cyrus-sasl-ldap() { package_cyrus-sasl-sql() { pkgdesc="SQL auxprop module for Cyrus SASL" - depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadbclient') + depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadbclient' 'sqlite2') replaces=('cyrus-sasl-plugins') cd "${srcdir}/cyrus-sasl-${pkgver}/plugins" diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch deleted file mode 100644 index f7bf44b79..000000000 --- a/extra/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch +++ /dev/null @@ -1,170 +0,0 @@ -diff -ur ../cyrus-sasl-2.1.19.orig/lib/Makefile.in ./lib/Makefile.in ---- ../cyrus-sasl-2.1.19.orig/lib/Makefile.in 2004-07-02 21:40:15.000000000 +0200 -+++ ./lib/Makefile.in 2004-09-07 13:21:22.746680576 +0200 -@@ -120,7 +120,7 @@ - JAVA_TRUE = @JAVA_TRUE@ - LDFLAGS = @LDFLAGS@ - LIBOBJS = @LIBOBJS@ --LIBS = @LIBS@ -+LIBS = -lcrypt @LIBS@ - LIBTOOL = @LIBTOOL@ - LIB_CRYPT = @LIB_CRYPT@ - LIB_DES = @LIB_DES@ -diff -ur ../cyrus-sasl-2.1.19.orig/lib/checkpw.c ./lib/checkpw.c ---- ../cyrus-sasl-2.1.19.orig/lib/checkpw.c 2004-03-17 14:58:13.000000000 +0100 -+++ ./lib/checkpw.c 2004-09-07 13:21:12.645916147 +0200 -@@ -94,6 +94,23 @@ - # endif - #endif - -+/****************************** -+ * crypt(3) patch start * -+ ******************************/ -+char *crypt(const char *key, const char *salt); -+ -+/* cleartext password formats */ -+#define PASSWORD_FORMAT_CLEARTEXT 1 -+#define PASSWORD_FORMAT_CRYPT 2 -+#define PASSWORD_FORMAT_CRYPTTRAD 3 -+#define PASSWORD_SALT_BUF_LEN 22 -+ -+/* weeds out crypt(3) password's salt */ -+int _sasl_get_salt (char *dest, char *src, int format); -+ -+/****************************** -+ * crypt(3) patch stop * -+ ******************************/ - - /* we store the following secret to check plaintext passwords: - * -@@ -143,7 +160,51 @@ - "*cmusaslsecretPLAIN", - NULL }; - struct propval auxprop_values[3]; -- -+ -+ /****************************** -+ * crypt(3) patch start * -+ * for password format check * -+ ******************************/ -+ sasl_getopt_t *getopt; -+ void *context; -+ const char *p = NULL; -+ /** -+ * MD5: 12 char salt -+ * BLOWFISH: 16 char salt -+ */ -+ char salt[PASSWORD_SALT_BUF_LEN]; -+ int password_format; -+ -+ /* get password format from auxprop configuration */ -+ if (_sasl_getcallback(conn, SASL_CB_GETOPT, &getopt, &context) == SASL_OK) { -+ getopt(context, NULL, "password_format", &p, NULL); -+ } -+ -+ /* set password format */ -+ if (p) { -+ /* -+ memset(pass_format_str, '\0', PASSWORD_FORMAT_STR_LEN); -+ strncpy(pass_format_str, p, (PASSWORD_FORMAT_STR_LEN - 1)); -+ */ -+ /* modern, modular crypt(3) */ -+ if (strncmp(p, "crypt", 11) == 0) -+ password_format = PASSWORD_FORMAT_CRYPT; -+ /* traditional crypt(3) */ -+ else if (strncmp(p, "crypt_trad", 11) == 0) -+ password_format = PASSWORD_FORMAT_CRYPTTRAD; -+ /* cleartext password */ -+ else -+ password_format = PASSWORD_FORMAT_CLEARTEXT; -+ } else { -+ /* cleartext password */ -+ password_format = PASSWORD_FORMAT_CLEARTEXT; -+ } -+ -+ /****************************** -+ * crypt(3) patch stop * -+ * for password format check * -+ ******************************/ -+ - if (!conn || !userstr) - return SASL_BADPARAM; - -@@ -180,14 +241,31 @@ - goto done; - } - -- /* At the point this has been called, the username has been canonified -- * and we've done the auxprop lookup. This should be easy. */ -- if(auxprop_values[0].name -- && auxprop_values[0].values -- && auxprop_values[0].values[0] -- && !strcmp(auxprop_values[0].values[0], passwd)) { -- /* We have a plaintext version and it matched! */ -- return SASL_OK; -+ -+ /****************************** -+ * crypt(3) patch start * -+ ******************************/ -+ -+ /* get salt */ -+ _sasl_get_salt(salt, (char *) auxprop_values[0].values[0], password_format); -+ -+ /* crypt(3)-ed password? */ -+ if (password_format != PASSWORD_FORMAT_CLEARTEXT) { -+ /* compare password */ -+ if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(crypt(passwd, salt), auxprop_values[0].values[0]) == 0) -+ return SASL_OK; -+ else -+ ret = SASL_BADAUTH; -+ } -+ else if (password_format == PASSWORD_FORMAT_CLEARTEXT) { -+ /* compare passwords */ -+ if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(auxprop_values[0].values[0], passwd) == 0) -+ return SASL_OK; -+ else -+ ret = SASL_BADAUTH; -+ /****************************** -+ * crypt(3) patch stop * -+ ******************************/ - } else if(auxprop_values[1].name - && auxprop_values[1].values - && auxprop_values[1].values[0]) { -@@ -975,3 +1053,37 @@ - #endif - { NULL, NULL } - }; -+ -+/* weeds out crypt(3) password's salt */ -+int _sasl_get_salt (char *dest, char *src, int format) { -+ int num; /* how many characters is salt long? */ -+ switch (format) { -+ case PASSWORD_FORMAT_CRYPT: -+ /* md5 crypt */ -+ if (src[1] == '1') -+ num = 12; -+ /* blowfish crypt */ -+ else if (src[1] == '2') -+ num = (src[1] == '2' && src[2] == 'a') ? 17 : 16; -+ /* traditional crypt */ -+ else -+ num = 2; -+ break; -+ -+ case PASSWORD_FORMAT_CRYPTTRAD: -+ num = 2; -+ break; -+ -+ default: -+ return 1; -+ } -+ -+ /* destroy destination */ -+ memset(dest, '\0', (num + 1)); -+ -+ /* copy salt to destination */ -+ strncpy(dest, src, num); -+ -+ return 1; -+} -+ diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch deleted file mode 100644 index 8cd71c0c5..000000000 --- a/extra/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch +++ /dev/null @@ -1,94 +0,0 @@ -Re-merged patch by Robert Scheck <redhat@linuxnetz.de> for cyrus-sasl >= 2.1.22, which was -originally written by Jacek Konieczny <jajcus@pld-linux.org> and makes cyrus-sasl building -using automake 1.10. - ---- cyrus-sasl-2.1.22/plugins/Makefile.am 2006-05-17 18:46:16.000000000 +0200 -+++ cyrus-sasl-2.1.22/plugins/Makefile.am.am110 2007-02-16 15:42:07.000000000 +0100 -@@ -82,73 +82,73 @@ - libntlm.la libpassdss.la libsasldb.la libsql.la libldapdb.la - - libplain_la_SOURCES = plain.c plain_init.c $(common_sources) --libplain_la_LDFLAGS = -version-info $(plain_version) -+libplain_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(plain_version) - libplain_la_DEPENDENCIES = $(COMPAT_OBJS) - libplain_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS) - - libanonymous_la_SOURCES = anonymous.c anonymous_init.c $(common_sources) --libanonymous_la_LDFLAGS = -version-info $(anonymous_version) -+libanonymous_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(anonymous_version) - libanonymous_la_DEPENDENCIES = $(COMPAT_OBJS) - libanonymous_la_LIBADD = $(COMPAT_OBJS) - - libkerberos4_la_SOURCES = kerberos4.c kerberos4_init.c $(common_sources) --libkerberos4_la_LDFLAGS = -version-info $(kerberos4_version) -+libkerberos4_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(kerberos4_version) - libkerberos4_la_DEPENDENCIES = $(COMPAT_OBJS) - libkerberos4_la_LIBADD = $(SASL_KRB_LIB) $(LIB_SOCKET) $(COMPAT_OBJS) - - libgssapiv2_la_SOURCES = gssapi.c gssapiv2_init.c $(common_sources) --libgssapiv2_la_LDFLAGS = -version-info $(gssapiv2_version) -+libgssapiv2_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(gssapiv2_version) - libgssapiv2_la_DEPENDENCIES = $(COMPAT_OBJS) - libgssapiv2_la_LIBADD = $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(LIB_SOCKET) $(COMPAT_OBJS) - - libcrammd5_la_SOURCES = cram.c crammd5_init.c $(common_sources) --libcrammd5_la_LDFLAGS = -version-info $(crammd5_version) -+libcrammd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(crammd5_version) - libcrammd5_la_DEPENDENCIES = $(COMPAT_OBJS) - libcrammd5_la_LIBADD = $(COMPAT_OBJS) - - libdigestmd5_la_SOURCES = digestmd5.c digestmd5_init.c $(common_sources) --libdigestmd5_la_LDFLAGS = -version-info $(digestmd5_version) -+libdigestmd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(digestmd5_version) - libdigestmd5_la_DEPENDENCIES = $(COMPAT_OBJS) - libdigestmd5_la_LIBADD = $(LIB_DES) $(LIB_SOCKET) $(COMPAT_OBJS) - - liblogin_la_SOURCES = login.c login_init.c $(common_sources) --liblogin_la_LDFLAGS = -version-info $(login_version) -+liblogin_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(login_version) - liblogin_la_DEPENDENCIES = $(COMPAT_OBJS) - liblogin_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS) - - libsrp_la_SOURCES = srp.c srp_init.c $(common_sources) --libsrp_la_LDFLAGS = -version-info $(srp_version) -+libsrp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(srp_version) - libsrp_la_DEPENDENCIES = $(COMPAT_OBJS) - libsrp_la_LIBADD = $(SRP_LIBS) $(COMPAT_OBJS) - - libotp_la_SOURCES = otp.c otp_init.c otp.h $(common_sources) --libotp_la_LDFLAGS = -version-info $(otp_version) -+libotp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(otp_version) - libotp_la_DEPENDENCIES = $(COMPAT_OBJS) - libotp_la_LIBADD = $(OTP_LIBS) $(COMPAT_OBJS) - - libntlm_la_SOURCES = ntlm.c ntlm_init.c $(common_sources) --libntlm_la_LDFLAGS = -version-info $(ntlm_version) -+libntlm_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ntlm_version) - libntlm_la_DEPENDENCIES = $(COMPAT_OBJS) - libntlm_la_LIBADD = $(NTLM_LIBS) $(COMPAT_OBJS) - - libpassdss_la_SOURCES = passdss.c passdss_init.c $(common_sources) --libpassdss_la_LDFLAGS = -version-info $(passdss_version) -+libpassdss_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(passdss_version) - libpassdss_la_DEPENDENCIES = $(COMPAT_OBJS) - libpassdss_la_LIBADD = $(PASSDSS_LIBS) $(COMPAT_OBJS) - - # Auxprop Plugins - libsasldb_la_SOURCES = sasldb.c sasldb_init.c $(common_sources) --libsasldb_la_LDFLAGS = -version-info $(sasldb_version) -+libsasldb_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(sasldb_version) - libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS) - libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS) - - libldapdb_la_SOURCES = ldapdb.c ldapdb_init.c $(common_sources) --libldapdb_la_LDFLAGS = $(LIB_LDAP) -version-info $(ldapdb_version) -+libldapdb_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_LDAP) -version-info $(ldapdb_version) - libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS) - libldapdb_la_LIBADD = $(COMPAT_OBJS) - - libsql_la_SOURCES = sql.c sql_init.c $(common_sources) --libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version) -+libsql_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version) - libsql_la_DEPENDENCIES = $(COMPAT_OBJS) - libsql_la_LIBADD = $(COMPAT_OBJS) - diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch deleted file mode 100644 index fd356327b..000000000 --- a/extra/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch +++ /dev/null @@ -1,71 +0,0 @@ -http://bugs.gentoo.org/152544 - ---- cyrus-sasl-2.1.22/lib/Makefile.am -+++ cyrus-sasl-2.1.22/lib/Makefile.am -@@ -45,6 +45,7 @@ sasl_version = 2:22:0 - - INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb - -+AM_CFLAGS = -fPIC - EXTRA_DIST = windlopen.c staticopen.h NTMakefile - EXTRA_LIBRARIES = libsasl2.a - noinst_LIBRARIES = @SASL_STATIC_LIBS@ ---- cyrus-sasl-2.1.22/plugins/Makefile.am -+++ cyrus-sasl-2.1.22/plugins/Makefile.am -@@ -63,6 +63,7 @@ srp_version = 2:22:0 - - INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include - AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir) -+AM_CFLAGS = -fPIC - - COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@ - ---- cyrus-sasl-2.1.22/sasldb/Makefile.am -+++ cyrus-sasl-2.1.22/sasldb/Makefile.am -@@ -48,6 +48,7 @@ INCLUDES=-I$(top_srcdir)/include -I$(top - - extra_common_sources = db_none.c db_ndbm.c db_gdbm.c db_berkeley.c - -+AM_CFLAGS = -fPIC - EXTRA_DIST = NTMakefile - - noinst_LTLIBRARIES = libsasldb.la ---- cyrus-sasl-2.1.22/utils/Makefile.am -+++ cyrus-sasl-2.1.22/utils/Makefile.am -@@ -42,7 +42,7 @@ - # - ################################################################ - --all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) -+all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) $(LIB_CRYPT) - all_sasl_static_libs = ../lib/.libs/libsasl2.a $(SASL_DB_LIB) $(LIB_SOCKET) $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(SASL_KRB_LIB) $(LIB_DES) $(PLAIN_LIBS) $(SRP_LIBS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) - - sbin_PROGRAMS = @SASL_DB_UTILS@ @SMTPTEST_PROGRAM@ pluginviewer ---- cyrus-sasl-2.1.22/sample/Makefile.am -+++ cyrus-sasl-2.1.22/sample/Makefile.am -@@ -54,10 +54,10 @@ sample_server_SOURCES = sample-server.c - server_SOURCES = server.c common.c common.h - client_SOURCES = client.c common.c common.h - --server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) --client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) -+server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) -+client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) - --sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) --sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) -+sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) -+sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT) - - EXTRA_DIST = NTMakefile ---- cyrus-sasl-2.1.22/lib/Makefile.am -+++ cyrus-sasl-2.1.22/lib/Makefile.am -@@ -63,7 +63,7 @@ lib_LTLIBRARIES = libsasl2.la - libsasl2_la_SOURCES = $(common_sources) $(common_headers) - libsasl2_la_LDFLAGS = -version-info $(sasl_version) - libsasl2_la_DEPENDENCIES = $(LTLIBOBJS) --libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) -+libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) $(LIB_CRYPT) - - if MACOSX - framedir = /Library/Frameworks/SASL2.framework diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch deleted file mode 100644 index f5f372d17..000000000 --- a/extra/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -fix warnings: - -auth_sasldb.c: In function ‘auth_sasldb’: -auth_sasldb.c:144: warning: implicit declaration of function ‘gethostname’ - -auth_sasldb.c:153: warning: passing argument 8 of ‘_sasldb_getdata’ from incompatible pointer type -../sasldb/sasldb.h:60: note: expected ‘size_t *’ but argument is of type ‘int *’ - ---- saslauthd/auth_sasldb.c -+++ saslauthd/auth_sasldb.c -@@ -41,6 +41,7 @@ - #include <string.h> - #include <stdlib.h> - #include <pwd.h> -+#include <unistd.h> - /* END PUBLIC DEPENDENCIES */ - - #define RETURN(x) return strdup(x) -@@ -131,7 +132,8 @@ - /* VARIABLES */ - char pw[1024]; /* pointer to passwd file entry */ - sasl_utils_t utils; -- int ret, outsize; -+ int ret; -+ size_t outsize; - const char *use_realm; - char realm_buf[MAXHOSTNAMELEN]; - /* END VARIABLES */ diff --git a/extra/cyrus-sasl/cyrus-sasl-2.1.26-size_t.patch b/extra/cyrus-sasl/cyrus-sasl-2.1.26-size_t.patch new file mode 100644 index 000000000..3a4820f16 --- /dev/null +++ b/extra/cyrus-sasl/cyrus-sasl-2.1.26-size_t.patch @@ -0,0 +1,11 @@ +--- cyrus-sasl-2.1.26/include/sasl.h 2012-10-12 09:05:48.000000000 -0500 ++++ cyrus-sasl-2.1.26/include/sasl.h 2013-01-31 13:21:04.007739327 -0600 +@@ -223,6 +223,8 @@ extern "C" { + * they must be called before all other SASL functions: + */ + ++#include <sys/types.h> ++ + /* memory allocation functions which may optionally be replaced: + */ + typedef void *sasl_malloc_t(size_t); diff --git a/extra/devhelp/PKGBUILD b/extra/devhelp/PKGBUILD index e7d7035a2..dbc6fc4e3 100644 --- a/extra/devhelp/PKGBUILD +++ b/extra/devhelp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183344 2013-04-21 22:08:46Z heftig $ +# $Id: PKGBUILD 185584 2013-05-15 11:33:54Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Link Dupont <link@subpop.net> pkgname=devhelp -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="API documentation browser for GNOME" arch=(i686 x86_64 'mips64el') @@ -15,7 +15,7 @@ makedepends=(pkgconfig intltool python) options=('!libtool' '!emptydirs') install=devhelp.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('4548fb0b17d4716851cf044294a8ee59e72c8de97e793842faf510a6dbfd3c96') +sha256sums=('a245b53824c6f2ff89245ff807bb2140bde74951ea6f1d759a0fd0c6959ca9f7') build() { cd $pkgname-$pkgver diff --git a/extra/dmidecode/PKGBUILD b/extra/dmidecode/PKGBUILD index 3c5fe030d..d36f8c5e7 100644 --- a/extra/dmidecode/PKGBUILD +++ b/extra/dmidecode/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183308 2013-04-21 10:54:50Z giovanni $ +# $Id: PKGBUILD 185822 2013-05-19 13:06:30Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=dmidecode pkgver=2.12 -pkgrel=1 +pkgrel=2 pkgdesc="Desktop Management Interface table related utilities" arch=('i686' 'x86_64') url="http://www.nongnu.org/dmidecode" @@ -16,11 +16,12 @@ md5sums=('a406f3cbb27736491698697beeddb781') build() { cd "${srcdir}/${pkgname}-${pkgver}" + sed -i "s:sbin:bin:g" Makefile make prefix=/usr } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make prefix=/usr DESTDIR=${pkgdir} install + make prefix=/usr DESTDIR="${pkgdir}" install } diff --git a/extra/dosfstools/PKGBUILD b/extra/dosfstools/PKGBUILD deleted file mode 100644 index 3ff9a11cc..000000000 --- a/extra/dosfstools/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 179303 2013-03-05 10:42:06Z tpowa $ -# Maintainer: dorphell <dorphell@archlinux.org> -# Committer: Judd Vinet <jvinet@zeroflux.org> -pkgname=dosfstools -pkgver=3.0.16 -pkgrel=1 -pkgdesc="DOS filesystem utilities" -arch=(i686 x86_64 'mips64el') -depends=('glibc') -#source=(http://www.daniel-baumann.ch/software/dosfstools/$pkgname-$pkgver.tar.xz) -# using debian source, main page is down since quite some time -source=(http://www.daniel-baumann.ch/files/software/$pkgname/$pkgname-$pkgver.orig.tar.xz{,.sig}) -url="http://www.daniel-baumann.ch/software/dosfstools/" -license=('GPL2') - -build() { - cd $srcdir/$pkgname-$pkgver - make -} - -package () { - cd $srcdir/$pkgname-$pkgver - make PREFIX=$pkgdir MANDIR=$pkgdir/usr/share/man DOCDIR=$pkgdir/usr/share/doc install -} -md5sums=('27aca18aeb8bb0851ccaeb47e7416a6e' - 'e8b460ab9c27279e652ddbd1ce7fa4b2') diff --git a/extra/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch b/extra/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch deleted file mode 100644 index 44e6e86b5..000000000 --- a/extra/dosfstools/dosfstools-3.0.12-fix-alloc-rootdir-entry.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- dosfstools-3.0.12/src/check.c.old 2010-01-23 10:13:17.000000000 +0100 -+++ dosfstools-3.0.12/src/check.c 2011-01-31 17:43:31.462674941 +0100 -@@ -174,7 +174,10 @@ - offset = fs->root_start + next_free * sizeof(DIR_ENT); - memset(de, 0, sizeof(DIR_ENT)); - while (1) { -- sprintf((char *)de->name, pattern, curr_num); -+ char expanded[12]; -+ sprintf(expanded, pattern, curr_num); -+ memcpy(de->name, expanded, 8); -+ memcpy(de->ext, expanded + 8, 3); - for (scan = 0; scan < fs->root_entries; scan++) - if (scan != next_free && - !strncmp((const char *)root[scan].name, ---- dosfstools-3.0.12/src/fat.c -+++ dosfstools-3.0.12/src/fat.c -@@ -474,7 +474,7 @@ void reclaim_file(DOS_FS * fs) - DIR_ENT de; - loff_t offset; - files++; -- offset = alloc_rootdir_entry(fs, &de, "FSCK%04d"); -+ offset = alloc_rootdir_entry(fs, &de, "FSCK%04dREC"); - de.start = CT_LE_W(i & 0xffff); - if (fs->fat_bits == 32) - de.starthi = CT_LE_W(i >> 16); diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index 949455c7b..c21a98267 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185124 2013-05-11 09:39:43Z andyrtr $ +# $Id: PKGBUILD 186001 2013-05-20 08:28:29Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> @@ -8,7 +8,7 @@ # --->>> remember to rebuild/bump pigeonhole in one step <<<--- pkgname=dovecot -pkgver=2.2.1 +pkgver=2.2.2 pkgrel=1 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64' 'mips64el') @@ -24,7 +24,7 @@ options=('!libtool') install=$pkgname.install source=(http://dovecot.org/releases/2.2/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.tmpfilesd) -md5sums=('6628f513ca841846176e81db870052f8' +md5sums=('e6c011b4bbddf19e79205d012723449a' 'SKIP' '342a28251d40f983c98c0d1f1bf3d07d') @@ -38,8 +38,11 @@ build() { sed -i 's:OPENSSLCONFIG=${OPENSSLCONFIG-dovecot-openssl.cnf}:OPENSSLCONFIG=${OPENSSLCONFIG- /etc/ssl/dovecot-openssl.cnf}:' doc/mkcert.sh # configure with openssl, mysql, and postgresql support - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib --with-moduledir=/usr/lib/dovecot/modules \ + ./configure --prefix=/usr --sysconfdir=/etc \ + --sbindir=/usr/bin \ + --localstatedir=/var \ + --libexecdir=/usr/lib \ + --with-moduledir=/usr/lib/dovecot/modules \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ --disable-static \ --with-nss \ diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD index dd7668585..c8803a2eb 100644 --- a/extra/doxygen/PKGBUILD +++ b/extra/doxygen/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 178954 2013-03-01 10:20:02Z andrea $ +# $Id: PKGBUILD 185936 2013-05-19 21:23:57Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgbase=doxygen pkgname=('doxygen' 'doxygen-docs') -pkgver=1.8.3.1 -pkgrel=2 +pkgver=1.8.4 +pkgrel=1 license=('GPL') arch=(i686 x86_64 'mips64el') url="http://www.doxygen.org/" makedepends=('gcc-libs' 'flex' 'qt4' 'texlive-core' 'ghostscript' 'texlive-latexextra' 'graphviz') source=(http://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz) -md5sums=('31b0aaab51c5cab7db9f0ebbe9f85530') -sha1sums=('289fc809f44b8025d45279deefbaee7680efd88f') +md5sums=('5f460b91c0d8c34a76173cf22015c2fc') +sha1sums=('a363811b932e44d479addbadffcc8257cde60b44') build() { - . /etc/profile.d/qt4.sh + export PATH=$PATH:/usr/lib/qt4/bin cd "${srcdir}/${pkgbase}-${pkgver}" QTDIR=/usr ./configure --prefix /usr --with-doxywizard make diff --git a/extra/e_dbus/PKGBUILD b/extra/e_dbus/PKGBUILD index 16b27d0f0..b68b66126 100644 --- a/extra/e_dbus/PKGBUILD +++ b/extra/e_dbus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184840 2013-05-09 09:27:18Z ronald $ +# $Id: PKGBUILD 185677 2013-05-16 20:58:57Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=e_dbus -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="D-Bus integration with Ecore" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('ecore' 'dbus-core') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('94d839f5f198e82794e7cfeb174d42178c75c2e3') +sha1sums=('f13e9c3bcd4823920cdf3bacbd2c03a1935399a1') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/ecore/PKGBUILD b/extra/ecore/PKGBUILD index 18fa30f4e..aa807856f 100644 --- a/extra/ecore/PKGBUILD +++ b/extra/ecore/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184994 2013-05-09 17:25:25Z ronald $ +# $Id: PKGBUILD 185669 2013-05-16 20:56:13Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=ecore -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="OS abstraction layer for e17" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('eina' 'evas' 'glib2' 'libxp' 'curl' 'libxss' 'libxtst' makedepends=('subversion') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('b7be13256b1cc91636127b167a83af2980f5a302') +sha1sums=('8ee61a186f2a41477415d78af4475e8a05132920') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/edje/PKGBUILD b/extra/edje/PKGBUILD index e939d19ed..6719ebf8c 100644 --- a/extra/edje/PKGBUILD +++ b/extra/edje/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184836 2013-05-09 09:26:01Z ronald $ +# $Id: PKGBUILD 185673 2013-05-16 20:57:24Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=edje -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="A graphical design and layout library based on Evas" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('python2: inkscape2edc') install=edje.install options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('742080922ab71a76d157058ea01e603b577c12bc') +sha1sums=('cad21ed849b09d1436bebe3742e058177bc26a8b') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/eet/PKGBUILD b/extra/eet/PKGBUILD index deab901f8..267b98676 100644 --- a/extra/eet/PKGBUILD +++ b/extra/eet/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184829 2013-05-09 09:23:48Z ronald $ +# $Id: PKGBUILD 185666 2013-05-16 20:55:11Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eet -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="A data storage and compression library" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('libjpeg>=7' 'openssl' 'eina') options=(!libtool) source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('b027777c723d199da665a2c32204d9b9f406bf5a') +sha1sums=('d3f756321147b26c89b69ece8c6115ba0f68490e') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/eeze/PKGBUILD b/extra/eeze/PKGBUILD index 15589b70f..606513462 100644 --- a/extra/eeze/PKGBUILD +++ b/extra/eeze/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184834 2013-05-09 09:25:29Z ronald $ +# $Id: PKGBUILD 185671 2013-05-16 20:56:53Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=eeze -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="Manipulate devices using udev and sysfs" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('ecore' 'eina' 'udev') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('e7087e2068fb9fd4a2e8dc9d006adce69cc97406') +sha1sums=('45b2920b059baa80a2ccf93320751139045e6a72') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/efibootmgr/PKGBUILD b/extra/efibootmgr/PKGBUILD index d97c9587f..c538a4a96 100755 --- a/extra/efibootmgr/PKGBUILD +++ b/extra/efibootmgr/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 176067 2013-01-27 09:30:54Z tpowa $ +# $Id: PKGBUILD 185838 2013-05-19 14:37:47Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor : Murtuza Akhtari <inxsible at gmail dot com> # Contributor: Keshav P R <skodabenz at rocketmail dot com> pkgname=efibootmgr pkgver=0.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="Tool to modify UEFI Firmware Boot Manager Variables." arch=('i686' 'x86_64') url="http://linux.dell.com/efibootmgr/" @@ -34,12 +34,12 @@ build () { package() { - mkdir -p ${pkgdir}/usr/sbin/ + mkdir -p ${pkgdir}/usr/bin/ mkdir -p ${pkgdir}/usr/share/man/man8/ cd ${srcdir}/efibootmgr-${pkgver}_build/ - install -D -m755 ${srcdir}/efibootmgr-${pkgver}_build/src/efibootmgr/efibootmgr ${pkgdir}/usr/sbin/efibootmgr + install -D -m755 ${srcdir}/efibootmgr-${pkgver}_build/src/efibootmgr/efibootmgr ${pkgdir}/usr/bin/efibootmgr install -D -m644 ${srcdir}/efibootmgr-${pkgver}_build/src/man/man8/efibootmgr.8 ${pkgdir}/usr/share/man/man8/efibootmgr.8 } diff --git a/extra/efreet/PKGBUILD b/extra/efreet/PKGBUILD index ed6be2205..f61d36291 100644 --- a/extra/efreet/PKGBUILD +++ b/extra/efreet/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184839 2013-05-09 09:27:01Z ronald $ +# $Id: PKGBUILD 185676 2013-05-16 20:58:32Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=efreet -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="FreeDesktop.Org specifications for e17" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('eina' 'ecore' 'e_dbus') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('1c561497372c5b4c61074789c738b6d62bc9e5d0') +sha1sums=('df466e60825b24d9c0eb1dbac5f688f884e58404') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/eina/PKGBUILD b/extra/eina/PKGBUILD index 1243262e0..e7296c4db 100644 --- a/extra/eina/PKGBUILD +++ b/extra/eina/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184828 2013-05-09 09:23:29Z ronald $ +# $Id: PKGBUILD 185665 2013-05-16 20:54:50Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eina -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="A core data structure and common utility library" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('LGPL2.1') depends=('glibc') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('725667ed0448d27b63b76189267f8711fcdfaa2e') +sha1sums=('74260d239cdf1f7da1f0ab106fb144fa23d74a87') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/eio/PKGBUILD b/extra/eio/PKGBUILD index 1b25adac4..19ae2f149 100644 --- a/extra/eio/PKGBUILD +++ b/extra/eio/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184833 2013-05-09 09:25:14Z ronald $ +# $Id: PKGBUILD 185670 2013-05-16 20:56:37Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=eio -pkgver=1.7.6.1 +pkgver=1.7.7 pkgrel=1 pkgdesc="Async IO library using Ecore" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('ecore') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('4660797bd87b0ba8c1285cbcb173aceaeb93f9e4') +sha1sums=('1c1bf133496de65c35a19319988796c9913d1d42') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD index 3b2380f05..550c9c36f 100644 --- a/extra/ekiga/PKGBUILD +++ b/extra/ekiga/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183345 2013-04-21 22:08:47Z heftig $ +# $Id: PKGBUILD 185578 2013-05-15 08:05:39Z bpiotrowski $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=ekiga pkgver=4.0.1 -pkgrel=3 +pkgrel=4 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)" url="http://www.ekiga.org" license=(GPL) diff --git a/extra/elementary/PKGBUILD b/extra/elementary/PKGBUILD index a189e6323..fa079c039 100644 --- a/extra/elementary/PKGBUILD +++ b/extra/elementary/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184841 2013-05-09 09:27:34Z ronald $ +# $Id: PKGBUILD 185678 2013-05-16 20:59:24Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=elementary -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="Enlightenment's widget set" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('edje' 'e_dbus' 'efreet' 'ethumb' 'eio') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('26df183adac7a3572f04e6a8fcb8be38010b203a') +sha1sums=('1a4dbc727780eff95c102cd8ecf9533c07a3631d') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/embryo/PKGBUILD b/extra/embryo/PKGBUILD index c1558e82b..4051e860d 100644 --- a/extra/embryo/PKGBUILD +++ b/extra/embryo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184835 2013-05-09 09:25:45Z ronald $ +# $Id: PKGBUILD 185672 2013-05-16 20:57:07Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=embryo -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="implementation of a C like scripting language for e17" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('glibc' 'eina') options=('!libtool') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('0d70796cd78b8ad9ed308193becdbb94dad5e51c') +sha1sums=('204fa38463b64d3b97e4c598942e9389dc89216e') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/emotion/PKGBUILD b/extra/emotion/PKGBUILD index 72d83bfb1..5fe2807a6 100644 --- a/extra/emotion/PKGBUILD +++ b/extra/emotion/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184837 2013-05-09 09:26:25Z ronald $ +# $Id: PKGBUILD 185674 2013-05-16 20:57:59Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=emotion -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="Library to easily integrate media playback into EFL applications" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('gstreamer0.10' 'edje' 'eeze') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('32b9d991cb33a7c1b96ad47b3c676238cdd278b7') +sha1sums=('e42b73a268afaa022efb179966991cfb3865168b') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD index 3e2eb0c07..0ba87960e 100644 --- a/extra/empathy/PKGBUILD +++ b/extra/empathy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183346 2013-04-21 22:08:49Z heftig $ +# $Id: PKGBUILD 186309 2013-05-24 14:23:00Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=empathy -pkgver=3.8.1 +pkgver=3.8.3 pkgrel=1 pkgdesc="A GNOME instant messaging client using the Telepathy framework." arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ options=('!libtool' '!makeflags') groups=(gnome) install=empathy.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('45accc06e9c1711741b0f1476971c7e705b57ea0718a2b10ee66c5dd0397b917') +sha256sums=('61e547c6f0929b3111219349482e2395a32f41bbd0852046405d835acba965c0') build() { cd $pkgname-$pkgver diff --git a/extra/enlightenment17/PKGBUILD b/extra/enlightenment17/PKGBUILD index bc0d66b8b..06edaadd8 100644 --- a/extra/enlightenment17/PKGBUILD +++ b/extra/enlightenment17/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184843 2013-05-09 09:30:22Z ronald $ +# $Id: PKGBUILD 185679 2013-05-16 21:02:06Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=enlightenment17 _pkgname=enlightenment -pkgver=0.17.2.1 +pkgver=0.17.3 pkgrel=1 pkgdesc="Enlightenment window manager DR17 (aka e17)" arch=('i686' 'x86_64' 'mips64el') @@ -20,7 +20,7 @@ options=('!libtool' '!emptydirs') install=enlightenment17.install source=(http://download.enlightenment.org/releases/$_pkgname-$pkgver.tar.gz 'e-applications.menu' 'quickstart.patch' 'sysactions_systemd.patch') -sha1sums=('5122a2b62d151d11b28457bd3626130e9c5bcc3c' +sha1sums=('998a5ada3861028ffd65f994270e5f7f8e9baf9b' 'e08cc63cb8a188a06705b42d03e032b9fcfa7ee5' '3f53931ae86de8fe99e386aeb097521aac0decd8' '86f1c5e36dc274c3101362532378be034e89c593') diff --git a/extra/eog-plugins/PKGBUILD b/extra/eog-plugins/PKGBUILD index 112814b34..d781aa20f 100644 --- a/extra/eog-plugins/PKGBUILD +++ b/extra/eog-plugins/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183348 2013-04-21 22:08:51Z heftig $ +# $Id: PKGBUILD 186992 2013-06-02 19:43:30Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=eog-plugins -pkgver=3.8.0 +pkgver=3.8.1 pkgrel=2 pkgdesc="Plugins for Eye of Gnome" arch=('i686' 'x86_64' 'mips64el') @@ -13,12 +13,16 @@ makedepends=('intltool') install=eog-plugins.install options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('a7e4822c46654f67ef25cbc82e4c955ee84ecae92cf356e15a136032cff35e78') +sha256sums=('5cf8dab5b6622b9e712da4094185112cc84baa96f2775cc76bf654b1c443cfb9') build() { cd $pkgname-$pkgver PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --sysconfdir=/etc --localstatedir=/var + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } diff --git a/extra/eog/PKGBUILD b/extra/eog/PKGBUILD index e0dd58e42..b60bc2c34 100644 --- a/extra/eog/PKGBUILD +++ b/extra/eog/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183347 2013-04-21 22:08:50Z heftig $ +# $Id: PKGBUILD 185427 2013-05-14 09:33:41Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=eog -pkgver=3.8.0 +pkgver=3.8.2 pkgrel=1 pkgdesc="Eye of Gnome: An image viewing and cataloging program" arch=(i686 x86_64 mips64el) @@ -15,7 +15,7 @@ groups=(gnome) options=('!emptydirs' '!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('0f2f6f1eb1a373b2a6f8e5627b20815e5bf13b8c856b67d8f72d2a10b6012f2b') +sha256sums=('689251b6dd18ef191cbfd9431c0324c70707b60edd73d86fc014bd8ae0bd8336') build() { cd "$pkgname-$pkgver" diff --git a/extra/epiphany-extensions/PKGBUILD b/extra/epiphany-extensions/PKGBUILD deleted file mode 100644 index cca3a1c57..000000000 --- a/extra/epiphany-extensions/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 169866 2012-10-30 22:25:08Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Jan de Groot <jgc@archlinux.org> - -pkgname=epiphany-extensions -pkgver=3.6.0 -pkgrel=1.1 -url="http://www.gnome.org/projects/epiphany/" -pkgdesc="Various extentions for the Epiphany web browser" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -depends=('epiphany' 'opensp' 'hicolor-icon-theme') -makedepends=('intltool' 'gnome-doc-utils') -options=('!libtool' '!emptydirs') -install=epiphany-extensions.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('3a1cc21b44a7b00cfe055b87c23f20f16c9fbd2b5a30380338885a5ae0847f7a') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/extra/epiphany-extensions/epiphany-extensions.install b/extra/epiphany-extensions/epiphany-extensions.install deleted file mode 100644 index c0ed9a0d7..000000000 --- a/extra/epiphany-extensions/epiphany-extensions.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/epiphany/PKGBUILD b/extra/epiphany/PKGBUILD index 3d0b8fe7b..b0fa14489 100644 --- a/extra/epiphany/PKGBUILD +++ b/extra/epiphany/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183349 2013-04-21 22:08:53Z heftig $ +# $Id: PKGBUILD 186906 2013-05-31 18:10:20Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=epiphany -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 install=epiphany.install pkgdesc="A GNOME web browser based on the WebKit rendering engine." @@ -15,12 +15,16 @@ options=('!libtool' '!emptydirs') groups=('gnome') url="http://www.gnome.org/projects/epiphany/" source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('8c231bb1af8daf739524bd89aa44873f5936b8a849da49326427486ed825523f') +sha256sums=('ae89d6902ed243304d2cbf2fa361f6dd0cb3401fdaf726e6fdd4acc09197d50a') build() { cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } diff --git a/extra/ethtool/PKGBUILD b/extra/ethtool/PKGBUILD index 93326438f..83413fc07 100644 --- a/extra/ethtool/PKGBUILD +++ b/extra/ethtool/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 179514 2013-03-05 18:49:59Z ioni $ +# $Id: PKGBUILD 185537 2013-05-14 20:42:07Z ioni $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Martin Kemp <mdkemp@elys.com> pkgname=ethtool -pkgver=3.8 +pkgver=3.9 pkgrel=1 epoch=1 pkgdesc="Utility for controlling network drivers and hardware" @@ -13,11 +13,12 @@ url="http://www.kernel.org/pub/software/network/ethtool/" license=('GPL') depends=('glibc') source=(http://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar.xz) -md5sums=('7ae96870bc4f9b43f666650ae30f2685') +md5sums=('5777759e85b3323917c6cc9327f5d99c') build() { cd $pkgname-$pkgver - ./configure --prefix=/usr --mandir=/usr/share/man + ./configure --prefix=/usr --mandir=/usr/share/man \ + --sbindir=/usr/bin make } diff --git a/extra/ethumb/PKGBUILD b/extra/ethumb/PKGBUILD index 3f8f6578c..0a8017308 100644 --- a/extra/ethumb/PKGBUILD +++ b/extra/ethumb/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184838 2013-05-09 09:26:45Z ronald $ +# $Id: PKGBUILD 185675 2013-05-16 20:58:16Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=ethumb -pkgver=1.7.6 +pkgver=1.7.7 pkgrel=1 pkgdesc="Thumbnailing library and D-Bus service using EFL" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('libexif' 'e_dbus' 'emotion') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('7917215aead3aaef9fd20c141759b1cc17ec5c19') +sha1sums=('37d173fea2ce68ee1cedd379f235663c1211d20d') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/evas/PKGBUILD b/extra/evas/PKGBUILD index cf7ad02ed..f462e760e 100644 --- a/extra/evas/PKGBUILD +++ b/extra/evas/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185003 2013-05-09 20:12:12Z ronald $ +# $Id: PKGBUILD 185668 2013-05-16 20:55:43Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=evas -pkgver=1.7.6.1 +pkgver=1.7.7 pkgrel=1 pkgdesc="A hardware-accelerated canvas API for X-Windows" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('eet' 'giflib' 'libpng' 'libjpeg>=7' 'libxrender' 'mesa' 'fribidi' 'fontconfig' 'freetype2' 'harfbuzz' 'evas_generic_loaders') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('76b9b7338ae2a16fca25d6183355d425d4595594') +sha1sums=('0b37848127872be7250d1c3bdff622d78cb7f3af') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/evas_generic_loaders/PKGBUILD b/extra/evas_generic_loaders/PKGBUILD index c0efb7a01..cfde39745 100644 --- a/extra/evas_generic_loaders/PKGBUILD +++ b/extra/evas_generic_loaders/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184830 2013-05-09 09:24:04Z ronald $ +# $Id: PKGBUILD 186339 2013-05-25 02:56:29Z foutrelis $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=evas_generic_loaders -pkgver=1.7.6 -pkgrel=1 +pkgver=1.7.7 +pkgrel=2 pkgdesc="Additional generic loaders for Evas" arch=('i686' 'x86_64' 'mips64el') url="http://www.enlightenment.org" @@ -12,7 +12,7 @@ license=('BSD') depends=('librsvg' 'gstreamer0.10-base' 'poppler' 'libraw' 'libspectre' 'eina') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('6f3d6a0fd888f39d941436ff3e48d86981e9f636') +sha1sums=('f4c753e995a7adb5e18535f41446e222f19227c2') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/eventlog/PKGBUILD b/extra/eventlog/PKGBUILD index c0f983253..b4594a617 100644 --- a/extra/eventlog/PKGBUILD +++ b/extra/eventlog/PKGBUILD @@ -5,7 +5,7 @@ pkgname=eventlog pkgver=0.2.12 -pkgrel=3 +pkgrel=3.1 pkgdesc="API to format and send structured log messages" arch=('i686' 'x86_64' 'mips64el') url="http://www.balabit.com/support/community/products/" diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD index afb38475a..f25b66339 100644 --- a/extra/evince/PKGBUILD +++ b/extra/evince/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183350 2013-04-21 22:08:55Z heftig $ +# $Id: PKGBUILD 185565 2013-05-15 07:56:22Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evince -pkgver=3.8.0 +pkgver=3.8.2 pkgrel=1 pkgdesc="Simply a document viewer" url="http://projects.gnome.org/evince/" @@ -16,7 +16,7 @@ groups=(gnome) install=evince.install options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('cf136d2a025ef486c4e248e0dc134e7a9420557d9edc0df1ceb6a6330fbd4e9a') +sha256sums=('dd35b54b82190ba01f0c481e2d073ccddaa325ce80964b655dc167752b6bc2f5') build() { cd $pkgname-$pkgver diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD index 40c6cc802..88621b001 100644 --- a/extra/evolution-data-server/PKGBUILD +++ b/extra/evolution-data-server/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185256 2013-05-12 15:18:01Z heftig $ +# $Id: PKGBUILD 185541 2013-05-14 21:40:19Z andrea $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-data-server pkgver=3.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="Centralized access to appointments and contacts" arch=('i686' 'x86_64' 'mips64el') depends=(gnome-online-accounts nss krb5 libgweather libical db libgdata) diff --git a/extra/evolution-ews/PKGBUILD b/extra/evolution-ews/PKGBUILD index ad235fdcd..e7a3ac883 100644 --- a/extra/evolution-ews/PKGBUILD +++ b/extra/evolution-ews/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185258 2013-05-12 15:23:32Z heftig $ +# $Id: PKGBUILD 185542 2013-05-14 21:40:20Z andrea $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=evolution-ews pkgver=3.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="MS Exchange integration through Exchange Web Services" arch=('i686' 'x86_64' 'mips64el') license=('LGPL2.1') diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD index 506b1fc28..fd61dd3b3 100644 --- a/extra/evolution/PKGBUILD +++ b/extra/evolution/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185257 2013-05-12 15:22:50Z heftig $ +# $Id: PKGBUILD 185540 2013-05-14 21:40:18Z andrea $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=evolution pkgver=3.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="Manage your email, contacts and schedule" arch=('i686' 'x86_64' 'mips64el') license=(GPL) diff --git a/extra/f2fs-tools/PKGBUILD b/extra/f2fs-tools/PKGBUILD new file mode 100644 index 000000000..d033c1e3b --- /dev/null +++ b/extra/f2fs-tools/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 186280 2013-05-23 15:59:36Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Christian Hesse <mail@eworm.de> + +pkgname=f2fs-tools +pkgver=1.1.0_130404 +pkgrel=1 +pkgdesc="Tools for Flash-Friendly File System (F2FS)" +arch=('i686' 'x86_64') +url="http://sourceforge.net/projects/f2fs-tools/" +depends=('util-linux') +license=('GPL') +#source=('http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-1.1.0.tar.gz') +source=("ftp://ftp.archlinux.org/other/packages/$pkgname/$pkgname-$pkgver.tar.bz2") +md5sums=('0bb44c174a2da2a7dd1216cc46b4612c') +options=(!libtool) + +build() { + cd "${pkgname}-${pkgver}" + + autoreconf -fi + ./configure --prefix=/usr --sbindir=/usr/bin + make +} + +package() { + cd "${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}/" sbindir=/usr/bin install +} + diff --git a/extra/fbset/PKGBUILD b/extra/fbset/PKGBUILD index 03dbdc892..b991dfd92 100644 --- a/extra/fbset/PKGBUILD +++ b/extra/fbset/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 135993 2011-08-21 06:02:11Z eric $ +# $Id: PKGBUILD 185293 2013-05-13 00:49:44Z eric $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Contributor: Paul Mattal <pjmattal@elys.com> pkgname=fbset pkgver=2.1 -pkgrel=4.1 +pkgrel=5 pkgdesc="Framebuffer setup utility" arch=('i686' 'x86_64' 'mips64el') url="http://users.telenet.be/geertu/Linux/fbdev/" @@ -22,7 +22,7 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - install -D -m755 fbset "${pkgdir}/usr/sbin/fbset" + install -D -m755 fbset "${pkgdir}/usr/bin/fbset" install -D -m644 fb.modes.5 "${pkgdir}/usr/share/man/man5/fb.modes.5" install -D -m644 fbset.8 "${pkgdir}/usr/share/man/man8/fbset.8" install -D -m644 etc/fb.modes.ATI "${pkgdir}/etc/fb.modes" diff --git a/extra/five-or-more/PKGBUILD b/extra/five-or-more/PKGBUILD index 7de473167..bd3595ee2 100644 --- a/extra/five-or-more/PKGBUILD +++ b/extra/five-or-more/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183355 2013-04-21 22:09:04Z heftig $ +# $Id: PKGBUILD 186970 2013-06-01 21:56:36Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=five-or-more -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="Remove colored balls from the board by forming lines" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ install=five-or-more.install url="https://live.gnome.org/Five%20or%20more" groups=('gnome-extra') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('a050f472dadbb3f44e5cd5e4ab31058a6058f4ccaa03558311706ec0c052b056') +sha256sums=('d63055c296a73762f68d900c753c5ecbec9b20cc1ed4595feb0b7bee9900c311') build() { cd $pkgname-$pkgver diff --git a/extra/flac/PKGBUILD b/extra/flac/PKGBUILD index fa69e9dba..6c8f47393 100644 --- a/extra/flac/PKGBUILD +++ b/extra/flac/PKGBUILD @@ -1,46 +1,37 @@ -# $Id: PKGBUILD 135033 2011-08-09 23:31:20Z eric $ +# $Id: PKGBUILD 186549 2013-05-28 18:39:02Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=flac pkgname=('flac' 'flac-doc') -pkgver=1.2.1 -pkgrel=3.2 +pkgver=1.3.0 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://flac.sourceforge.net/" license=('BSD' 'GPL') depends=('libogg') -makedepends=('nasm' 'xmms') -[ "$CARCH" = "mips64el" ] && \ -makedepends=('nasm') # xmms doesn't build on mips +makedepends=('doxygen') +[ "$CARCH" = "mips64el" ] || makedepends+=('nasm' 'xmms') options=('!libtool' '!makeflags') -source=(http://downloads.sf.net/sourceforge/${pkgbase}/${pkgbase}-${pkgver}.tar.gz - flac-1.2.1-gcc-4.3-includes.patch) -md5sums=('153c8b15a54da428d1f0fadc756c22c7' - 'b9d245422bbc547b18a72897366bea77') -sha1sums=('bd54354900181b59db3089347cc84ad81e410b38' - '7e9f8c2ef4d9daf5ddd20df63b608fe19b8c1560') +source=(http://downloads.xiph.org/releases/flac/${pkgbase}-${pkgver}.tar.xz) +sha1sums=('a136e5748f8fb1e6c524c75000a765fc63bb7b1b') build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - patch -Np1 -i "${srcdir}/flac-1.2.1-gcc-4.3-includes.patch" - ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared \ - --disable-sse --disable-rpath --with-pic + cd ${pkgbase}-${pkgver} + ./configure --prefix=/usr --disable-sse make } check() { - cd "${srcdir}/${pkgbase}-${pkgver}" + cd ${pkgbase}-${pkgver} make check } package_flac() { pkgdesc="Free Lossless Audio Codec" - optdepends=('xmms: for using the xmms plugin') -[ "$CARCH" = "mips64el" ] && \ - unset optdepends + [ "$CARCH" = "mips64el" ] || optdepends=('xmms: for using the xmms plugin') options=('!libtool' '!docs') - cd "${srcdir}/${pkgbase}-${pkgver}" + cd ${pkgbase}-${pkgver} make DESTDIR="${pkgdir}" install install -D -m644 COPYING.Xiph "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } @@ -49,7 +40,8 @@ package_flac-doc() { pkgdesc="Developer documentation for the Free Lossless Audio Codec" depends=('flac') - cd "${srcdir}/${pkgbase}-${pkgver}" + cd ${pkgbase}-${pkgver} make DESTDIR="${pkgdir}" -C doc install + sed -i "s|$srcdir/${pkgbase}-${pkgver}|/usr|" "${pkgdir}/usr/share/doc/${pkgbase}-${pkgver}/FLAC.tag" install -D -m644 COPYING.Xiph "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/flac/flac-1.2.1-gcc-4.3-includes.patch b/extra/flac/flac-1.2.1-gcc-4.3-includes.patch deleted file mode 100644 index 52fec8be5..000000000 --- a/extra/flac/flac-1.2.1-gcc-4.3-includes.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur flac-1.2.1-orig/examples/cpp/encode/file/main.cpp flac-1.2.1/examples/cpp/encode/file/main.cpp ---- flac-1.2.1-orig/examples/cpp/encode/file/main.cpp 2007-09-13 09:58:03.000000000 -0600 -+++ flac-1.2.1/examples/cpp/encode/file/main.cpp 2007-11-18 12:59:45.000000000 -0600 -@@ -30,6 +30,7 @@ - - #include <stdio.h> - #include <stdlib.h> -+#include <cstring> - #include "FLAC++/metadata.h" - #include "FLAC++/encoder.h" - diff --git a/extra/fluidsynth/PKGBUILD b/extra/fluidsynth/PKGBUILD index ae6d2337d..07b790a4d 100644 --- a/extra/fluidsynth/PKGBUILD +++ b/extra/fluidsynth/PKGBUILD @@ -1,26 +1,21 @@ -# $Id: PKGBUILD 166870 2012-09-20 10:08:01Z schiv $ +# $Id: PKGBUILD 185445 2013-05-14 10:12:02Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=fluidsynth pkgver=1.1.6 -pkgrel=1.1 +pkgrel=2 pkgdesc="A real-time software synthesizer based on the SoundFont 2 specifications" arch=(i686 x86_64 'mips64el') url="http://www.fluidsynth.org/" -depends=('glib2' 'jack' 'dbus-core' 'libpulse') +depends=('glib2' 'jack' 'libpulse') makedepends=('cmake' 'ladspa' 'doxygen') optdepends=('pulseaudio: PulseAudio sound support') license=('LGPL') -backup=('etc/conf.d/fluidsynth') install=$pkgname.install source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" - 'fluidsynth.conf' - 'fluidsynth.rc' 'fluidsynth.systemd') md5sums=('ae5aca6de824b4173667cbd3a310b263' - '7d0ab0d75d4e87652f4cb7ffeac8a82b' - 'b296dbfb524c2164f552f68bd9abe2ec' 'e0406748a154409907df62292be32e8a') build() { @@ -36,16 +31,10 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir" install - install -Dm644 "$srcdir/fluidsynth.conf" \ - "$pkgdir/etc/conf.d/fluidsynth" - - install -Dm755 "$srcdir/fluidsynth.rc" \ - "$pkgdir/etc/rc.d/fluidsynth" - - install -Dm644 "$srcdir/fluidsynth.systemd" \ - "$pkgdir/usr/lib/systemd/system/fluidsynth.service" + install -Dm644 "$srcdir/$pkgname.systemd" \ + "$pkgdir/usr/lib/systemd/system/$pkgname.service" } # vim:set ts=2 sw=2 et: diff --git a/extra/fluidsynth/fluidsynth.conf b/extra/fluidsynth/fluidsynth.conf deleted file mode 100644 index b8465fa2e..000000000 --- a/extra/fluidsynth/fluidsynth.conf +++ /dev/null @@ -1,2 +0,0 @@ -FSYNTH_OPTS="-a alsa -m alsa_seq -r 48000" -FSYNTH_SOUNDFONT="" # path to your soundfont diff --git a/extra/fluidsynth/fluidsynth.install b/extra/fluidsynth/fluidsynth.install index 86e05f892..b100fc989 100644 --- a/extra/fluidsynth/fluidsynth.install +++ b/extra/fluidsynth/fluidsynth.install @@ -1,19 +1,13 @@ post_install() { echo - echo " > To use FluidSynth as a daemon edit /etc/conf.d/fluidsynth" - echo - echo " > Systemd users need to copy the service file from:" + echo " > To use FluidSynth as a daemon copy the service file from:" echo " /usr/lib/systemd/system/fluidsynth.service" echo " > to:" echo " /etc/systemd/system/multi-user.target.wants/" echo " > and then edit accordingly." echo - echo " > PulseAudio output when running as a daemon" - echo " > is known to be problematic. See:" + echo " > PulseAudio output when running as a daemon is known to be" + echo " > problematic. See the following bulletin board post:" echo " https://bbs.archlinux.org/viewtopic.php?id=135092" echo } - -post_upgrade() { - post_install -} diff --git a/extra/fluidsynth/fluidsynth.rc b/extra/fluidsynth/fluidsynth.rc deleted file mode 100644 index ca1e8fa6e..000000000 --- a/extra/fluidsynth/fluidsynth.rc +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -[ -f /etc/conf.d/fluidsynth ] && . /etc/conf.d/fluidsynth - -PID=`pidof -o %PPID /usr/bin/fluidsynth` -case "$1" in - start) - stat_busy "Starting Fluidsynth soundfont synthesizer" - [ -z "$PID" ] && /usr/bin/fluidsynth -is $FSYNTH_OPTS $FSYNTH_SOUNDFONT > /dev/null 2>&1 & - if [ $? -gt 0 ]; then - stat_fail - else - echo $PID > /var/run/fluidsynth.pid - add_daemon fluidsynth - stat_done - fi - ;; - stop) - stat_busy "Stopping Fluidsynth soundfont synthesizer" - [ ! -z "$PID" ] && kill $PID &> /dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/fluidsynth.pid - rm_daemon fluidsynth - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/fontconfig/PKGBUILD b/extra/fontconfig/PKGBUILD index d04e83746..611ae6a84 100644 --- a/extra/fontconfig/PKGBUILD +++ b/extra/fontconfig/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183357 2013-04-21 22:09:09Z heftig $ +# $Id: PKGBUILD 186044 2013-05-20 18:22:18Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=fontconfig -pkgver=2.10.92 -pkgrel=4 +pkgver=2.10.93 +pkgrel=1 pkgdesc="A library for configuring and customizing font access" arch=(i686 x86_64 'mips64el') url="http://www.fontconfig.org/release/" @@ -13,7 +13,7 @@ options=('!libtool') install=fontconfig.install source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2 29-replace-bitmap-fonts.conf git_fixes.diff) -sha256sums=('1162059927120f2321f12917189b524e6b2f09e11ac643278d0bb82634035b22' +sha256sums=('ea901f278848829ed9937d76fb0ce63ad362d7d5b9e75aa6a6b78bfef42e529c' '2325c478783659e8fce79f5754119934d6ce21f81552f878b740c7b18f9fe0d6' '7dc98137405ee0e5f98f3266a760a4da27d78e3c2bc7b7ef4db6b481df3c39f0') @@ -24,7 +24,7 @@ build() { cd "$srcdir/$pkgname-$pkgver" # post release fixes - patch -Np1 -i ${srcdir}/git_fixes.diff + #patch -Np1 -i ${srcdir}/git_fixes.diff # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo do this as well libtoolize -f diff --git a/extra/fping/PKGBUILD b/extra/fping/PKGBUILD index c512c1dcd..2a7718ba0 100644 --- a/extra/fping/PKGBUILD +++ b/extra/fping/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 166333 2012-09-06 15:45:17Z giovanni $ +# $Id: PKGBUILD 186276 2013-05-23 15:38:45Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=fping -pkgver=3.4 +pkgver=3.5 pkgrel=1 pkgdesc="A utility to ping multiple hosts at once" arch=('i686' 'x86_64' 'mips64el') @@ -11,12 +11,13 @@ url="http://www.fping.org/" license=('custom') depends=('glibc') source=("http://www.fping.org/dist/${pkgname}-${pkgver}.tar.gz") -md5sums=('a4bc97804e630dbf26dfac8f28c78091') +md5sums=('2e17cb655aa4eb59b5a4a38a89e746ed') build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --mandir=/usr/share/man \ --enable-ipv4 \ --enable-ipv6 @@ -30,5 +31,5 @@ package() { # install license install -D -m644 COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" - chmod 4555 ${pkgdir}/usr/sbin/fping + chmod 4555 ${pkgdir}/usr/bin/fping } diff --git a/extra/freetype2/PKGBUILD b/extra/freetype2/PKGBUILD index ff0ed781c..f6fe3449e 100644 --- a/extra/freetype2/PKGBUILD +++ b/extra/freetype2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 173707 2012-12-21 16:29:38Z andyrtr $ +# $Id: PKGBUILD 185748 2013-05-18 10:42:24Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=freetype2 -pkgver=2.4.11 -pkgrel=2 +pkgver=2.4.12 +pkgrel=1 pkgdesc="TrueType font rendering library" arch=(i686 x86_64 'mips64el') license=('GPL') @@ -13,7 +13,7 @@ options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2 freetype-2.3.0-enable-spr.patch freetype-2.2.1-enable-valid.patch) -md5sums=('b93435488942486c8d0ca22e8f768034' +md5sums=('3463102764315eb86c0d3c2e1f3ffb7d' '816dc8619a6904a7385769433c0a8653' '214119610444c9b02766ccee5e220680') diff --git a/extra/frozen-bubble/PKGBUILD b/extra/frozen-bubble/PKGBUILD index 319170b24..5381824f0 100644 --- a/extra/frozen-bubble/PKGBUILD +++ b/extra/frozen-bubble/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160465 2012-06-02 10:25:48Z bluewind $ +# $Id: PKGBUILD 186373 2013-05-26 09:24:23Z bluewind $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Brandon Niemczyk <maccorin@cfl.rr.com> @@ -6,7 +6,7 @@ pkgname=frozen-bubble _pkgver=2.2.1-beta1 pkgver=${_pkgver/-/} -pkgrel=4 +pkgrel=5 pkgdesc="A game in which you throw colorful bubbles and build groups to destroy the bubbles" arch=(i686 x86_64 'mips64el') url="http://www.frozen-bubble.org" diff --git a/extra/gconf-perl/PKGBUILD b/extra/gconf-perl/PKGBUILD index bca9b4528..8b3ee55a9 100644 --- a/extra/gconf-perl/PKGBUILD +++ b/extra/gconf-perl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160467 2012-06-02 10:25:52Z bluewind $ +# $Id: PKGBUILD 186374 2013-05-26 09:24:24Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gconf-perl pkgver=1.044 -pkgrel=7 +pkgrel=8 pkgdesc="Gnome2-GConf perl bindings for gconf" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD index c2868be99..1e7fc883c 100644 --- a/extra/gedit/PKGBUILD +++ b/extra/gedit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183363 2013-04-21 22:09:19Z heftig $ +# $Id: PKGBUILD 185365 2013-05-13 17:49:32Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gedit -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="A text editor for GNOME" arch=(i686 x86_64 mips64el) @@ -16,7 +16,7 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gedit.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('9e0b8a831c6d6d2b82a8f42a0e01ab1f3398fed2cca0b65d0a105d134a5c4dce') +sha256sums=('1b7450cb194d4dadb7a82635d0e7f92da2b65a8487341e0410b676d9f33e19d2') build() { cd $pkgname-$pkgver diff --git a/extra/ghex/PKGBUILD b/extra/ghex/PKGBUILD index f70aba975..ee2bd74bc 100644 --- a/extra/ghex/PKGBUILD +++ b/extra/ghex/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183364 2013-04-21 22:09:21Z heftig $ +# $Id: PKGBUILD 185359 2013-05-13 17:41:00Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=ghex -pkgver=3.8.0 +pkgver=3.8.1 pkgrel=1 pkgdesc="A simple binary editor for the Gnome desktop" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('intltool' 'itstool' 'docbook-xsl') options=('!libtool' '!emptydirs') install=ghex.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('40b08fff065575e91f161904952aaa14919ffe053f3849c47ab567ac93a4d3fc') +sha256sums=('84ce220eed0dc9f640a87db68533e65a4dc06a1a6136b244270d8b2a1ae93534') build() { cd $pkgname-$pkgver diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 420b9cbe0..161a431da 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185043 2013-05-10 16:49:05Z dan $ +# $Id: PKGBUILD 186460 2013-05-26 20:12:59Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.8.2.3 +pkgver=1.8.3 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64 'mips64el') @@ -107,7 +107,7 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('03ebfd403a8cf355da0e3f15e53b8925' - '891481ec6ecd9ee530701378e5b61d3f' +md5sums=('d91b6099fb6763cf92c696977a247060' + '0b469c0fd81b4a56b9059d7c443282f0' '042524f942785772d7bd52a1f02fe5ae' 'f67869315c2cc112e076f0c73f248002') diff --git a/extra/glade-perl/PKGBUILD b/extra/glade-perl/PKGBUILD index cf7eaf91c..f1047ceea 100644 --- a/extra/glade-perl/PKGBUILD +++ b/extra/glade-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160469 2012-06-02 10:25:54Z bluewind $ +# $Id: PKGBUILD 186375 2013-05-26 09:24:26Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=glade-perl _realname=Gtk2-GladeXML pkgver=1.007 -pkgrel=6 +pkgrel=7 pkgdesc="Gtk2-GladeXML perl bindings for glade 2.x" arch=(i686 x86_64 'mips64el') license=('LGPL') diff --git a/extra/glib-networking/PKGBUILD b/extra/glib-networking/PKGBUILD index 2b35e7372..cb2cf05c4 100644 --- a/extra/glib-networking/PKGBUILD +++ b/extra/glib-networking/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183367 2013-04-21 22:09:26Z heftig $ +# $Id: PKGBUILD 185433 2013-05-14 09:44:30Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=glib-networking -pkgver=2.36.1 +pkgver=2.36.2 pkgrel=1 pkgdesc="Network-related giomodules for glib" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=(intltool) options=('!libtool') install=glib-networking.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('e2df2d1943a6193ca471addc58539895da1ae96fdba305dedb937ef56adb57ea') +sha256sums=('2108d55b0af3eea56ce256830bcaf1519d6337e0054ef2eff80f2c0ef0eb23f9') build() { cd $pkgname-$pkgver diff --git a/extra/glib-perl/0001-Make-Glib-Object-subclassing-more-robust.patch b/extra/glib-perl/0001-Make-Glib-Object-subclassing-more-robust.patch new file mode 100644 index 000000000..fe92fbd94 --- /dev/null +++ b/extra/glib-perl/0001-Make-Glib-Object-subclassing-more-robust.patch @@ -0,0 +1,230 @@ +From ebf55199407d3be92162f5c2573c7f9c34614cb1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Torsten=20Sch=C3=B6nfeld?= <kaffeetisch@gmx.de> +Date: Thu, 2 Aug 2012 21:41:41 +0200 +Subject: [PATCH] Make Glib::Object subclassing more robust +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Rearrange how we register the interfaces, properties and signals of a newly +created type so that: + +• The outcome is independent of the order of the arguments passed to +Glib::Object::Subclass or Glib::Type->register. This also avoids fallout from +the change to hash randomization in perl 5.17.6. + +• We register things in the correct order: interfaces first, before entering +class_init; then properties and signals from within class_init. This also +avoids prematurely creating the new type's class. +--- + GType.xs | 92 ++++++++++++++++++++++++++++++++++++++++++++++++---------------- + NEWS | 7 +++++ + 2 files changed, 77 insertions(+), 22 deletions(-) + +diff --git a/GType.xs b/GType.xs +index 02e24a4..fdaad68 100644 +--- a/GType.xs ++++ b/GType.xs +@@ -1234,13 +1234,10 @@ parse_signal_hash (GType instance_type, + + + static void +-add_signals (GType instance_type, HV * signals) ++add_signals (GType instance_type, HV * signals, AV * interfaces) + { +- GObjectClass *oclass; + HE * he; + +- oclass = g_type_class_ref (instance_type); +- + hv_iterinit (signals); + while (NULL != (he = hv_iternext (signals))) { + I32 keylen; +@@ -1250,9 +1247,36 @@ add_signals (GType instance_type, HV * signals) + + /* the key is the signal name */ + signal_name = hv_iterkey (he, &keylen); +- /* if the signal is defined at this point, we're going to +- * override the installed closure. */ +- signal_id = g_signal_lookup (signal_name, instance_type); ++ ++ /* if, at this point, the signal is already defined in the ++ * ancestry or the interfaces we just added to instance_type, ++ * we can only override the installed closure. trying to ++ * create a new signal with the same name is an error. ++ * ++ * unfortunately, we cannot simply use instance_type to do the ++ * lookup because g_signal_lookup would complain about it since ++ * it hasn't been fully loaded yet. see ++ * <https://bugzilla.gnome.org/show_bug.cgi?id=691096>. ++ * ++ * FIXME: the "if (signal_id)" check in the hash ref block ++ * below could be removed since g_signal_newv also checks this. ++ * consequently, this lookup code could be moved into the class ++ * closure block below. */ ++ signal_id = g_signal_lookup (signal_name, ++ g_type_parent (instance_type)); ++ if (!signal_id && interfaces) { ++ int i; ++ for (i = 0; i <= av_len (interfaces); i++) { ++ GType interface_type; ++ SV ** svp = av_fetch (interfaces, i, FALSE); ++ if (!svp || !gperl_sv_is_defined (*svp)) ++ continue; ++ interface_type = gperl_object_type_from_package (SvPV_nolen (*svp)); ++ signal_id = g_signal_lookup (signal_name, interface_type); ++ if (signal_id) ++ break; ++ } ++ } + + /* parse the key's value... */ + value = hv_iterval (signals, he); +@@ -1310,8 +1334,6 @@ add_signals (GType instance_type, HV * signals) + signal_name); + } + } +- +- g_type_class_unref (oclass); + } + + typedef struct { +@@ -1407,13 +1429,10 @@ prop_handler_lookup (GType instance_type, + } + + static void +-add_properties (GType instance_type, AV * properties) ++add_properties (GType instance_type, GObjectClass * oclass, AV * properties) + { +- GObjectClass *oclass; + int propid; + +- oclass = g_type_class_ref (instance_type); +- + for (propid = 0; propid <= av_len (properties); propid++) { + SV * sv = *av_fetch (properties, propid, 1); + GParamSpec * pspec = NULL; +@@ -1452,8 +1471,6 @@ add_properties (GType instance_type, AV * properties) + } + g_object_class_install_property (oclass, propid + 1, pspec); + } +- +- g_type_class_unref (oclass); + } + + /* +@@ -1776,12 +1793,26 @@ gperl_type_reg_quark (void) + return q; + } + ++typedef struct { ++ GType instance_type; ++ AV *interfaces; ++ AV *properties; ++ HV *signals; ++} GPerlClassData; ++ + static void +-gperl_type_class_init (GObjectClass * class) ++gperl_type_class_init (GObjectClass * class, GPerlClassData * class_data) + { + class->finalize = gperl_type_finalize; + class->get_property = gperl_type_get_property; + class->set_property = gperl_type_set_property; ++ ++ if (class_data->properties) ++ add_properties (class_data->instance_type, class, ++ class_data->properties); ++ if (class_data->signals) ++ add_signals (class_data->instance_type, ++ class_data->signals, class_data->interfaces); + } + + static void +@@ -2152,15 +2183,18 @@ g_type_register_object (class, parent_package, new_package, ...); + PREINIT: + int i; + GTypeInfo type_info; ++ GPerlClassData class_data; + GTypeQuery query; + GType parent_type, new_type; + char * new_type_name; + CODE: + /* start with a clean slate */ + memset (&type_info, 0, sizeof (GTypeInfo)); ++ memset (&class_data, 0, sizeof (GPerlClassData)); + type_info.base_init = (GBaseInitFunc) gperl_type_base_init; + type_info.class_init = (GClassInitFunc) gperl_type_class_init; + type_info.instance_init = (GInstanceInitFunc) gperl_type_instance_init; ++ type_info.class_data = &class_data; + + /* yeah, i could just call gperl_object_type_from_package directly, + * but i want the error messages to be more informative. */ +@@ -2196,29 +2230,43 @@ g_type_register_object (class, parent_package, new_package, ...); + /* mark this type as "one of ours". */ + g_type_set_qdata (new_type, gperl_type_reg_quark (), (gpointer) TRUE); + +- /* now look for things we should initialize presently, e.g. +- * signals and properties and interfaces and such, things that +- * would generally go into a class_init. */ ++ /* put it into the class data so that add_signals and add_properties ++ * can use it. */ ++ class_data.instance_type = new_type; ++ ++ /* now look for things we should initialize, e.g. signals and ++ * properties and interfaces. put the corresponding data into the ++ * class_data struct. the interfaces will be handled directly further ++ * below, while the properties and signals will be handled in the ++ * class_init function so that they have access to the class instance. ++ * this mimics the way things are supposed to be done in C: register ++ * interfaces in the get_type function, and register properties and ++ * signals in the class_init function. */ + for (i = 3 ; i < items ; i += 2) { + char * key = SvPV_nolen (ST (i)); + if (strEQ (key, "signals")) { + if (gperl_sv_is_hash_ref (ST (i+1))) +- add_signals (new_type, (HV*)SvRV (ST (i+1))); ++ class_data.signals = (HV*)SvRV (ST (i+1)); + else + croak ("signals must be a hash of signalname => signalspec pairs"); + } else if (strEQ (key, "properties")) { + if (gperl_sv_is_array_ref (ST (i+1))) +- add_properties (new_type, (AV*)SvRV (ST (i+1))); ++ class_data.properties = (AV*)SvRV (ST (i+1)); + else + croak ("properties must be an array of GParamSpecs"); + } else if (strEQ (key, "interfaces")) { + if (gperl_sv_is_array_ref (ST (i+1))) +- add_interfaces (new_type, (AV*)SvRV (ST (i+1))); ++ class_data.interfaces = (AV*)SvRV (ST (i+1)); + else + croak ("interfaces must be an array of package names"); + } + } + ++ /* add the interfaces to the type now before we create its class and ++ * enter the class_init function. */ ++ if (class_data.interfaces) ++ add_interfaces (new_type, class_data.interfaces); ++ + /* instantiate the class right now. perl doesn't let classes go + * away once they've been defined, so we'll just leak this ref and + * let the GObjectClass live as long as the program. in fact, +diff --git a/NEWS b/NEWS +index 5606566..ad71da0 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,3 +1,10 @@ ++Overview of changes in Glib <next> (unstable) ++============================================ ++ ++* Make Glib::Object subclassing more robust. This should in particular fix ++ issues revealed by the change to hash randomization introduced in perl ++ 5.17.6. ++ + Overview of changes in Glib 1.280 (stable) + ========================================== + +-- +1.8.2.3 + diff --git a/extra/glib-perl/PKGBUILD b/extra/glib-perl/PKGBUILD index 8d1ad7ffd..ee1300607 100644 --- a/extra/glib-perl/PKGBUILD +++ b/extra/glib-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183484 2013-04-21 22:21:04Z heftig $ +# $Id: PKGBUILD 186376 2013-05-26 09:24:27Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sarah Hay <sarah@archlinux.org> pkgname=glib-perl pkgver=1.280 -pkgrel=1 +pkgrel=3 pkgdesc="Perl wrappers for glib 2.x, including GObject" arch=(i686 x86_64 'mips64el') license=('LGPL') @@ -12,8 +12,17 @@ url="http://gtk2-perl.sourceforge.net/" options=('!emptydirs') depends=('glib2' 'perl') makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig') -source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Glib-${pkgver}.tar.gz) -md5sums=('1d81a8aec5f7f1182a96cfaaf119d866') +source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Glib-${pkgver}.tar.gz + 0001-Make-Glib-Object-subclassing-more-robust.patch) +md5sums=('1d81a8aec5f7f1182a96cfaaf119d866' + 'ebe39d50eff182a1ad4390cbbef46e41') + +prepare() { + cd "${srcdir}/Glib-${pkgver}" + + # Needed for gtk2-perl to compile against Perl 5.18 + patch -Np1 -i "${srcdir}/0001-Make-Glib-Object-subclassing-more-robust.patch" +} build() { cd "${srcdir}/Glib-${pkgver}" diff --git a/extra/gnokii/PKGBUILD b/extra/gnokii/PKGBUILD deleted file mode 100644 index e79e980f7..000000000 --- a/extra/gnokii/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 180682 2013-03-25 19:15:33Z bpiotrowski $ -# Maintainer: -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Roman Kyrylych <roman@archlinux.org> -# Contributor: Aurelien Foret <orelien@chez.com> - -pkgname=gnokii -pkgver=0.6.31 -pkgrel=3 -pkgdesc="Tools and user space driver for use with mobile phones" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.gnokii.org/" -license=('GPL') -depends=('libusb-compat' 'libxpm' 'bluez' 'libical') -makedepends=('gtk2' 'libmariadbclient' 'postgresql-libs' 'intltool' 'mariadb') -optdepends=('gtk2: xgnokii GUI' - 'libmariadbclient: smsd mysql backend' - 'postgresql-libs: smsd postgresql backend') -backup=('etc/gnokiirc') -options=('!libtool' '!makeflags') -source=("http://www.gnokii.org/download/$pkgname/$pkgname-${pkgver}.tar.bz2" - 'gnokii.patch') -md5sums=('d9627f4a1152d3ea7806df4532850d5f' - 'fd1c448114c2e0de8e05981030f0e69f') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # FS#13249 - sed -i 's|cellphone|phone|' xgnokii/xgnokii.desktop.in - - patch -Np1 -i "${srcdir}/gnokii.patch" - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --enable-security \ - --disable-unix98test - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -Dm644 Docs/sample/gnokiirc "${pkgdir}/etc/gnokiirc" -} diff --git a/extra/gnokii/gnokii.patch b/extra/gnokii/gnokii.patch deleted file mode 100644 index db593cdf4..000000000 --- a/extra/gnokii/gnokii.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nura gnokii-0.6.31.orig/Docs/sample/gnokiirc gnokii-0.6.31/Docs/sample/gnokiirc ---- gnokii-0.6.31.orig/Docs/sample/gnokiirc 2011-12-02 15:53:04.000000000 +0100 -+++ gnokii-0.6.31/Docs/sample/gnokiirc 2012-02-18 12:49:26.957557504 +0100 -@@ -238,7 +238,7 @@ - # In particular ensure that mgnokiidev is in this location, with - # permissions 4750, owned by root, group gnokii. Ensure you - # are in the gnokii group and that the group exists... --bindir = /usr/local/sbin/ -+bindir = /usr/sbin/ - - # Any entries in the following two sections will be set as environment - # variables when running the scripts. diff --git a/extra/gnome-calculator/PKGBUILD b/extra/gnome-calculator/PKGBUILD index 97732cd54..b785093ac 100644 --- a/extra/gnome-calculator/PKGBUILD +++ b/extra/gnome-calculator/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183370 2013-04-21 22:09:37Z heftig $ +# $Id: PKGBUILD 185451 2013-05-14 10:16:40Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-calculator -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="GNOME Scientific calculator" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ options=(!emptydirs) url="http://www.gnome.org" install=gnome-calculator.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('24ae856c90a3df62c52dc413ceb2c9bad15e7ad146de0469b53c70681a4ad435') +sha256sums=('13d67b6dfa2501b883add8adf5470c5fea5eb1f1fa87f84e8ceda069418f1e81') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-chess/PKGBUILD b/extra/gnome-chess/PKGBUILD index 5ec4bb961..c9dd18a58 100644 --- a/extra/gnome-chess/PKGBUILD +++ b/extra/gnome-chess/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 183371 2013-04-21 22:09:39Z heftig $ +# $Id: PKGBUILD 185633 2013-05-16 14:54:23Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-chess -pkgver=3.8.1 +pkgver=3.8.2.1 pkgrel=1 pkgdesc="Play the classic two-player boardgame of chess" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg' 'sqlite') makedepends=('intltool' 'itstool' 'gobject-introspection') +optdepends=('gnuchess: Play against computer') conflicts=('gnome-games') replaces=('gnome-games') options=('!emptydirs' '!libtool') @@ -17,7 +18,7 @@ install=gnome-chess.install url="https://live.gnome.org/Chess" groups=('gnome-extra') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('f8a756d0e532ee9532745257bcb3514b3e75a0e2fa7e75b7358b59cdaf3a7661') +sha256sums=('d38cf534eeeffa4db81edf9db92c0c188d5ffd52cd7091352a0972b2b5c655cb') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-clocks/PKGBUILD b/extra/gnome-clocks/PKGBUILD index 2e25edaba..d31c53891 100644 --- a/extra/gnome-clocks/PKGBUILD +++ b/extra/gnome-clocks/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183372 2013-04-21 22:09:40Z heftig $ +# $Id: PKGBUILD 185477 2013-05-14 11:11:41Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-clocks -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="Clocks applications for GNOME" arch=(i686 x86_64 mips64el) @@ -20,7 +20,7 @@ source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::3}/${pkgname button-border-go-active.svg::http://git.gnome.org/browse/gnome-clocks/plain/data/css/button-border-go-active.svg?id=${pkgver} button-border-stop.svg::http://git.gnome.org/browse/gnome-clocks/plain/data/css/button-border-stop.svg?id=${pkgver} button-border-stop-active.svg::http://git.gnome.org/browse/gnome-clocks/plain/data/css/button-border-stop-active.svg?id=${pkgver}) -sha256sums=('6140cc1ae41460c5fc799b2a52d809ed4cf9035a72be7e878160b5e591486d31' +sha256sums=('afe8405e41d8d2ac570642c2d73a43a2a45f8c6e521640d0a266e0fe0a55410f' '3ce4afb848ea2a2728c53a9f4bfca5f12d9719e3935d1acd2d90056cb1c464fc' 'a44df652c8034ccbbc87a62f92ab6efbf6dfabead44e3316b4b9e85d851a6b24' 'e12ac57acaa43b25a36d9fd9b6dbe906980a5e8429840d98c604bf28515749e0' diff --git a/extra/gnome-color-manager/PKGBUILD b/extra/gnome-color-manager/PKGBUILD index d61a15334..e25240abd 100644 --- a/extra/gnome-color-manager/PKGBUILD +++ b/extra/gnome-color-manager/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183373 2013-04-21 22:09:42Z heftig $ +# $Id: PKGBUILD 185315 2013-05-13 09:38:38Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-color-manager -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="Color profile manager for the GNOME desktop" arch=(i686 x86_64 'mips64el') @@ -15,7 +15,7 @@ install=gnome-color-manager.install options=('!libtool' '!emptydirs') groups=('gnome-extra') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('61851022ccfa090f21ce027c36cd440597648401aafa2c8b3d3f7787a866bb49') +sha256sums=('6b9999d8213c8cab7abb7c9b1833d1d599866546180d11603fdee5430f93bae1') build(){ cd $pkgname-$pkgver diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD index 6e74ca556..5ba599d6d 100644 --- a/extra/gnome-control-center/PKGBUILD +++ b/extra/gnome-control-center/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184352 2013-05-06 17:20:30Z heftig $ +# $Id: PKGBUILD 185509 2013-05-14 12:14:45Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-control-center -pkgver=3.8.1.5 +pkgver=3.8.2 pkgrel=1 pkgdesc="The Control Center for GNOME" license=(GPL) @@ -23,7 +23,7 @@ url="http://www.gnome.org" install=gnome-control-center.install options=('!libtool' '!emptydirs') source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) -sha256sums=('6756a97eb8e89fe16bd5e50ab85d7f0e4e0fb7fa4e9df5ab49a97de03033d211') +sha256sums=('abf6c1acb0b82631e730cb32762deff905fd4f776b89b475b8e732dc73a9d1fb') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD index b5833da36..c1cd8b85d 100644 --- a/extra/gnome-desktop/PKGBUILD +++ b/extra/gnome-desktop/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183376 2013-04-21 22:09:47Z heftig $ +# $Id: PKGBUILD 185455 2013-05-14 10:21:59Z heftig $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gnome-desktop -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 epoch=1 pkgdesc="Library with common API for various GNOME modules" @@ -14,7 +14,7 @@ url="http://www.gnome.org" groups=('gnome') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) -sha256sums=('79c4790fdfc58a54ee32b2fd20f498f4d563d11fa40ab6599c757e45bee5b13f') +sha256sums=('af4ec330fa61ee761daf2d5e481e2f9ffbd068d135d5e31a3eaf274524cba33d') build() { cd "$pkgname-$pkgver" diff --git a/extra/gnome-disk-utility/PKGBUILD b/extra/gnome-disk-utility/PKGBUILD index ebf26d532..17afe93d1 100644 --- a/extra/gnome-disk-utility/PKGBUILD +++ b/extra/gnome-disk-utility/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183379 2013-04-21 22:09:51Z heftig $ +# $Id: PKGBUILD 186559 2013-05-29 01:23:46Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Silvio Knizek (killermoehre) pkgname=gnome-disk-utility -pkgver=3.8.0 -pkgrel=2 +pkgver=3.8.2 +pkgrel=1 pkgdesc="Disk Management Utility for GNOME" arch=('i686' 'x86_64' 'mips64el') license=(GPL) @@ -14,8 +14,17 @@ depends=(udisks2 gtk3 libsecret libpwquality libcanberra libdvdread libnotify hi makedepends=(intltool docbook-xsl gnome-settings-daemon) options=('!libtool' '!emptydirs') install=gnome-disk-utility.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('2657aad8d06e5511bc34ee5ec1ff9426f70b7140b8687be528f693175759bd5e') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + typefixes.patch) +sha256sums=('6a64de6f40ddfebfe7566f3ef7856c1cb33fab7d21d9be43db74f014309298c3' + '0a1f2f80f1c741119639b3b2b8cf32d6261b126baa85189309d6473e171894d2') + +prepare() { + cd $pkgname-$pkgver + + # Gets rid of warnings and compilation errors on i686 + patch -Np1 -i ../typefixes.patch +} build() { cd $pkgname-$pkgver diff --git a/extra/gnome-disk-utility/typefixes.patch b/extra/gnome-disk-utility/typefixes.patch new file mode 100644 index 000000000..79439e4de --- /dev/null +++ b/extra/gnome-disk-utility/typefixes.patch @@ -0,0 +1,97 @@ +diff -u -r gnome-disk-utility-3.8.2/src/disks/gducreatediskimagedialog.c gnome-disk-utility-3.8.2-typefixes/src/disks/gducreatediskimagedialog.c +--- gnome-disk-utility-3.8.2/src/disks/gducreatediskimagedialog.c 2013-05-14 07:15:48.000000000 +0200 ++++ gnome-disk-utility-3.8.2-typefixes/src/disks/gducreatediskimagedialog.c 2013-05-29 03:17:37.201963964 +0200 +@@ -610,7 +610,7 @@ + error)) + { + g_prefix_error (error, +- "Error writing %" G_GUINT64_FORMAT " bytes to offset %" G_GUINT64_FORMAT ": ", ++ "Error writing %" G_GSIZE_FORMAT " bytes to offset %" G_GUINT64_FORMAT ": ", + num_bytes_to_write, + offset); + goto out; +diff -u -r gnome-disk-utility-3.8.2/src/disks/gducreatefilesystemwidget.c gnome-disk-utility-3.8.2-typefixes/src/disks/gducreatefilesystemwidget.c +--- gnome-disk-utility-3.8.2/src/disks/gducreatefilesystemwidget.c 2013-05-14 07:15:48.000000000 +0200 ++++ gnome-disk-utility-3.8.2-typefixes/src/disks/gducreatefilesystemwidget.c 2013-05-29 03:18:30.224935009 +0200 +@@ -429,7 +429,7 @@ + if (widget->drive != NULL && udisks_drive_get_removable (widget->drive)) + { + /* default FAT for flash and disks/media smaller than 20G (assumed to be flash cards) */ +- if (is_flash (widget->drive) || udisks_drive_get_size (widget->drive) < 20L * 1000L*1000L*1000L) ++ if (is_flash (widget->drive) || udisks_drive_get_size (widget->drive) < (guint64)(20ULL * 1000ULL*1000ULL*1000ULL)) + { + gtk_combo_box_set_active_id (GTK_COMBO_BOX (widget->type_combobox), "vfat"); + } +diff -u -r gnome-disk-utility-3.8.2/src/disks/gduformatdiskdialog.c gnome-disk-utility-3.8.2-typefixes/src/disks/gduformatdiskdialog.c +--- gnome-disk-utility-3.8.2/src/disks/gduformatdiskdialog.c 2013-05-14 07:15:48.000000000 +0200 ++++ gnome-disk-utility-3.8.2-typefixes/src/disks/gduformatdiskdialog.c 2013-05-29 03:17:37.338629696 +0200 +@@ -293,7 +293,7 @@ + /* Default to MBR for removable drives < 2TB... GPT otherwise */ + if (data->drive != NULL && + udisks_drive_get_removable (data->drive) && +- udisks_drive_get_size (data->drive) < 2 * 1000L*1000L*1000L*1000L) ++ udisks_drive_get_size (data->drive) < (guint64)(2ULL * 1000ULL*1000ULL*1000ULL*1000ULL)) + { + gtk_combo_box_set_active_id (GTK_COMBO_BOX (data->type_combobox), "dos"); + } +diff -u -r gnome-disk-utility-3.8.2/src/disks/gdupartitiondialog.c gnome-disk-utility-3.8.2-typefixes/src/disks/gdupartitiondialog.c +--- gnome-disk-utility-3.8.2/src/disks/gdupartitiondialog.c 2013-05-14 07:15:48.000000000 +0200 ++++ gnome-disk-utility-3.8.2-typefixes/src/disks/gdupartitiondialog.c 2013-05-29 03:17:37.338629696 +0200 +@@ -91,11 +91,11 @@ + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->bootable_checkbutton))) + flags |= (1UL<<2); + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->readonly_checkbutton))) +- flags |= (1UL<<60); ++ flags |= (1ULL<<60); + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->hidden_checkbutton))) +- flags |= (1UL<<62); ++ flags |= (1ULL<<62); + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->do_not_automount_checkbutton))) +- flags |= (1UL<<63); ++ flags |= (1ULL<<63); + } + else if (g_strcmp0 (data->partition_table_type, "dos") == 0) + { +@@ -245,9 +245,9 @@ + flags = udisks_partition_get_flags (data->partition); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->system_checkbutton), (flags & (1UL<< 0)) != 0); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->bootable_checkbutton), (flags & (1UL<< 2)) != 0); +- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->readonly_checkbutton), (flags & (1UL<<60)) != 0); +- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->hidden_checkbutton), (flags & (1UL<<62)) != 0); +- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->do_not_automount_checkbutton), (flags & (1UL<<63)) != 0); ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->readonly_checkbutton), (flags & (1ULL<<60)) != 0); ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->hidden_checkbutton), (flags & (1ULL<<62)) != 0); ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->do_not_automount_checkbutton), (flags & (1ULL<<63)) != 0); + } + else if (g_strcmp0 (data->partition_table_type, "dos") == 0) + { +diff -u -r gnome-disk-utility-3.8.2/src/disks/gdurestorediskimagedialog.c gnome-disk-utility-3.8.2-typefixes/src/disks/gdurestorediskimagedialog.c +--- gnome-disk-utility-3.8.2/src/disks/gdurestorediskimagedialog.c 2013-05-14 07:15:48.000000000 +0200 ++++ gnome-disk-utility-3.8.2-typefixes/src/disks/gdurestorediskimagedialog.c 2013-05-29 03:17:37.485295361 +0200 +@@ -587,7 +587,7 @@ + &error)) + { + g_prefix_error (&error, +- "Error reading %" G_GUINT64_FORMAT " bytes from offset %" G_GUINT64_FORMAT ": ", ++ "Error reading %" G_GSIZE_FORMAT " bytes from offset %" G_GUINT64_FORMAT ": ", + num_bytes_to_read, + num_bytes_completed); + goto out; +@@ -595,7 +595,7 @@ + if (num_bytes_read != num_bytes_to_read) + { + g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED, +- "Requested %" G_GUINT64_FORMAT " bytes from offset %" G_GUINT64_FORMAT " but only read %" G_GUINT64_FORMAT " bytes", ++ "Requested %" G_GSIZE_FORMAT " bytes from offset %" G_GUINT64_FORMAT " but only read %" G_GSIZE_FORMAT " bytes", + num_bytes_read, + num_bytes_completed, + num_bytes_to_read); +@@ -610,7 +610,7 @@ + goto copy_write_again; + + g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED, +- "Error writing %" G_GUINT64_FORMAT " bytes to offset %" G_GUINT64_FORMAT ": %m", ++ "Error writing %" G_GSIZE_FORMAT " bytes to offset %" G_GUINT64_FORMAT ": %m", + num_bytes_read, + num_bytes_completed); + goto out; diff --git a/extra/gnome-documents/PKGBUILD b/extra/gnome-documents/PKGBUILD index db1ce515f..a032e2db7 100644 --- a/extra/gnome-documents/PKGBUILD +++ b/extra/gnome-documents/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183380 2013-04-21 22:09:52Z heftig $ +# $Id: PKGBUILD 185457 2013-05-14 10:25:02Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-documents -pkgver=3.8.1 +pkgver=3.8.2.1 pkgrel=1 pkgdesc="Documents Manager for GNOME" arch=(i686 x86_64 mips64el) @@ -15,8 +15,8 @@ makedepends=(intltool gobject-introspection itstool) optdepends=('unoconv: Support for Libreoffice document types') options=('!libtool') install=gnome-documents.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('7cd05f5f2482ddae797300b233f499cbe410cb22d358bef37a387aff232d4e9f') +source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) +sha256sums=('52cbe1590b47fbf446becde227e0fa3772dda589b631ab1350a034c2eae77b85') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-klotski/PKGBUILD b/extra/gnome-klotski/PKGBUILD index 99d1552d8..d0619306e 100644 --- a/extra/gnome-klotski/PKGBUILD +++ b/extra/gnome-klotski/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183386 2013-04-21 22:10:02Z heftig $ +# $Id: PKGBUILD 185360 2013-05-13 17:42:01Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-klotski -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="Slide blocks to solve the puzzle" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ install=gnome-klotski.install url="https://live.gnome.org/Klotski" groups=('gnome-extra') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('85b2936dc9390bb09d622984b169c0d921b99d786fbd0060d39d319c38d31c71') +sha256sums=('757a531542272b8d2191facb034e5033ba3aa340d5303b8d939f78045d91910c') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-nettool/PKGBUILD b/extra/gnome-nettool/PKGBUILD index e1da9bfed..e57680e55 100644 --- a/extra/gnome-nettool/PKGBUILD +++ b/extra/gnome-nettool/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184172 2013-05-03 03:24:57Z heftig $ +# $Id: PKGBUILD 186905 2013-05-31 18:09:23Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Kritoke <kritoke@nospam.gmail.com> pkgname=gnome-nettool -pkgver=3.8.0 +pkgver=3.8.1 pkgrel=1 pkgdesc="A Collection of GNOME3 Networking Tools." arch=(i686 x86_64 mips64el) @@ -16,14 +16,11 @@ optdepends=('nmap: Port scanning' groups=(gnome-extra) url="http://www.gnome.org" install=gnome-nettool.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - printf.patch) -sha256sums=('3a3480dcef181684f3e37d779cfd43f9b21920412aff78501de1695faf194a28' - '4b06c0748650996100f710a2d7c90afc8fb75bbdd1984f243f42318d0985229e') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1') build() { cd $pkgname-$pkgver - patch -Np1 -i ../printf.patch ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-schemas-compile make diff --git a/extra/gnome-nettool/printf.patch b/extra/gnome-nettool/printf.patch deleted file mode 100644 index 89868411a..000000000 --- a/extra/gnome-nettool/printf.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -u -r gnome-nettool-3.8.0/src/info.c gnome-nettool-3.8.0-printf/src/info.c ---- gnome-nettool-3.8.0/src/info.c 2013-05-02 13:58:40.000000000 +0200 -+++ gnome-nettool-3.8.0-printf/src/info.c 2013-05-03 05:20:04.684921458 +0200 -@@ -232,13 +232,13 @@ - text_rx_bytes = util_legible_bytes (netload.bytes_in); - text_tx_bytes = util_legible_bytes (netload.bytes_out); - -- g_sprintf (rx_pkt, "%lld", netload.packets_in); -- g_sprintf (tx_pkt, "%lld", netload.packets_out); -+ g_sprintf (rx_pkt, "%" G_GUINT64_FORMAT, netload.packets_in); -+ g_sprintf (tx_pkt, "%" G_GUINT64_FORMAT, netload.packets_out); - -- g_sprintf (rx_error, "%lld", netload.errors_in); -- g_sprintf (tx_error, "%lld", netload.errors_out); -+ g_sprintf (rx_error, "%" G_GUINT64_FORMAT, netload.errors_in); -+ g_sprintf (tx_error, "%" G_GUINT64_FORMAT, netload.errors_out); - -- g_sprintf (collisions, "%lld", netload.collisions); -+ g_sprintf (collisions, "%" G_GUINT64_FORMAT, netload.collisions); - - gtk_label_set_text (GTK_LABEL (info->tx_bytes), text_tx_bytes); - gtk_label_set_text (GTK_LABEL (info->tx), tx_pkt); -diff -u -r gnome-nettool-3.8.0/src/utils.c gnome-nettool-3.8.0-printf/src/utils.c ---- gnome-nettool-3.8.0/src/utils.c 2013-05-02 13:58:40.000000000 +0200 -+++ gnome-nettool-3.8.0-printf/src/utils.c 2013-05-03 05:21:45.704202804 +0200 -@@ -272,7 +272,7 @@ - unit = "KiB"; - } - -- result = g_strdup_printf ("%lld.%lld %s", short_rx / 10, -+ result = g_strdup_printf ("%" G_GUINT64_FORMAT ".%" G_GUINT64_FORMAT " %s", short_rx / 10, - short_rx % 10, unit); - return result; - } diff --git a/extra/gnome-online-accounts/PKGBUILD b/extra/gnome-online-accounts/PKGBUILD index b58d1bcfb..253cec562 100644 --- a/extra/gnome-online-accounts/PKGBUILD +++ b/extra/gnome-online-accounts/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183392 2013-04-21 22:10:11Z heftig $ +# $Id: PKGBUILD 185462 2013-05-14 10:31:45Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gnome-online-accounts -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="GNOME service to access online accounts" arch=(i686 x86_64 mips64el) @@ -13,7 +13,7 @@ makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl') options=(!libtool) install=$pkgname.install source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('26c334000ae74832042142a150e7d0c4b5ced4dc24bdb247f75cbb9e3d2e7261') +sha256sums=('12611a002043c8acc29e9800ec009e3e19736bdb6237d246e848d7c7909fe826') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-perl/PKGBUILD b/extra/gnome-perl/PKGBUILD index 9c101b8dd..62b340582 100644 --- a/extra/gnome-perl/PKGBUILD +++ b/extra/gnome-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160473 2012-06-02 10:26:01Z bluewind $ +# $Id: PKGBUILD 186378 2013-05-26 09:24:29Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-perl _realname=Gnome2 pkgver=1.042 -pkgrel=8 +pkgrel=9 pkgdesc="Perl bindings for libgnome" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') diff --git a/extra/gnome-photos/PKGBUILD b/extra/gnome-photos/PKGBUILD index 8e8d670bd..bd7d4686f 100644 --- a/extra/gnome-photos/PKGBUILD +++ b/extra/gnome-photos/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183480 2013-04-21 22:20:19Z heftig $ +# $Id: PKGBUILD 185464 2013-05-14 10:33:14Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-photos -pkgver=3.8.0 +pkgver=3.8.2 pkgrel=1 pkgdesc="Access, organize, and share your photos on GNOME" arch=(i686 x86_64 mips64el) @@ -14,7 +14,7 @@ options=(!libtool) groups=(gnome-extra) install=gnome-photos.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('d5a42a6562eb2bebd404f1b932e105572e64abb0e3160b2834c7898cf090f3de') +sha256sums=('c6e777cdc6a4b0ee24b4dbd1b971fe239198926a3057c27c08eeda0a53ba6d58') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-power-manager/PKGBUILD b/extra/gnome-power-manager/PKGBUILD index ffe8a4a86..60e423d81 100644 --- a/extra/gnome-power-manager/PKGBUILD +++ b/extra/gnome-power-manager/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183393 2013-04-21 22:10:14Z heftig $ +# $Id: PKGBUILD 185314 2013-05-13 09:37:19Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-power-manager -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="System power information and statistics" arch=(i686 x86_64 mips64el) @@ -14,7 +14,7 @@ makedepends=(intltool) options=(!emptydirs) install=gnome-power-manager.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('f5b5ef2282fae3bcdcc8473af3cc5e32ad7ac7e2444fc93abf00c3d2967361bf') +sha256sums=('6f4fee6cce2c0a58ae52a2cae1b8f0acca0a08d8154fe056ca3bfb5e537c5b61') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-screenshot/PKGBUILD b/extra/gnome-screenshot/PKGBUILD index 1ff4b40d6..a847016e1 100644 --- a/extra/gnome-screenshot/PKGBUILD +++ b/extra/gnome-screenshot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183395 2013-04-21 22:10:17Z heftig $ +# $Id: PKGBUILD 185472 2013-05-14 11:00:12Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gnome-screenshot -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="Take pictures of your screen" arch=(i686 x86_64 mips64el) @@ -13,7 +13,7 @@ makedepends=('intltool') groups=('gnome') install=$pkgname.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('113ab0fe98080f888ff8ff15011b21e74b5582576cb5455db47cbfd9e9075a05') +sha256sums=('673d3102bbd9d5ee493111e109adfa9ecc880c41f883d3db4be6dce70610513e') build() { cd "$pkgname-$pkgver" diff --git a/extra/gnome-session/PKGBUILD b/extra/gnome-session/PKGBUILD index 1f0f8e8d3..204d45b5f 100644 --- a/extra/gnome-session/PKGBUILD +++ b/extra/gnome-session/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184166 2013-05-03 02:07:55Z heftig $ +# $Id: PKGBUILD 185463 2013-05-14 10:32:30Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-session -pkgver=3.8.1 -pkgrel=2 +pkgver=3.8.2 +pkgrel=1 pkgdesc="The GNOME Session Handler" arch=(i686 x86_64 'mips64el') license=(GPL LGPL) @@ -16,7 +16,7 @@ url="http://www.gnome.org" groups=(gnome) source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz timeout.patch) -sha256sums=('6c1cf3c0bc86da1dc5ec2d1a7bb3332b15652d4a468c52c5ae894b46b4a14770' +sha256sums=('a6ed1c109005f81ec34a8aa09b2f114c07b4fba8feef47d2f23559797be88640' '9eaf31857b41db417475c3b14adc11b10c8226ed76978cdf96dd648fa6e505fc') build() { diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD index def7ad389..898a2131b 100644 --- a/extra/gnome-settings-daemon/PKGBUILD +++ b/extra/gnome-settings-daemon/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183398 2013-04-21 22:10:23Z heftig $ +# $Id: PKGBUILD 185507 2013-05-14 12:11:03Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-settings-daemon -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ install=gnome-settings-daemon.install url="http://www.gnome.org" groups=('gnome') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('367a770ec7affff3c85a43bc39ced5a02a1b1761780d954329f6b21c0f2efcee') +sha256sums=('e2118024549b1a3b24e338403d3451211b8cde5c68e387d9a0081e137191b0be') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index 23df6af4a..949e5a37b 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183399 2013-04-21 22:10:25Z heftig $ +# $Id: PKGBUILD 186665 2013-05-30 12:26:35Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell -pkgver=3.8.1 -pkgrel=1 +pkgver=3.8.2 +pkgrel=4 pkgdesc="The next generation GNOME Shell" arch=(i686 x86_64 mips64el) url="http://live.gnome.org/GnomeShell" @@ -19,20 +19,31 @@ options=('!libtool' '!emptydirs') install=gnome-shell.install groups=(gnome) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz - nm-libexecdir.patch) -sha256sums=('db0160d7c3fec3858805f218f961534d1a3f1486e005492433d4a28c40f83ac7' - 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607') + nm-libexecdir.patch popupmenu.patch) +sha256sums=('ffdf42d382d50cd756f1f51a31eaa6877edb51a08f0ca80b6e973f05072416df' + 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607' + '7df2a128d12350fe8e349c6aa5e125eb5d90b05e0201a842d6f3e1c2683b351d') -build() { +prepare() { cd $pkgname-$pkgver # FS#30747 FS#32730 Problems due to libexecdir different from NM patch -Np1 -i ../nm-libexecdir.patch + # FS#35326 (from gnome-3-8 branch) + patch -Np1 -i ../popupmenu.patch +} + +build() { + cd $pkgname-$pkgver PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/gnome-shell \ --localstatedir=/var --disable-static \ --disable-schemas-compile + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } diff --git a/extra/gnome-shell/popupmenu.patch b/extra/gnome-shell/popupmenu.patch new file mode 100644 index 000000000..035432cd5 --- /dev/null +++ b/extra/gnome-shell/popupmenu.patch @@ -0,0 +1,28 @@ +From dd8ca024254341258a9e54c253c080f25be6f9cd Mon Sep 17 00:00:00 2001 +From: Florian Müllner <fmuellner@gnome.org> +Date: Tue, 14 May 2013 16:55:08 +0000 +Subject: PopupMenuManager: Fix child menus + +Since commit c84dc6254d2d65c, popup menus are closed automatically +when another menu opens (to catch the case where a menu is opened +by keyboard shortcut, which wasn't handled before). However in the +case of child menus, both child and parent are expected to be visible, +so handle this case explicitly. + +https://bugzilla.gnome.org/show_bug.cgi?id=699678 +--- +diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js +index fc37dd8..ab6c795 100644 +--- a/js/ui/popupMenu.js ++++ b/js/ui/popupMenu.js +@@ -2124,7 +2124,7 @@ const PopupMenuManager = new Lang.Class({ + + _onMenuOpenState: function(menu, open) { + if (open) { +- if (this.activeMenu) ++ if (this.activeMenu && !this.activeMenu.isChildMenu(menu)) + this.activeMenu.close(BoxPointer.PopupAnimation.FADE); + this._grabHelper.grab({ actor: menu.actor, modal: true, focus: menu.sourceActor, + onUngrab: Lang.bind(this, this._closeMenu, menu) }); +-- +cgit v0.9.1 diff --git a/extra/gnome-system-monitor/PKGBUILD b/extra/gnome-system-monitor/PKGBUILD index e4850bb4d..e8417be42 100644 --- a/extra/gnome-system-monitor/PKGBUILD +++ b/extra/gnome-system-monitor/PKGBUILD @@ -1,25 +1,26 @@ -# $Id: PKGBUILD 183403 2013-04-21 22:10:31Z heftig $ +# $Id: PKGBUILD 185539 2013-05-14 20:47:47Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-system-monitor -pkgver=3.8.0 +pkgver=3.8.2.1 pkgrel=1 pkgdesc="A system monitor for GNOME" arch=(i686 x86_64 'mips64el') license=('GPL') -depends=('libwnck3' 'libgtop' 'gtkmm3' 'librsvg' 'gnome-icon-theme' 'libsystemd') +depends=('libwnck3' 'libgtop' 'gtkmm3' 'librsvg' 'gnome-icon-theme' 'systemd') makedepends=('itstool' 'docbook-xsl' 'intltool') options=(!emptydirs) url="http://www.gnome.org" groups=('gnome') install=gnome-system-monitor.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('2d5bdd81c19bc34f83c0ccfde998007df9ef517f5e4bfb5e36513a76c21dce86') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) +sha256sums=('df4d2c4dbb4f3408b621140732efb3e38853658addd6aae73613027856f6bb44') build() { cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/gnome-system-monitor + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/$pkgname --enable-systemd make } diff --git a/extra/gnome-terminal/PKGBUILD b/extra/gnome-terminal/PKGBUILD index ac47357d6..a020fefaf 100644 --- a/extra/gnome-terminal/PKGBUILD +++ b/extra/gnome-terminal/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183404 2013-04-21 22:10:33Z heftig $ +# $Id: PKGBUILD 185395 2013-05-13 18:52:30Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-terminal -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="The GNOME Terminal Emulator" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ url="http://www.gnome.org" groups=('gnome') install=gnome-terminal.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('c49afab26973225f41ed35a9d5b5180d6207757e524056656146b30692f39fff') +sha256sums=('4937dfe9e88fcf56de6ed670989cd119b468a32bb078c6cf720c3c8831915347') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-vfs-perl/PKGBUILD b/extra/gnome-vfs-perl/PKGBUILD index 7807693af..0f6acbe2a 100644 --- a/extra/gnome-vfs-perl/PKGBUILD +++ b/extra/gnome-vfs-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 177009 2013-02-04 08:18:57Z jgc $ +# $Id: PKGBUILD 186379 2013-05-26 09:24:30Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-vfs-perl _realname=Gnome2-VFS pkgver=1.081 -pkgrel=6 +pkgrel=7 pkgdesc="Gnome2-VFS perl bindings for gnome-vfs" arch=(i686 x86_64 'mips64el') license=('LGPL') diff --git a/extra/gnome-weather/PKGBUILD b/extra/gnome-weather/PKGBUILD index 3544e97c1..227ee4050 100644 --- a/extra/gnome-weather/PKGBUILD +++ b/extra/gnome-weather/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183410 2013-04-21 22:10:43Z heftig $ +# $Id: PKGBUILD 185432 2013-05-14 09:43:24Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-weather -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="Access current weather conditions and forecasts" arch=(i686 x86_64 mips64el) @@ -14,7 +14,7 @@ options=(!libtool) groups=(gnome-extra) install=gnome-weather.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('9dbbf0aa50a940894a9ebf63001163a8fa89c3aa8febbddcd3c6c6eefbc00f3d') +sha256sums=('cf61afac1435dbdb87e8d9e4d86bca29cf1ff2c64cefc8db696cd27dad15adf4') build() { cd $pkgname-$pkgver diff --git a/extra/gnomecanvas-perl/PKGBUILD b/extra/gnomecanvas-perl/PKGBUILD index ce12da891..5a6cd5a5d 100644 --- a/extra/gnomecanvas-perl/PKGBUILD +++ b/extra/gnomecanvas-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160477 2012-06-02 10:26:08Z bluewind $ +# $Id: PKGBUILD 186377 2013-05-26 09:24:28Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnomecanvas-perl _realname=Gnome2-Canvas pkgver=1.002 -pkgrel=10 +pkgrel=11 pkgdesc="Gnome2-Canvas perl bindings for libgnomecanvas" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') diff --git a/extra/gnumeric/PKGBUILD b/extra/gnumeric/PKGBUILD index 863ea8b3c..52c40c691 100644 --- a/extra/gnumeric/PKGBUILD +++ b/extra/gnumeric/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184239 2013-05-04 19:38:00Z foutrelis $ +# $Id: PKGBUILD 186380 2013-05-26 09:24:31Z bluewind $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Kritoke <typeolinux@yahoo.com> pkgname=gnumeric pkgver=1.12.2 -pkgrel=1 +pkgrel=2 pkgdesc="A GNOME Spreadsheet Program" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnome.org/projects/gnumeric/" @@ -38,6 +38,7 @@ prepare() { # Fix invalid PNG images to work with libpng 1.6 # https://bugzilla.gnome.org/show_bug.cgi?id=699683 + # XXX: PNGs have been fixed upsteam; remove when gnumeric 1.12.3 is out find -name '*.png' -exec optipng -quiet -force -fix {} + } diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD index a80cb9d90..6fb18992c 100644 --- a/extra/gparted/PKGBUILD +++ b/extra/gparted/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184007 2013-04-30 18:49:43Z giovanni $ +# $Id: PKGBUILD 186367 2013-05-26 06:28:56Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Andrew Simmons <andrew.simmons@gmail.com> # Contributor: György Balló <ballogy@freestart.hu> pkgname=gparted pkgver=0.16.1 -pkgrel=1 +pkgrel=5 pkgdesc="A Partition Magic clone, frontend to GNU Parted" arch=('i686' 'x86_64' 'mips64el') url="http://gparted.sourceforge.net" @@ -14,6 +14,9 @@ depends=('parted' 'gtkmm' 'hicolor-icon-theme') makedepends=('intltool' 'pkg-config' 'gnome-doc-utils') optdepends=('dosfstools: for FAT16 and FAT32 partitions' 'jfsutils: for jfs partitions' + 'f2fs-tools: for Flash-Friendly File System' + 'btrfs-progs: for btrfs partitions' + 'exfat-utils: for exFAT partitions' 'ntfs-3g: for ntfs partitions' 'reiserfsprogs: for reiser partitions' 'xfsprogs: for xfs partitions' @@ -23,14 +26,18 @@ optdepends=('dosfstools: for FAT16 and FAT32 partitions' 'mtools: utilities to access MS-DOS disks') install=gparted.install source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2" - 'org.archlinux.pkexec.gparted.policy') + 'org.archlinux.pkexec.gparted.policy' + 'gparted_polkit') md5sums=('3f399bff031b5ce14d11a8c346f4b89c' - 'c031d7d2b845ccb025b9f83e0ddd5653') + '122ed3120c846376bead22b25f6a3b19' + '0b68a4e2bc6bc15440730ebe2d7bf9f6') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + sed -i "s:@gksuprog@ @installdir@/gparted %f:@installdir@/gparted_polkit %f:g" gparted.desktop.in.in + ./configure --prefix=/usr \ + --sbindir=/usr/bin make } @@ -40,13 +47,10 @@ package() { make DESTDIR="${pkgdir}" install # Install policy file - install -Dm644 "${srcdir}/org.archlinux.pkexec.gparted.policy" "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.gparted.policy" - - # We need rename the original script - mv "${pkgdir}/usr/sbin/gparted" "${pkgdir}/usr/sbin/gparted.elf" + install -Dm644 "${srcdir}/org.archlinux.pkexec.gparted.policy" \ + "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.gparted.policy" # Install launcher script - echo '#!/bin/sh' > ${pkgdir}/usr/sbin/gparted - echo 'pkexec --disable-internal-agent "/usr/sbin/gparted.elf" "$@"' >> ${pkgdir}/usr/sbin/gparted - chmod 755 ${pkgdir}/usr/sbin/gparted + install -m755 "${srcdir}/gparted_polkit" \ + "${pkgdir}/usr/bin/gparted_polkit" } diff --git a/extra/gparted/gparted.install b/extra/gparted/gparted.install index e8f6bed8f..1a05f573e 100644 --- a/extra/gparted/gparted.install +++ b/extra/gparted/gparted.install @@ -1,14 +1,11 @@ post_install() { gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - echo 'If you use a lightweight windowmanager, remember to run' - echo '/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 to enable' - echo 'graphical authentication, which may be needed for pkexec to work.' } post_upgrade() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } diff --git a/extra/gparted/gparted_polkit b/extra/gparted/gparted_polkit new file mode 100644 index 000000000..d9f94d1bd --- /dev/null +++ b/extra/gparted/gparted_polkit @@ -0,0 +1,6 @@ +#!/bin/bash +if [ $(which pkexec) ]; then + pkexec --disable-internal-agent "/usr/bin/gparted" "$@" +else + /usr/bin/gparted "$@" +fi diff --git a/extra/gparted/org.archlinux.pkexec.gparted.policy b/extra/gparted/org.archlinux.pkexec.gparted.policy index 65894a0cc..4305e5e16 100644 --- a/extra/gparted/org.archlinux.pkexec.gparted.policy +++ b/extra/gparted/org.archlinux.pkexec.gparted.policy @@ -12,7 +12,7 @@ <allow_inactive>auth_admin</allow_inactive> <allow_active>auth_admin</allow_active> </defaults> - <annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/gparted.elf</annotate> + <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/gparted</annotate> <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate> </action> diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD index 7490ad804..cf42e5a1f 100644 --- a/extra/gpsd/PKGBUILD +++ b/extra/gpsd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184760 2013-05-07 23:25:13Z tomegun $ +# $Id: PKGBUILD 185608 2013-05-15 22:56:58Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -6,7 +6,7 @@ pkgname=gpsd pkgver=3.9 -pkgrel=1 +pkgrel=2 pkgdesc="GPS daemon and library to support USB/serial GPS devices" arch=('i686' 'x86_64' 'mips64el') url="http://catb.org/gpsd/" @@ -73,6 +73,11 @@ package() { install -D -m644 systemd/gpsd.socket "${pkgdir}/usr/lib/systemd/system/gpsd.socket" install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + # move to /usr/bin + sed -i -e 's,/usr/sbin,/usr/bin,g' "${pkgdir}/usr/lib/systemd/system/gpsd.service" + mv "${pkgdir}/usr/sbin/"* "${pkgdir}/usr/bin/" + rm -r "${pkgdir}/usr/sbin" } md5sums=('53a88f24a0973d23427e82e9a8914f19' 'SKIP' diff --git a/extra/graphicsmagick/PKGBUILD b/extra/graphicsmagick/PKGBUILD index eadbb0559..9802dd885 100644 --- a/extra/graphicsmagick/PKGBUILD +++ b/extra/graphicsmagick/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184386 2013-05-06 19:37:35Z foutrelis $ +# $Id: PKGBUILD 186381 2013-05-26 09:24:32Z bluewind $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> @@ -6,7 +6,7 @@ pkgname=graphicsmagick pkgver=1.3.18 -pkgrel=2 +pkgrel=3 pkgdesc='Image processing system' url='http://www.graphicsmagick.org/' arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/graphite/PKGBUILD b/extra/graphite/PKGBUILD index 9a254119d..dbf1df9d3 100644 --- a/extra/graphite/PKGBUILD +++ b/extra/graphite/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 179056 2013-03-02 11:28:27Z andyrtr $ +# $Id: PKGBUILD 186328 2013-05-24 20:18:53Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgname=graphite -pkgver=1.2.1 +pkgver=1.2.2 pkgrel=1 epoch=1 arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('cmake' 'freetype2' 'python2') # 'doxygen' 'texlive-latexextra' 'graphviz' 'asciidoc' 'perl-module-build' 'icu') - only for docs - target doesn't install properly options=('!libtool' '!emptydirs') source=("http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz") -md5sums=('edf70ab2f7d789be219f47b1df00d67e') +md5sums=('4bfd5db6c91a4097cd76a699beaca70e') build() { cd "${srcdir}" diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD index 197b40c88..f8952e875 100644 --- a/extra/graphviz/PKGBUILD +++ b/extra/graphviz/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184387 2013-05-06 19:37:39Z foutrelis $ +# $Id: PKGBUILD 186382 2013-05-26 09:24:35Z bluewind $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=graphviz pkgver=2.30.1 -pkgrel=3 +pkgrel=4 pkgdesc='Graph visualization software' url='http://www.graphviz.org/' license=('custom:EPL') @@ -37,6 +37,9 @@ install=install prepare() { cd "${srcdir}/${pkgname}-${pkgver}" sed \ + -e 's/ qw(\([^)]*\))/ (qw(\1))/g' \ + -i config/config_perl.pl + sed \ -e '/"archdir"/s:$:+" '"$(echo -I/usr/include/ruby-2.0.0/{$CARCH-linux,ruby/backward,})"'":' \ -e '/CONFIG/s:site:vendor:' \ -i config/config_ruby.rb diff --git a/extra/grilo-plugins/PKGBUILD b/extra/grilo-plugins/PKGBUILD index d5aff92e5..ec36f1b32 100644 --- a/extra/grilo-plugins/PKGBUILD +++ b/extra/grilo-plugins/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183412 2013-04-21 22:10:47Z heftig $ +# $Id: PKGBUILD 186336 2013-05-25 00:10:26Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=grilo-plugins -pkgver=0.2.6 +pkgver=0.2.8 pkgrel=1 pkgdesc="Plugins for Grilo" url="http://www.gnome.org" @@ -10,7 +10,7 @@ arch=('i686' 'x86_64' 'mips64el') license=(LGPL) depends=(grilo sqlite libgcrypt) makedepends=(gupnp-av libgdata libquvi gmime rest libtracker-sparql totem-plparser libdmapsharing - json-glib) + json-glib intltool) optdepends=('gupnp-av: uPnP plugin' 'libgdata: Youtube plugin' 'libquvi: Youtube plugin, Vimeo plugin' @@ -22,7 +22,7 @@ optdepends=('gupnp-av: uPnP plugin' 'json-glib: TMDb plugin') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('029ea7fdbb32ff5cc20295b9a1a943f76f39a67ed5bf08a2b33b01cf287a1227') +sha256sums=('28f83fd701b33aed7b843e5e3850d7d961310c7cb33ffebcb652160fff8ccd80') build() { cd $pkgname-$pkgver diff --git a/extra/grilo/PKGBUILD b/extra/grilo/PKGBUILD index b0acf3bc0..d63d1bde2 100644 --- a/extra/grilo/PKGBUILD +++ b/extra/grilo/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 180276 2013-03-19 13:37:31Z jgc $ +# $Id: PKGBUILD 185628 2013-05-16 14:06:42Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=grilo -pkgver=0.2.5 +pkgver=0.2.6 pkgrel=1 pkgdesc="Framework that provides access to various sources of multimedia content" url="http://www.gnome.org" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') -depends=('gtk3' 'libxml2' 'libsoup') -makedepends=('gobject-introspection' 'gtk-doc' 'vala') +depends=('gtk3' 'libxml2' 'libsoup' 'liboauth') +makedepends=('gobject-introspection' 'gtk-doc' 'vala' 'intltool') optdepends=('grilo-plugins: Plugins for grilo') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('ff281f60bc3afcb70913e61a6447b33ab259b3d89c1441c7e307fc998c050cdc') +sha256sums=('601421279753b26bee0b2b5952689f87f7c7836879f7326151a8f8139fa67036') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gsasl/PKGBUILD b/extra/gsasl/PKGBUILD index b6c52f6d7..b786e0d6b 100644 --- a/extra/gsasl/PKGBUILD +++ b/extra/gsasl/PKGBUILD @@ -5,7 +5,7 @@ pkgname=gsasl pkgver=1.8.0 -pkgrel=2 +pkgrel=2.1 pkgdesc="Simple Authentication and Security Layer framework and a few common SASL mechanisms" arch=("i686" "x86_64" "mips64el") url="http://josefsson.org/gsasl/" diff --git a/extra/gssdp/PKGBUILD b/extra/gssdp/PKGBUILD index c7347a34b..f3087f4bc 100644 --- a/extra/gssdp/PKGBUILD +++ b/extra/gssdp/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 183414 2013-04-21 22:10:50Z heftig $ +# $Id: PKGBUILD 186533 2013-05-28 12:29:38Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: György Balló <ballogy@freestart.hu> pkgname=gssdp -pkgver=0.14.2 +pkgver=0.14.3 pkgrel=1 pkgdesc="A GObject-based API for handling resource discovery and announcement over SSDP" arch=('i686' 'x86_64' 'mips64el') url="http://gupnp.org/" license=(LGPL) depends=(libsoup) -makedepends=(gobject-introspection gtk2 gtk-doc vala) -optdepends=('gtk2: gssdp-device-sniffer') +makedepends=(gobject-introspection gtk3 gtk-doc vala) +optdepends=('gtk3: gssdp-device-sniffer') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('a1a255ed45b45fbf0004dfc5d8e566551f4857bc16599e7f756965733f9411fc') +sha256sums=('79dbdc5f79cc406632a783826b3dbe6acc0fbf41eb801b642bce1a02ecc3c66d') build() { cd $pkgname-$pkgver diff --git a/extra/gstreamer0.10-base/PKGBUILD b/extra/gstreamer0.10-base/PKGBUILD index c14afe39f..283c3805a 100644 --- a/extra/gstreamer0.10-base/PKGBUILD +++ b/extra/gstreamer0.10-base/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 153257 2012-03-12 15:48:41Z jgc $ +# $Id: PKGBUILD 185705 2013-05-17 12:41:12Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=('gstreamer0.10-base') @@ -15,6 +15,13 @@ sha256sums=('1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a') build() { cd "${srcdir}/gst-plugins-base-${pkgver}" + sed -i -e '/AC_PATH_XTRA/d' -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \ + configure.ac + autoreconf +} + +build() { + cd "${srcdir}/gst-plugins-base-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --enable-experimental --disable-gnome_vfs \ --with-package-name="GStreamer Base Plugins (Parabola)" \ diff --git a/extra/gthumb/PKGBUILD b/extra/gthumb/PKGBUILD index 1f755c466..e59c275db 100644 --- a/extra/gthumb/PKGBUILD +++ b/extra/gthumb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184391 2013-05-06 19:37:48Z foutrelis $ +# $Id: PKGBUILD 185400 2013-05-13 19:38:35Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=gthumb -pkgver=3.2.1 -pkgrel=2 +pkgver=3.2.2 +pkgrel=1 pkgdesc="Image browser and viewer for the GNOME Desktop" arch=(i686 x86_64 mips64el) license=(GPL) @@ -22,7 +22,7 @@ optdepends=('libopenraw: read RAW files' options=('!libtool' '!emptydirs') install=gthumb.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('3eacbb9912923fb5da3e7a52be58c6e7470e598b06c1b7b51b76809fc4855b61') +sha256sums=('e201b9065d401144a17c2a33e4a85f0dcf457dc5cba6932dbac0197e141cdee8') build() { cd $pkgname-$pkgver diff --git a/extra/gtk-vnc/PKGBUILD b/extra/gtk-vnc/PKGBUILD index 343fa0fe4..f4e743253 100644 --- a/extra/gtk-vnc/PKGBUILD +++ b/extra/gtk-vnc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178918 2013-02-28 18:50:22Z ioni $ +# $Id: PKGBUILD 185577 2013-05-15 08:05:37Z bpiotrowski $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Allan McRae <mcrae_allan@hotmail.com> @@ -6,7 +6,7 @@ pkgname=gtk-vnc pkgver=0.5.2 -pkgrel=1 +pkgrel=2 pkgdesc="A VNC viewer widget for GTK" arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/gtk-vnc" diff --git a/extra/gtk2-perl/PKGBUILD b/extra/gtk2-perl/PKGBUILD index 7856f69d6..749a698de 100644 --- a/extra/gtk2-perl/PKGBUILD +++ b/extra/gtk2-perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183485 2013-04-21 22:21:05Z heftig $ +# $Id: PKGBUILD 186383 2013-05-26 09:24:36Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sarah Hay <sarah@archlinux.org> pkgname=gtk2-perl pkgver=1.247 -pkgrel=1 +pkgrel=2 pkgdesc="Perl bindings for GTK+ 2.x" arch=(i686 x86_64 'mips64el') license=('LGPL') diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD index 29025bbe6..c691ea0a7 100644 --- a/extra/gtk2/PKGBUILD +++ b/extra/gtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180158 2013-03-18 12:05:08Z jgc $ +# $Id: PKGBUILD 185341 2013-05-13 13:52:12Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gtk2 pkgname=('gtk2' 'gtk-update-icon-cache') -pkgver=2.24.17 +pkgver=2.24.18 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" @@ -13,7 +13,7 @@ options=('!libtool') license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz xid-collision-debug.patch) -sha256sums=('e947b2b460156d98e8e38930b82458e1d613a71eb26e927f966f7081a640f415' +sha256sums=('6c963101272ff53bb5b01d21bfb86cebba5f0a68f31c5e10523c63f07e762385' 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') build() { diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index 7e87b3e1e..2696f6a64 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183416 2013-04-21 22:10:54Z heftig $ +# $Id: PKGBUILD 185333 2013-05-13 12:25:58Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtk3 -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="GObject-based multi-platform GUI toolkit (v3)" arch=(i686 x86_64 mips64el) @@ -15,7 +15,7 @@ backup=(etc/gtk-3.0/settings.ini) license=(LGPL) source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz settings.ini) -sha256sums=('f43e7c7d7a0e2417225509e88f67799534c69abfbb6f615fc7a895bf15e31255' +sha256sums=('1ca80c9c15a1df95d74cefb8c2afe4682ba272a4b489106f04877be2a7aff297' 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621') build() { cd "gtk+-$pkgver" diff --git a/extra/gtkmm/PKGBUILD b/extra/gtkmm/PKGBUILD index 514ce832c..c9c4b3225 100644 --- a/extra/gtkmm/PKGBUILD +++ b/extra/gtkmm/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 148776 2012-02-05 11:50:02Z ibiru $ +# $Id: PKGBUILD 185348 2013-05-13 15:46:57Z jgc $ # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gtkmm pkgname=('gtkmm' 'gtkmm-docs') -pkgver=2.24.2 -pkgrel=2.2 +pkgver=2.24.3 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') makedepends=('gtk2' 'pangomm' 'atkmm' 'glibmm-docs') license=('LGPL') options=('!libtool' '!emptydirs') url="http://gtkmm.sourceforge.net/" source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.24/${pkgbase}-${pkgver}.tar.xz) -sha256sums=('c90c7a29c20dd6d795925bd66ad1ff40be07cea0e4c03f4d6105a8c07448953d') +sha256sums=('c564a438677174b97d69dd70467cb03c933481006398dc9377417aa6abe02a39') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/gucharmap/PKGBUILD b/extra/gucharmap/PKGBUILD index 5093302d1..b53cddf20 100644 --- a/extra/gucharmap/PKGBUILD +++ b/extra/gucharmap/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183418 2013-04-21 22:10:57Z heftig $ +# $Id: PKGBUILD 185396 2013-05-13 18:53:34Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan De Groot <jgc@archlinux.org> pkgname=gucharmap -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="Gnome Unicode Charmap" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('gtk-doc' 'intltool' 'gobject-introspection' 'itstool' 'docbook-xsl options=('!libtool' '!emptydirs') install=gucharmap.install source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('dc3223c7bd5dac4b979295cf7678c873046f8525f7d6f5562ab98239f563afc1') +sha256sums=('08272386155bc1a7d6a2d1a0ee8d2e5ea08a9512c40dbd76b3b4c3f105604901') build() { cd $pkgname-$pkgver diff --git a/extra/gupnp-av/PKGBUILD b/extra/gupnp-av/PKGBUILD index 76bcfe845..d0cf118a7 100644 --- a/extra/gupnp-av/PKGBUILD +++ b/extra/gupnp-av/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183420 2013-04-21 22:11:00Z heftig $ +# $Id: PKGBUILD 186713 2013-05-30 17:40:28Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Thijs Vermeir <thijsvermeir@gmail.com> # Contributor: Denis Zawada <deno@rootnode.net> pkgname=gupnp-av -pkgver=0.12.1 +pkgver=0.12.2 pkgrel=1 pkgdesc="Library to ease handling and implementation of UPnP A/V profiles" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=(gupnp) makedepends=(gobject-introspection gtk-doc vala) options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('7c73f3c1e1c8f552079b8db8971348acf85078c82ed4da883b218bd993fcd4c4') +sha256sums=('43597bdfb1c352338e706962ff7fcdbcb544c5a36f27c9c2aaa5a550b6990270') build() { cd $pkgname-$pkgver diff --git a/extra/gupnp-dlna/PKGBUILD b/extra/gupnp-dlna/PKGBUILD index f42e8dbd9..43a85b154 100644 --- a/extra/gupnp-dlna/PKGBUILD +++ b/extra/gupnp-dlna/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183421 2013-04-21 22:11:02Z heftig $ +# $Id: PKGBUILD 186714 2013-05-30 17:41:26Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Balló György <ballogyor+arch at gmail dot com> pkgname=gupnp-dlna -pkgver=0.10.1 +pkgver=0.10.2 pkgrel=1 pkgdesc="Library to ease DLNA-related bits for applications using gupnp" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=(gst-plugins-base-libs) makedepends=(gobject-introspection gtk-doc vala) options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('c514ec6edd2a427914ef79fed002f91b875fde127084f21d770401a1d2b95f7b') +sha256sums=('158a22dc9c11645817596322e2516701f0d49e40f1892ddc8832afd26221c5c3') build() { cd $pkgname-$pkgver diff --git a/extra/gupnp/PKGBUILD b/extra/gupnp/PKGBUILD index 498810474..14689e9e5 100644 --- a/extra/gupnp/PKGBUILD +++ b/extra/gupnp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183419 2013-04-21 22:10:59Z heftig $ +# $Id: PKGBUILD 186594 2013-05-30 00:27:58Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: György Balló <ballogy@freestart.hu> pkgname=gupnp -pkgver=0.20.2 +pkgver=0.20.3 pkgrel=1 pkgdesc="An object-oriented UPNP framework" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=(gobject-introspection gtk-doc vala) optdepends=('python2: gupnp-binding-tool') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('9b27b1bdd16f7f13e28e20bce85a117e577a8183f95615876a9d91f4d4a70812') +sha256sums=('ed7db7506506434d0fd272e3866d7ae985af5b9d7e9e5e120f8581ade90869f0') build() { cd $pkgname-$pkgver diff --git a/extra/gutenprint/PKGBUILD b/extra/gutenprint/PKGBUILD index df77560b1..47d3ffcc7 100644 --- a/extra/gutenprint/PKGBUILD +++ b/extra/gutenprint/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163174 2012-07-08 10:42:54Z andyrtr $ +# $Id: PKGBUILD 185818 2013-05-19 12:13:34Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=gutenprint pkgver=5.2.9 -pkgrel=1 +pkgrel=2 pkgdesc="Top quality printer drivers for POSIX systems" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -23,7 +23,16 @@ md5sums=('aefbec27b96dd404d9ac9811e17d58ce') build() { cd ${srcdir}/${pkgname}-${pkgver} + + # sbindir is not properly taken over there + sed -i "s:cups_sbindir=\"\/usr\/sbin\":cups_sbindir=\"\/usr\/bin\":g" m4/stp_cups.m4 + sed -i "s:cups_sbindir=\"\${cups_prefix}\/sbin\":cups_sbindir=\"\${cups_prefix}\/bin\":" m4/stp_cups.m4 + + sed -i "s:m4local:m4extra:" Makefile.am + autoreconf -vfi + ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --enable-samples \ --enable-cups-ppds \ --enable-cups-ppds-at-top-level \ diff --git a/extra/gutenprint/gutenprint.install b/extra/gutenprint/gutenprint.install index 05e8bec38..1a042e97a 100644 --- a/extra/gutenprint/gutenprint.install +++ b/extra/gutenprint/gutenprint.install @@ -1,5 +1,5 @@ post_install() { - echo ">>please run /usr/sbin/cups-genppdupdate" + echo ">>please run /usr/bin/cups-genppdupdate" echo ">>and restart cups deamon" } diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD index f5779f11b..2bcd1cf06 100644 --- a/extra/gvfs/PKGBUILD +++ b/extra/gvfs/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 185165 2013-05-11 16:16:29Z tomegun $ +# $Id: PKGBUILD 185516 2013-05-14 16:46:51Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gvfs pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp' 'gvfs-goa' 'gvfs-mtp') -pkgver=1.16.1 -pkgrel=2 +pkgver=1.16.2 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup>=2.24.0' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3' 'libmtp' 'gnome-online-accounts' 'libbluray') url="http://www.gnome.org" options=(!libtool) source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) -sha256sums=('e7ec47547ff8029a2e8d81533bdfa870fe4a547c9d7c4e1e946d42d38970b0ac') +sha256sums=('6b0e62d27fe73844efb536689057b762fbce085984800c83395371306ec547f1') build() { cd "$pkgbase-$pkgver" diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD index 90cdbe831..1d005d29f 100644 --- a/extra/harfbuzz/PKGBUILD +++ b/extra/harfbuzz/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183266 2013-04-20 05:39:22Z heftig $ +# $Id: PKGBUILD 186346 2013-05-25 04:11:23Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=harfbuzz -pkgver=0.9.16 -pkgrel=1 +pkgver=0.9.17 +pkgrel=2 pkgdesc="OpenType text shaping engine." arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/HarfBuzz" @@ -13,7 +13,7 @@ makedepends=('icu' 'cairo' 'glib2' 'freetype2') optdepends=('cairo: hb-view program') options=(!libtool) source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('6da7e032f705d8a5c91487cd296628d64975672a5b0c1704829cf2285072c92b') +sha256sums=('a4773003512035cb5c559de23e1d53f292bcb0212f023b540c4dc695b39690ed') build() { cd ${pkgname}-${pkgver} diff --git a/extra/hddtemp/PKGBUILD b/extra/hddtemp/PKGBUILD index a25f2411b..9b13f06b9 100644 --- a/extra/hddtemp/PKGBUILD +++ b/extra/hddtemp/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163630 2012-07-17 14:24:03Z bisson $ +# $Id: PKGBUILD 186029 2013-05-20 14:50:15Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -9,22 +9,17 @@ pkgname=hddtemp _origver=0.3-beta15 _patchver=${_origver}-52 pkgver=${_patchver//-/.} -pkgrel=1.1 +pkgrel=2 pkgdesc="Gives you the temperature of your hard drive by reading S.M.A.R.T. information" url='https://savannah.nongnu.org/projects/hddtemp/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') -backup=('etc/conf.d/hddtemp') source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${_origver}.tar.bz2" "http://ftp.debian.org/debian/pool/main/h/${pkgname}/${pkgname}_${_patchver}.diff.gz" - 'rc.d' - 'conf.d' 'service') sha1sums=('65393b0a4d9862c030c81702d95c1acd00da275b' 'b9bcdd0537c1540e55e5056445b571ea61d5a4a3' - '71159486b1505ec6acfb7585e0d8fbe78afe54ec' - 'd45e3022f614dbf8904ecb1a3e702bb71fcaa808' - '501fcf4faf8b2689d010f9cbbf39f917211f611f') + '9b02e5bed22f81ceab2b69bae788a9a3aa5c2147') options=('!libtool') @@ -35,6 +30,7 @@ build() { ./configure \ --prefix=/usr \ + --sbindir=/usr/bin \ --mandir=/usr/share/man \ --with-db-path="/usr/share/${pkgname}/hddtemp.db" @@ -48,6 +44,4 @@ package() { install -Dm644 "../${pkgname}-${_origver}/debian/hddtemp.db" "${pkgdir}/usr/share/${pkgname}/hddtemp.db" install -Dm644 '../service' "${pkgdir}/usr/lib/systemd/system/hddtemp.service" - install -Dm644 '../conf.d' "${pkgdir}/etc/conf.d/hddtemp" - install -Dm755 '../rc.d' "${pkgdir}/etc/rc.d/hddtemp" } diff --git a/extra/hddtemp/conf.d b/extra/hddtemp/conf.d deleted file mode 100644 index 6a1e18e0b..000000000 --- a/extra/hddtemp/conf.d +++ /dev/null @@ -1,2 +0,0 @@ -PARAMS="-q -l 127.0.0.1" -DRIVES="/dev/sda" diff --git a/extra/hddtemp/rc.d b/extra/hddtemp/rc.d deleted file mode 100644 index 62f090808..000000000 --- a/extra/hddtemp/rc.d +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PARAMS= -DRIVES= -[ -f /etc/conf.d/hddtemp ] && . /etc/conf.d/hddtemp -PID=$(pidof -o %PPID /usr/sbin/hddtemp) -case "$1" in - start) - stat_busy "Starting HDDTemp" - [ -z "$PID" ] && /usr/sbin/hddtemp -d $PARAMS $DRIVES - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon hddtemp - stat_done - fi - ;; - stop) - stat_busy "Stopping HDDTemp" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon hddtemp - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/hddtemp/service b/extra/hddtemp/service index bc56d16b0..992b898ad 100644 --- a/extra/hddtemp/service +++ b/extra/hddtemp/service @@ -2,8 +2,7 @@ Description=Hard drive temperature monitor daemon [Service] -EnvironmentFile=/etc/conf.d/hddtemp -ExecStart=/usr/sbin/hddtemp -dF $PARAMS $DRIVES +ExecStart=/usr/bin/hddtemp -dF /dev/sda [Install] WantedBy=multi-user.target diff --git a/extra/hylafax/PKGBUILD b/extra/hylafax/PKGBUILD index c6c9576f6..984cf0134 100644 --- a/extra/hylafax/PKGBUILD +++ b/extra/hylafax/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 178774 2013-02-27 13:50:36Z tpowa $ +# $Id: PKGBUILD 186073 2013-05-21 07:34:09Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=hylafax pkgver=6.0.6 -pkgrel=2 +pkgrel=4 pkgdesc="Fax Server" arch=('i686' 'x86_64' 'mips64el') install='hylafax.install' @@ -14,7 +14,6 @@ backup=(var/spool/hylafax/bin/{faxrcvd,notify} usr/lib/fax/{faxcover.ps,hfaxd.conf,pagesizes,typerules} var/spool/hylafax/etc/hosts.hfaxd) source=(ftp://ftp.hylafax.org/source/${pkgname}-${pkgver}.tar.gz - hylafax hylafax.cron.daily config.local faxq.service @@ -30,10 +29,9 @@ build () { package () { cd "$srcdir/${pkgname}-${pkgver}" - mkdir -p "$pkgdir"/usr/{bin,lib/fax,sbin,share/ghostscript/fonts} + mkdir -p "$pkgdir"/usr/{bin,lib/fax,share/ghostscript/fonts} mkdir -p "$pkgdir"/var/{spool/hylafax,lock} make ROOT="$pkgdir" install - install -D -m 755 "$srcdir"/hylafax "$pkgdir"/etc/rc.d/hylafax install -D -m 744 "$srcdir"/hylafax.cron.daily "$pkgdir"/etc/cron.daily/hylafax # add missing awk file for notify-4.1 script install -D -m 755 "$srcdir"/${pkgname}-${pkgver}/util/notify.awk \ @@ -47,15 +45,8 @@ package () { install -D -m644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT } md5sums=('d063d45049c8fcbabefe09d662313067' - '6602288a405324d8c8e3c5eac2bf19fd' - '52beffe7dc296b4f9ce9fd0387f7804e' - '60f2a7e62c256ead4e9238cb31b35b90' - '832c8e8098e2dfa56040c975b554590c' - '38a00db6d9d765d130b2d8d3a98e5c24') -md5sums=('d063d45049c8fcbabefe09d662313067' - '6602288a405324d8c8e3c5eac2bf19fd' - '52beffe7dc296b4f9ce9fd0387f7804e' - '60f2a7e62c256ead4e9238cb31b35b90' - '832c8e8098e2dfa56040c975b554590c' + 'b0b8d19a10c2145476d9fbb18c0478fe' + '5f3a89fbfb10c47755d3ca19183b8a59' + 'a10aa2ef613551a88d750f6602b5f2f7' '38a00db6d9d765d130b2d8d3a98e5c24' 'fe10ea597e786fe8c09e4104fbdf16de') diff --git a/extra/hylafax/config.local b/extra/hylafax/config.local index 4ea0f3500..ab98c83db 100644 --- a/extra/hylafax/config.local +++ b/extra/hylafax/config.local @@ -62,7 +62,7 @@ DIR_LIBDATA="/usr/lib/fax" # directory for client data DIR_LIBEXEC="/usr/lib/fax" # directory for libraries&hidden apps DIR_MAN="/usr/share/man" # directory for manual pages DIR_SPOOL="/var/spool/hylafax" # directory for spooling area -DIR_SBIN="/usr/sbin" # directory for system apps +DIR_SBIN="/usr/bin" # directory for system apps DIR_LOCKS="/var/lock" # directory for UUCP lock files FONTMAP="/usr/share/ghostscript/fonts" # directorys containing Fontmap files DIR_LOCALE="/usr/share/locale" diff --git a/extra/hylafax/faxq.service b/extra/hylafax/faxq.service index 0760a5b85..7ab8de318 100644 --- a/extra/hylafax/faxq.service +++ b/extra/hylafax/faxq.service @@ -3,7 +3,7 @@ Description=Hyla FAX queue manager [Service] Type=forking -ExecStart=/usr/sbin/faxq +ExecStart=/usr/bin/faxq ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/extra/hylafax/hylafax.cron.daily b/extra/hylafax/hylafax.cron.daily index 2d1a77e5c..567dd8ed3 100644 --- a/extra/hylafax/hylafax.cron.daily +++ b/extra/hylafax/hylafax.cron.daily @@ -1,4 +1,4 @@ #!/bin/sh -/usr/sbin/faxqclean -/usr/sbin/faxcron -rcv 30 +/usr/bin/faxqclean +/usr/bin/faxcron -rcv 30 diff --git a/extra/hylafax/hylafax.install b/extra/hylafax/hylafax.install index 5dacf4045..c631cdaca 100644 --- a/extra/hylafax/hylafax.install +++ b/extra/hylafax/hylafax.install @@ -1,10 +1,6 @@ print_install() { printf "\n" - echo "Add the following to /etc/inittab and run telinit q" - echo " f1:2345:respawn:/usr/lib/fax/faxgetty ttyS0" - echo "faxgetty should now be running" - printf "\n" echo "Run faxsetup to configure and be sure to set..." echo " The device to configure is usually ttyS0" echo " The number of pages to accept to more than 25" diff --git a/extra/icu/PKGBUILD b/extra/icu/PKGBUILD index e0765fd80..e9c3a0f2b 100644 --- a/extra/icu/PKGBUILD +++ b/extra/icu/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180805 2013-03-26 11:49:34Z foutrelis $ +# $Id: PKGBUILD 186326 2013-05-24 19:56:49Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Art Gramlich <art@gramlich-net.com> pkgname=icu -pkgver=51.1 +pkgver=51.2 pkgrel=1 pkgdesc="International Components for Unicode library" arch=(i686 x86_64 'mips64el') @@ -14,7 +14,7 @@ depends=('gcc-libs>=4.7.1-5' 'sh') source=(#http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver/./_}-src.tgz http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz icu.8198.revert.icu5431.patch) -md5sums=('6eef33b229d0239d654983028c9c7053' +md5sums=('072e501b87065f3a0ca888f1b5165709' 'ebd5470fc969c75e52baf4af94a9ee82') build() { @@ -25,7 +25,8 @@ build() { ./configure --prefix=/usr \ --sysconfdir=/etc \ - --mandir=/usr/share/man + --mandir=/usr/share/man \ + --sbindir=/usr/bin make } diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 12adcd4be..df0d77d66 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185248 2013-05-12 14:13:52Z eric $ +# $Id: PKGBUILD 186384 2013-05-26 09:24:37Z bluewind $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.8.5.6 +pkgver=6.8.5.7 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.imagemagick.org/" @@ -13,7 +13,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ #source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('3c932aa3febb1e992a780e9091925bdbc0d61613' +sha1sums=('f393612e9797a6129f2cac7f83df337bb54ecf76' 'e143cf9d530fabf3b58023899b5cc544ba93daec') prepare() { diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index 7b2777482..98b4c7b5a 100644 --- a/extra/inkscape/PKGBUILD +++ b/extra/inkscape/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184396 2013-05-06 19:38:01Z foutrelis $ +# $Id: PKGBUILD 186340 2013-05-25 02:56:30Z foutrelis $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> # Contributor: tobias <tobias@archlinux.org> pkgname=inkscape pkgver=0.48.4 -pkgrel=7 +pkgrel=8 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' license=('GPL' 'LGPL') @@ -35,6 +35,7 @@ prepare() { sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py sed -i 's|"python"|"python2"|g' src/main.cpp + sed -i '/^#include <g.kmm/i #include <glibmm.h>' src/*{,/*{,/*{,/*}}}.{h,cpp} } build() { diff --git a/extra/intel-tbb/PKGBUILD b/extra/intel-tbb/PKGBUILD index 0d81df2b6..543f99e93 100644 --- a/extra/intel-tbb/PKGBUILD +++ b/extra/intel-tbb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 179910 2013-03-11 19:50:39Z stephane $ +# $Id: PKGBUILD 186302 2013-05-24 12:22:34Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Denis Martinez <deuns.martinez AT gmail.com> pkgname=intel-tbb -pkgver=4.1_20130116 +pkgver=4.1_20130314 pkgrel=1 pkgdesc='High level abstract threading library' arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ url='http://www.threadingbuildingblocks.org/' license=('GPL') depends=('gcc-libs') source=("http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb${pkgver/\./}oss_src.tgz") -sha1sums=('fd7ea56612f145a1f9b3d961a424e9d553bab527') +sha1sums=('e2bf74c1e492b06faf3ecdf2321e64ca698c0921') build() { cd "${srcdir}"/tbb${pkgver/\./}oss diff --git a/extra/irqbalance/PKGBUILD b/extra/irqbalance/PKGBUILD index 216d709b6..886c0ff0d 100644 --- a/extra/irqbalance/PKGBUILD +++ b/extra/irqbalance/PKGBUILD @@ -3,33 +3,26 @@ pkgname=irqbalance pkgver=1.0.5 -pkgrel=1 +pkgrel=2 pkgdesc="IRQ balancing daemon for SMP systems" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/irqbalance" license=('GPL') depends=(glib2 numactl libcap-ng) makedepends=(pkgconfig) -backup=(etc/conf.d/irqbalance) source=(http://irqbalance.googlecode.com/files/irqbalance-$pkgver.tar.gz - irqbalance.conf.d - irqbalance.rc.d irqbalance.service) md5sums=('b6403fa067c96adce448a48c9993654d' - '336c1ee99818f9ecda1687e34c69fd6b' - 'fb82fc5d267d39110baf720d81282a7c' - '9e82dc471128117982a8dd0c4bd5f246') + 'a97ad17dc7df98b81acb500b27f931e5') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make } package() { cd "$srcdir/$pkgname-$pkgver" make install DESTDIR="$pkgdir" - install -D -m644 ../irqbalance.conf.d "$pkgdir"/etc/conf.d/irqbalance - install -D -m755 ../irqbalance.rc.d "$pkgdir"/etc/rc.d/irqbalance install -D -m644 ../irqbalance.service "$pkgdir"/usr/lib/systemd/system/irqbalance.service } diff --git a/extra/irqbalance/irqbalance.conf.d b/extra/irqbalance/irqbalance.conf.d deleted file mode 100644 index ef1bdfd75..000000000 --- a/extra/irqbalance/irqbalance.conf.d +++ /dev/null @@ -1,6 +0,0 @@ -# -# Settings for irqbalance daemon -# - -# one shot mode - set to 1 if you have Pentium 4 with HT -ONESHOT=0 diff --git a/extra/irqbalance/irqbalance.rc.d b/extra/irqbalance/irqbalance.rc.d deleted file mode 100644 index 987c26b51..000000000 --- a/extra/irqbalance/irqbalance.rc.d +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -# source application-specific settings -ONESHOT=0 -[ -f /etc/conf.d/irqbalance ] && . /etc/conf.d/irqbalance - -if [ "$ONESHOT" -ne 0 ]; then - ONESHOT_CMD="--oneshot" -fi - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/irqbalance` -case "$1" in - start) - stat_busy "Starting IRQ balancing" - [ -z "$PID" ] && /usr/sbin/irqbalance $ONESHOT_CMD - if [ $? -gt 0 ]; then - stat_fail - else - if [ "$ONESHOT" -eq 0 ]; then - add_daemon irqbalance - fi - stat_done - fi - ;; - stop) - stat_busy "Stopping IRQ balancing" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon irqbalance - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/irqbalance/irqbalance.service b/extra/irqbalance/irqbalance.service index 372ac0aa4..c9fced094 100644 --- a/extra/irqbalance/irqbalance.service +++ b/extra/irqbalance/irqbalance.service @@ -2,7 +2,7 @@ Description=CPU Interrupt Request Balancer [Service] -ExecStart=/usr/sbin/irqbalance --foreground +ExecStart=/usr/bin/irqbalance --foreground [Install] WantedBy=multi-user.target diff --git a/extra/irssi/PKGBUILD b/extra/irssi/PKGBUILD index 69f70f20f..d1dc17947 100644 --- a/extra/irssi/PKGBUILD +++ b/extra/irssi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160489 2012-06-02 10:26:29Z bluewind $ +# $Id: PKGBUILD 186385 2013-05-26 09:24:38Z bluewind $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Dan McGee <dan@archlinux.org> pkgname=irssi pkgver=0.8.15 -pkgrel=6 +pkgrel=7 pkgdesc="Modular text mode IRC client with Perl scripting" arch=('i686' 'x86_64' 'mips64el') url="http://irssi.org/" diff --git a/extra/isapnptools/PKGBUILD b/extra/isapnptools/PKGBUILD index 56d573eb5..fb0005b72 100644 --- a/extra/isapnptools/PKGBUILD +++ b/extra/isapnptools/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136974 2011-09-04 11:49:36Z pierre $ +# $Id: PKGBUILD 185816 2013-05-19 12:09:03Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=isapnptools pkgver=1.27 -pkgrel=3 +pkgrel=4 pkgdesc="Allow ISA Plug-And-Play devices to be configured on a Linux machine" url="http://www.roestock.demon.co.uk/isapnptools/" depends=('glibc') @@ -14,11 +14,14 @@ md5sums=('b997ba56583dc850fce9b93d658dfa0c') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + + ./configure --prefix=/usr \ + --sbindir=/usr/bin make } package() { cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff b/extra/java7-openjdk/01_fix_openjdk_cmds_path.diff index 6cac91dd6..bb588a072 100644 --- a/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff +++ b/extra/java7-openjdk/01_fix_openjdk_cmds_path.diff @@ -1,15 +1,18 @@ ---- openjdk/jdk/make/common/shared/Defs-utils.gmk.old 2011-08-06 15:46:01.000000000 +0200 -+++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2011-08-06 15:59:26.000000000 +0200 -@@ -91,7 +91,7 @@ +--- openjdk/jdk/make/common/shared/Defs-utils.gmk.orig 2013-05-19 20:01:25.676093296 +0000 ++++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2013-05-19 20:01:54.312572109 +0000 +@@ -98,9 +98,9 @@ CHMOD = $(UTILS_COMMAND_PATH)chmod CMP = $(UTILS_USR_BIN_PATH)cmp COMM = $(UTILS_USR_BIN_PATH)comm -COMPRESS = $(UTILS_USR_BIN_PATH)compress +COMPRESS = $(UTILS_COMMAND_PATH)compress CP = $(UTILS_COMMAND_PATH)cp - CPIO = $(UTILS_COMMAND_PATH)cpio +-CPIO = $(UTILS_COMMAND_PATH)cpio ++CPIO = $(UTILS_USR_BIN_PATH)cpio CUT = $(UTILS_USR_BIN_PATH)cut -@@ -101,13 +101,13 @@ + DATE = $(UTILS_COMMAND_PATH)date + DF = $(UTILS_COMMAND_PATH)df +@@ -108,13 +108,13 @@ DIRNAME = $(UTILS_USR_BIN_PATH)dirname DUMP = $(UTILS_CCS_BIN_PATH)dump ECHO = $(UTILS_COMMAND_PATH)echo @@ -25,7 +28,7 @@ GUNZIP = $(UTILS_COMMAND_PATH)gunzip # GZIP is used for solaris. Linux and windows use tar czf GZIP = $(UTILS_COMMAND_PATH)gzip -@@ -140,7 +140,7 @@ +@@ -148,7 +148,7 @@ TAIL = $(UTILS_USR_BIN_PATH)tail TAR = $(UTILS_COMMAND_PATH)tar TEST = $(UTILS_USR_BIN_PATH)test diff --git a/extra/java7-openjdk/fix_corba_cmds_path.diff b/extra/java7-openjdk/02_fix_corba_cmds_path.diff index 7a3db9567..8a22e3229 100644 --- a/extra/java7-openjdk/fix_corba_cmds_path.diff +++ b/extra/java7-openjdk/02_fix_corba_cmds_path.diff @@ -1,15 +1,18 @@ ---- openjdk/corba/make/common/shared/Defs-utils.gmk.old 2008-04-13 13:26:12.000000000 +0300 -+++ openjdk/corba/make/common/shared/Defs-utils.gmk 2008-04-14 15:35:13.000000000 +0300 -@@ -76,7 +76,7 @@ +--- openjdk/corba/make/common/shared/Defs-utils.gmk.orig 2013-05-19 19:57:58.530784147 +0000 ++++ openjdk/corba/make/common/shared/Defs-utils.gmk 2013-05-19 19:58:44.777147938 +0000 +@@ -83,9 +83,9 @@ CHMOD = $(UTILS_COMMAND_PATH)chmod CMP = $(UTILS_USR_BIN_PATH)cmp COMM = $(UTILS_USR_BIN_PATH)comm -COMPRESS = $(UTILS_USR_BIN_PATH)compress +COMPRESS = $(UTILS_COMMAND_PATH)compress CP = $(UTILS_COMMAND_PATH)cp - CPIO = $(UTILS_COMMAND_PATH)cpio +-CPIO = $(UTILS_COMMAND_PATH)cpio ++CPIO = $(UTILS_USR_BIN_PATH)cpio CUT = $(UTILS_USR_BIN_PATH)cut -@@ -125,7 +125,7 @@ + DATE = $(UTILS_COMMAND_PATH)date + DF = $(UTILS_COMMAND_PATH)df +@@ -131,7 +131,7 @@ TAIL = $(UTILS_USR_BIN_PATH)tail TAR = $(UTILS_COMMAND_PATH)tar TEST = $(UTILS_USR_BIN_PATH)test @@ -18,10 +21,10 @@ TR = $(UTILS_USR_BIN_PATH)tr TRUE = $(UTILS_COMMAND_PATH)true UNAME = $(UTILS_COMMAND_PATH)uname -@@ -176,7 +176,7 @@ +@@ -182,7 +182,7 @@ # others have it in /usr/bin. SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \ - $(wildcard $(UTILS_USR_BIN_PATH)sort)) + $(wildcard $(UTILS_USR_BIN_PATH)sort)) - NAWK = $(USRBIN_PATH)gawk + NAWK = $(UTILS_COMMAND_PATH)gawk # Intrinsic unix command, with backslash-escaped character interpretation diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index 564bd8f5e..0c5e6b813 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184397 2013-05-06 19:38:04Z foutrelis $ +# $Id: PKGBUILD 186020 2013-05-20 13:53:06Z guillaume $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> @@ -23,7 +23,7 @@ _HOTSPOT_CHANGESET=ad5a321edea2 # see "${srcdir}/icedtea7"/hotspot.map _bootstrap=0 # 0/1 for quick build or full bootstrap pkgver=${_java_ver}.${_updatever}_${_icedtea_ver} -pkgrel=2 +pkgrel=4 arch=('i686' 'x86_64') url="http://icedtea.classpath.org" license=('custom') @@ -43,8 +43,8 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar ${_url}/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz # langtools.tar.gz ${_url}/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz # hotspot.tar.gz fontconfig-paths.diff - fix_corba_cmds_path.diff - openjdk7_fix_jdk_cmds_path.diff + 01_fix_openjdk_cmds_path.diff + 02_fix_corba_cmds_path.diff openjdk7_nonreparenting-wm.diff jdk7-openjdk.profile jdk7-openjdk.profile.csh @@ -59,8 +59,8 @@ sha256sums=('7e1fdd4c53c9772337c971b6f6f8058dabd99d7f4c4fcc85c88d836c9005c6da' '2806de9d41a91acff5bb917ec9dc41cb805e893b43828491b920f9ec14b53b12' 'c184f29b13626e7327f58e4c1df506daf2b57d8084b7a2d2106504ab0fd5eaac' '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f' - '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479' - 'b742113dc6debc3eb92a246e442595481c04a2a3973e7902b86037acb50050ea' + '583af9025df545264a15665e4c9f981bc7286aaecc6d312dced485102cf5dda9' + 'd57754ff320475023688bd7c7af38a9ea37e27ed8c1edd3b1572e4d8b41b78d3' 'fd615f476ef17853ae55b7aee3c92b6738f9ea584e915749b1caa7fdc5ff9ca4' 'bd55299e08e6f8e61ba5baad0990170891801a29a1e8137e502b5e8a10fc37ea' '3f28f8bfc6dd105a07f747d7135c77a77de433e2b8647dd7520a900135203fbd' @@ -89,7 +89,10 @@ build() { . /etc/profile.d/apache-ant.sh cp ${srcdir}/*.diff ${srcdir}/icedtea-${_icedtea_ver}/patches - export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/openjdk7_fix_jdk_cmds_path.diff patches/openjdk7_nonreparenting-wm.diff" + export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff \ + patches/01_fix_openjdk_cmds_path.diff \ + patches/02_fix_corba_cmds_path.diff \ + patches/openjdk7_nonreparenting-wm.diff" if [ "$_bootstrap" = "1" ]; then BOOTSTRAPOPT="--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar" @@ -327,6 +330,9 @@ package_jdk7-openjdk() { install -m755 -d ${pkgdir}/etc/profile.d/ install -m755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/jdk.sh install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/jdk.csh + + # Temporarily fixing FS#35141 + chmod go+r ${pkgdir}/usr/lib/jvm/java-7-openjdk/lib/sa-jdi.jar } package_openjdk7-src() { diff --git a/extra/java7-openjdk/jre7-openjdk-headless.install b/extra/java7-openjdk/jre7-openjdk-headless.install index 0787545b9..8fa330c19 100644 --- a/extra/java7-openjdk/jre7-openjdk-headless.install +++ b/extra/java7-openjdk/jre7-openjdk-headless.install @@ -1,11 +1,11 @@ post_install() { if [ ! -f /etc/ssl/certs/java/cacerts ]; then - /usr/sbin/init-jks-keystore + /usr/bin/init-jks-keystore fi } post_upgrade() { if [ ! -f /etc/ssl/certs/java/cacerts ]; then - /usr/sbin/init-jks-keystore + /usr/bin/init-jks-keystore fi } diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD index 519c90f25..736e7712e 100644 --- a/extra/kdebindings-perlkde/PKGBUILD +++ b/extra/kdebindings-perlkde/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184887 2013-05-09 09:43:00Z andrea $ +# $Id: PKGBUILD 186386 2013-05-26 09:24:39Z bluewind $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlkde pkgver=4.10.3 -pkgrel=1 +pkgrel=2 pkgdesc="Perl bindings for the KDE libraries" url="https://projects.kde.org/projects/kde/kdebindings/perl/perlkde" arch=('i686' 'x86_64' 'mips64el') @@ -11,22 +11,22 @@ license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') depends=('kdebindings-perlqt' 'kdebindings-smokekde') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs' - 'kdegraphics-okular' 'kdesdk-kate') + 'kdegraphics-okular' 'kdesdk-kate') source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.xz") sha1sums=('7db692b0a06ba421caa870fc254f03c2e3bf4e79') build() { - cd "${srcdir}" mkdir build cd build cmake ../perlkde-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DKDE4_BUILD_TESTS=OFF \ + -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr make } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD index 65bf601b3..723c9b265 100644 --- a/extra/kdebindings-perlqt/PKGBUILD +++ b/extra/kdebindings-perlqt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184858 2013-05-09 09:42:29Z andrea $ +# $Id: PKGBUILD 186387 2013-05-26 09:24:45Z bluewind $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlqt pkgver=4.10.3 -pkgrel=1 +pkgrel=2 pkgdesc="Perl bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/perl/perlqt" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,6 @@ source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.xz") sha1sums=('261e1c4d9a6a216d7b5b5e2962ba5266f0d62bdf') build() { - cd "${srcdir}" mkdir build cd build cmake ../perlqt-${pkgver} \ @@ -27,6 +26,6 @@ build() { } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/kdeedu-cantor/PKGBUILD b/extra/kdeedu-cantor/PKGBUILD index 95240c5dc..a1ea2f5a8 100644 --- a/extra/kdeedu-cantor/PKGBUILD +++ b/extra/kdeedu-cantor/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184889 2013-05-09 09:43:02Z andrea $ +# $Id: PKGBUILD 186565 2013-05-29 07:12:45Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-cantor pkgver=4.10.3 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Frontend to Mathematical Software" url="http://kde.org/applications/education/cantor/" arch=('i686' 'x86_64' 'mips64el') @@ -15,11 +15,17 @@ optdepends=('maxima: Maxima backend' 'octave: Octave backend' 'r: R backend') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.xz") -sha1sums=('ae2c9c50cc79030a3f15106d059997da5c37a886') +source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.xz" + 'sage58.patch') +sha1sums=('ae2c9c50cc79030a3f15106d059997da5c37a886' + 'c02051c30ece57800d693da60280b0bdb5f45697') + +prepare() { + cd cantor-${pkgver} + patch -p1 -i "${srcdir}"/sage58.patch +} build() { - cd "${srcdir}" mkdir build cd build cmake ../cantor-${pkgver} \ diff --git a/extra/kdeedu-cantor/sage58.patch b/extra/kdeedu-cantor/sage58.patch new file mode 100644 index 000000000..d17b55a99 --- /dev/null +++ b/extra/kdeedu-cantor/sage58.patch @@ -0,0 +1,123 @@ +diff --git a/src/backends/sage/sagecompletionobject.cpp b/src/backends/sage/sagecompletionobject.cpp +index dec0c8f..a132295 100644 +--- a/src/backends/sage/sagecompletionobject.cpp ++++ b/src/backends/sage/sagecompletionobject.cpp +@@ -52,7 +52,7 @@ void SageCompletionObject::fetchCompletions() + + //cache the value of the "_" variable into __hist_tmp__, so we can restore the previous result + //after complete() was evaluated +- m_expression=session()->evaluateExpression("__hist_tmp__=_; __IPYTHON__.complete(\""+command()+"\");_=__hist_tmp__"); ++ m_expression=session()->evaluateExpression("__hist_tmp__=_; __CANTOR_IPYTHON_SHELL__.complete(\""+command()+"\");_=__hist_tmp__"); + connect(m_expression, SIGNAL(gotResult()), this, + SLOT(extractCompletions())); + +@@ -71,11 +71,19 @@ void SageCompletionObject::extractCompletions() + kDebug()<<"something went wrong fetching tab completion"; + return; + } +- ++ + //the result looks like "['comp1', 'comp2']" parse it ++ ++ //for sage version 5.7 this looks like ++ //('s1', ['comp1','comp2']) where s1 is the string we called complete with ++ + QString txt=res->toHtml().trimmed(); ++ txt.remove("<br/>"); ++ txt=txt.mid(txt.indexOf(command())+command().length()+2).trimmed(); + txt=txt.mid(1); //remove [ +- txt.chop(1); //remove ] ++ txt.chop(2); //remove ] ++ ++ kDebug()<<"completion string: "<<txt; + + QStringList tmp=txt.split(','); + QStringList completions; +diff --git a/src/backends/sage/sageexpression.cpp b/src/backends/sage/sageexpression.cpp +index eabdda2..fbde7c1 100644 +--- a/src/backends/sage/sageexpression.cpp ++++ b/src/backends/sage/sageexpression.cpp +@@ -122,7 +122,7 @@ void SageExpression::parseOutput(const QString& text) + //reset the indices + index=index2=-1; + } +- ++ + m_outputCache+=output; + + if(m_promptCount<=0) +@@ -160,11 +160,9 @@ void SageExpression::addFileResult( const QString& path ) + { + KUrl url( path ); + KMimeType::Ptr type=KMimeType::findByUrl(url); +- kDebug()<<"MimeType: "<<type->name(); +- if(type->name().contains("image")) ++ if(m_imagePath.isEmpty()||type->name().contains("image")||path.endsWith(".png")||path.endsWith(".gif")) + { +- kDebug()<<"adding file "<<path<<" "<<url; +- m_imagePath=path; ++ m_imagePath=path; + } + } + +@@ -172,8 +170,11 @@ void SageExpression::evalFinished() + { + kDebug()<<"evaluation finished"; + kDebug()<<m_outputCache; ++ ++ //check if our image path contains a valid image that we can try to show ++ bool hasImage=!m_imagePath.isNull(); + +- if ( m_imagePath.isNull() ) //If this result contains a file, drop the text information ++ if ( !hasImage ) //If this result contains a file, drop the text information + { + Cantor::TextResult* result=0; + +@@ -219,7 +220,7 @@ void SageExpression::evalFinished() + } + else + { +- KMimeType::Ptr type=KMimeType::findByUrl(m_imagePath); ++ KMimeType::Ptr type=KMimeType::findByUrl(m_imagePath); + if(type->is("image/gif")) + setResult( new Cantor::AnimationResult( KUrl(m_imagePath ),i18n("Result of %1" , command() ) ) ); + else +diff --git a/src/backends/sage/sagesession.cpp b/src/backends/sage/sagesession.cpp +index a535277..d8ac325 100644 +--- a/src/backends/sage/sagesession.cpp ++++ b/src/backends/sage/sagesession.cpp +@@ -38,10 +38,13 @@ const QByteArray SageSession::SageAlternativePrompt="....: "; //Text, sage outpu + static QByteArray initCmd="os.environ['PAGER'] = 'cat' \n "\ + "sage.misc.pager.EMBEDDED_MODE = True \n "\ + "sage.misc.viewer.BROWSER='' \n "\ ++ "sage.misc.viewer.viewer.png_viewer('') \n" \ + "sage.plot.plot3d.base.SHOW_DEFAULTS['viewer'] = 'tachyon' \n"\ + "sage.misc.latex.EMBEDDED_MODE = True \n "\ + "os.environ['PAGER'] = 'cat' \n "\ +- " __IPYTHON__.shell.autoindent=False \n "\ ++ "%colors nocolor \n "\ ++ "__CANTOR_IPYTHON_SHELL__=get_ipython() \n "\ ++ "__CANTOR_IPYTHON_SHELL__.autoindent=False \n "\ + "print '____TMP_DIR____', sage.misc.misc.SAGE_TMP\n"\ + "print '____END_OF_INIT____' \n "; + +@@ -277,6 +280,7 @@ void SageSession::waitForNextPrompt() + + void SageSession::fileCreated( const QString& path ) + { ++ kDebug()<<"got a file "<<path; + SageExpression* expr=m_expressionQueue.first(); + if ( expr ) + expr->addFileResult( path ); +@@ -290,9 +294,9 @@ void SageSession::setTypesettingEnabled(bool enable) + //the _ and __IP.outputcache() are needed to keep the + // _ operator working + if (enable) +- evaluateExpression("sage.misc.latex.pretty_print_default(true);_;__IP.outputcache()", Cantor::Expression::DeleteOnFinish); ++ evaluateExpression("sage.misc.latex.pretty_print_default(true)", Cantor::Expression::DeleteOnFinish); + else +- evaluateExpression("sage.misc.latex.pretty_print_default(false);_;__IP.outputcache()", Cantor::Expression::DeleteOnFinish); ++ evaluateExpression("sage.misc.latex.pretty_print_default(false)", Cantor::Expression::DeleteOnFinish); + } + + Cantor::CompletionObject* SageSession::completionFor(const QString& command, int index) diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD index c4ed90a22..92ba11dc4 100644 --- a/extra/kdepim-runtime/PKGBUILD +++ b/extra/kdepim-runtime/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184851 2013-05-09 09:42:22Z andrea $ +# $Id: PKGBUILD 186222 2013-05-22 07:16:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepim-runtime pkgver=4.10.3 -pkgrel=1 +pkgrel=2 pkgdesc='Extends the functionality of kdepim' arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdepim-runtime' diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD deleted file mode 100644 index 42fce9c0d..000000000 --- a/extra/kdepim/PKGBUILD +++ /dev/null @@ -1,262 +0,0 @@ -# $Id: PKGBUILD 184967 2013-05-09 09:45:11Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdepim -pkgname=('kdepim-akonadiconsole' - 'kdepim-akregator' - 'kdepim-blogilo' - 'kdepim-console' - 'kdepim-kaddressbook' - 'kdepim-kalarm' - 'kdepim-kjots' - 'kdepim-kleopatra' - 'kdepim-kmail' - 'kdepim-knode' - 'kdepim-knotes' - 'kdepim-kontact' - 'kdepim-korganizer' - 'kdepim-kresources' - 'kdepim-ktimetracker' - 'kdepim-ktnef' - 'kdepim-libkdepim') -pkgver=4.10.3 -pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') -url='http://pim.kde.org' -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdepim') -makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link' - 'kde-agent' 'nepomuk-widgets') - source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('78ca9b822f905355ec00142a7de6c08c38b97c08') - -build() { - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DKDE4_BUILD_TESTS=OFF \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DKDEPIM_BUILD_MOBILE=OFF - make -} - -package_kdepim-akonadiconsole() { - pkgdesc='Akonadi Management and Debugging Console' - depends=('kdepim-libkdepim' 'nepomuk-widgets') - url='http://pim.kde.org' - install='kdepim.install' - cd "${srcdir}"/build/akonadiconsole - make DESTDIR="${pkgdir}" install -} - -package_kdepim-akregator() { - pkgdesc='A Feed Reader for KDE' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/internet/akregator/" - install='kdepim-akregator.install' - cd "${srcdir}"/build/akregator - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/akregator - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/kontact/plugins/akregator - make DESTDIR="${pkgdir}" install -} - -package_kdepim-blogilo() { - pkgdesc='A KDE Blogging Client' - depends=('kdepim-runtime') - url="http://kde.org/applications/internet/blogilo/" - replaces=('blogilo') - conflicts=('blogilo') - install='kdepim.install' - cd "${srcdir}"/build/blogilo - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/blogilo - make DESTDIR="${pkgdir}" install -} - -package_kdepim-console() { - pkgdesc='Command line tool for accessing calendar files' - depends=('kdepim-runtime') - url='http://pim.kde.org' - install='kdepim.install' - cd "${srcdir}"/build/console - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/kabcclient - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/konsolekalendar - make DESTDIR="${pkgdir}" install -} - -package_kdepim-kaddressbook() { - pkgdesc='Contact Manager' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/office/kaddressbook/" - install='kdepim.install' - cd "${srcdir}"/build/kaddressbook - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/kontact/plugins/kaddressbook - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/plugins/kaddressbook - make DESTDIR="${pkgdir}" install -} - -package_kdepim-kalarm() { - pkgdesc='Personal Alarm Scheduler' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/utilities/kalarm/" - install='kdepim.install' - cd "${srcdir}"/build/kalarm - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/kalarm - make DESTDIR="${pkgdir}" install -} - -package_kdepim-kjots() { - pkgdesc='Note Taker' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/utilities/kjots/" - install='kdepim.install' - cd "${srcdir}"/build/kjots - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/kjots - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/kontact/plugins/kjots - make DESTDIR="${pkgdir}" install -} - -package_kdepim-kleopatra() { - pkgdesc='Certificate Manager and Unified Crypto GUI' - depends=('kdepim-libkdepim') - install=kdepim-kleopatra.install - url="http://kde.org/applications/utilities/kleopatra/" - cd "${srcdir}"/build/kleopatra - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/kleopatra - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/kwatchgnupg - make DESTDIR="${pkgdir}" install -} - -package_kdepim-kmail() { - pkgdesc='Mail Client' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/internet/kmail/" - install='kdepim-kmail.install' - conflicts=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' - 'kdepim-mimelib' 'kdepim-plugins') - replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve' - 'kdepim-mimelib' 'kdepim-plugins') - for i in kmail doc/kmail kmailcvt archivemailagent \ - importwizard ksendemail libksieve messagelist mailfilteragent \ - ontologies kontact/plugins/kmail; do - cd "${srcdir}"/build/${i} - make DESTDIR="${pkgdir}" install - done -} - -package_kdepim-knode() { - pkgdesc='News Reader' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/internet/knode/" - install='kdepim-knode.install' - cd "${srcdir}"/build/knode - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/knode - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/kioslave/news - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/kontact/plugins/knode - make DESTDIR="${pkgdir}" install -} - -package_kdepim-knotes() { - pkgdesc='Popup Notes' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/utilities/knotes/" - install='kdepim.install' - cd "${srcdir}"/build/knotes - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/knotes - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/kontact/plugins/knotes - make DESTDIR="${pkgdir}" install -} - -package_kdepim-kontact() { - pkgdesc='Personal Information Manager' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/office/kontact/" - install='kdepim.install' - conflcits=('kdepim-kontactinterfaces') - replaces=('kdepim-kontactinterfaces') - for i in kontact/src doc/kontact kontact/plugins/summary \ - kontact/plugins/specialdates doc/kontact-admin; do - cd "${srcdir}"/build/${i} - make DESTDIR="${pkgdir}" install - done -} - -package_kdepim-korganizer() { - pkgdesc='Calendar and Scheduling Program' - depends=('kdepim-libkdepim') - url="http://kde.org/applications/office/korganizer" - install='kdepim-korganizer.install' - for i in korganizer doc/korganizer kontact/plugins/korganizer \ - calendarviews; do - cd "${srcdir}"/build/${i} - make DESTDIR="${pkgdir}" install - done -} - -package_kdepim-kresources() { - pkgdesc='KDE PIM resources' - depends=('kdepim-libkdepim') - url='http://pim.kde.org' - cd "${srcdir}"/build/kresources - make DESTDIR="${pkgdir}" install -} - -package_kdepim-ktimetracker() { - pkgdesc='Personal Time Tracker' - depends=('kdepim-kresources') - url="http://kde.org/applications/utilities/ktimetracker/" - install='kdepim.install' - cd "${srcdir}"/build/ktimetracker - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/ktimetracker - make DESTDIR="${pkgdir}" install -} - -package_kdepim-ktnef() { - pkgdesc='A viewer/extractor for TNEF files' - depends=('kdebase-runtime' 'kdepimlibs') - url="https://projects.kde.org/projects/kde/kdepim/ktnef" - install=kdepim-ktnef.install - cd "${srcdir}"/build/ktnef - make DESTDIR="${pkgdir}" install - cd "${srcdir}"/build/doc/ktnef - make DESTDIR="${pkgdir}" install -} - -package_kdepim-libkdepim() { - pkgdesc='Library for KDE PIM' - groups=() - depends=('kde-agent' 'kdepim-runtime') - url='http://pim.kde.org' - conflicts=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp' - 'kdepim-strigi-analyzer' 'kdepim-akonadi') - replaces=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp' - 'kdepim-strigi-analyzer' 'kdepim-akonadi') - for i in akonadi_next calendarsupport incidenceeditor-ng \ - kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \ - mailcommon mailimporter messagecomposer messagecore messageviewer \ - icons strigi-analyzer templateparser plugins/messageviewer \ - plugins/ktexteditor pimcommon pimsettingexporter; do - cd "${srcdir}"/build/${i} - make DESTDIR="${pkgdir}" install - done -} diff --git a/extra/kdepim/kdepim-akregator.install b/extra/kdepim/kdepim-akregator.install deleted file mode 100644 index 5787df72f..000000000 --- a/extra/kdepim/kdepim-akregator.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/kdepim/kdepim-kleopatra.install b/extra/kdepim/kdepim-kleopatra.install deleted file mode 100644 index 5787df72f..000000000 --- a/extra/kdepim/kdepim-kleopatra.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/kdepim/kdepim-kmail.install b/extra/kdepim/kdepim-kmail.install deleted file mode 100644 index 5787df72f..000000000 --- a/extra/kdepim/kdepim-kmail.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/kdepim/kdepim-knode.install b/extra/kdepim/kdepim-knode.install deleted file mode 100644 index 5787df72f..000000000 --- a/extra/kdepim/kdepim-knode.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/kdepim/kdepim-korganizer.install b/extra/kdepim/kdepim-korganizer.install deleted file mode 100644 index 5787df72f..000000000 --- a/extra/kdepim/kdepim-korganizer.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/kdepim/kdepim-ktnef.install b/extra/kdepim/kdepim-ktnef.install deleted file mode 100644 index 5787df72f..000000000 --- a/extra/kdepim/kdepim-ktnef.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/kdepim/kdepim.install b/extra/kdepim/kdepim.install deleted file mode 100644 index e70c054ec..000000000 --- a/extra/kdepim/kdepim.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 -} diff --git a/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD index 2c9ca9a62..8eab686ca 100644 --- a/extra/kdepimlibs/PKGBUILD +++ b/extra/kdepimlibs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184847 2013-05-09 09:42:17Z andrea $ +# $Id: PKGBUILD 185544 2013-05-14 21:40:23Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepimlibs pkgver=4.10.3 -pkgrel=1 +pkgrel=3 pkgdesc="KDE PIM Libraries" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdepimlibs' diff --git a/extra/kdevelop-php/PKGBUILD b/extra/kdevelop-php/PKGBUILD index a3f066062..bb1540cb2 100644 --- a/extra/kdevelop-php/PKGBUILD +++ b/extra/kdevelop-php/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183678 2013-04-26 13:20:21Z andrea $ +# $Id: PKGBUILD 186676 2013-05-30 12:44:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdevelop-php -pkgver=1.5.0 -_pkgver=4.5.0 +pkgver=1.5.1 +_pkgver=4.5.1 pkgrel=1 pkgdesc="PHP language and documentation plugin for KDevelop/Quanta" arch=('i686' 'x86_64' 'mips64el') @@ -14,8 +14,8 @@ makedepends=('cmake' 'automoc4' 'kdevelop-pg-qt') replaces=('kdevelop-php-docs') conflicts=('kdevelop-php-docs') source=(http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-{,docs-}${pkgver}.tar.bz2) -sha1sums=('778a1711c15458952e1e4765722a0839390f636c' - 'fa282f0ace43d36a785e608c421c91437596fc79') +sha1sums=('c047724c255417b361d3ce1898555c2b9183f5b2' + '9bdb654373970f46d01359fdcae6d879c405760a') build() { mkdir build diff --git a/extra/kdevelop-python/PKGBUILD b/extra/kdevelop-python/PKGBUILD index acbcf2f6e..90088d2f4 100644 --- a/extra/kdevelop-python/PKGBUILD +++ b/extra/kdevelop-python/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184199 2013-05-03 13:03:50Z andrea $ +# $Id: PKGBUILD 186211 2013-05-22 06:00:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdevelop-python -pkgver=1.5.0 +pkgver=1.5.1 pkgrel=1 pkgdesc="Python language and documentation plugin for KDevelop" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('GPL') depends=('kdevelop') makedepends=('cmake' 'automoc4' 'kdevelop-pg-qt') source=("http://download.kde.org/stable/kdevelop/kdev-python/${pkgver}/src/kdev-python-v${pkgver}.tar.bz2") -sha1sums=('fb9af112910c5655ce52bf9cfef19bacbab4f62f') +sha1sums=('accc8950a380e663bcfe3f51e4e5a6653ff8c146') build() { mkdir build diff --git a/extra/kdevelop/PKGBUILD b/extra/kdevelop/PKGBUILD index a9b9f3059..0ed239bc9 100644 --- a/extra/kdevelop/PKGBUILD +++ b/extra/kdevelop/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183676 2013-04-26 13:20:05Z andrea $ +# $Id: PKGBUILD 186674 2013-05-30 12:43:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=kdevelop -pkgver=4.5.0 +pkgver=4.5.1 pkgrel=1 pkgdesc="A C/C++ development environment for KDE" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ optdepends=('kdesdk-okteta: hex editor' 'qt-doc: qt documentation integration') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('21cdff814b5840d4b62b105b53c0b128e35c3c9f') +sha1sums=('e27b77bca0b4c466f66b24167ec416f20b353f6f') build() { mkdir build diff --git a/extra/kdevplatform/PKGBUILD b/extra/kdevplatform/PKGBUILD index 68ac479b1..03ef9b94b 100644 --- a/extra/kdevplatform/PKGBUILD +++ b/extra/kdevplatform/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183674 2013-04-26 13:19:47Z andrea $ +# $Id: PKGBUILD 186672 2013-05-30 12:43:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=kdevplatform -pkgver=1.5.0 -_pkgver=4.5.0 +pkgver=1.5.1 +_pkgver=4.5.1 pkgrel=1 pkgdesc="A C/C++ development platform for KDE" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ optdepends=("kdesdk-kompare: difference checking") makedepends=('cmake' 'automoc4' 'boost') install=${pkgname}.install source=("http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('c5b887fdd9fe065ff8be5641859c80c020ba625e') +sha1sums=('af3e78b55c4aec97e271bc06c59186cdf77fe3d1') build() { mkdir build diff --git a/extra/kexec-tools/PKGBUILD b/extra/kexec-tools/PKGBUILD index 335458d4b..da57ba6e0 100644 --- a/extra/kexec-tools/PKGBUILD +++ b/extra/kexec-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 182155 2013-04-08 13:04:10Z tpowa $ +# $Id: PKGBUILD 185799 2013-05-19 09:24:25Z tpowa $ # Contributor: Camille Moncelier <pix@devlife.org>, simo <simo@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=kexec-tools pkgver=2.0.4 -pkgrel=1 +pkgrel=2 pkgdesc="Load another kernel from the currently executing Linux kernel" arch=('i686' 'x86_64' 'mips64el') url="http://kernel.org/pub/linux/utils/kernel/kexec/" @@ -18,16 +18,13 @@ license=('GPL2') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --without-lzma + ./configure --prefix=/usr --sbindir=/usr/bin --without-lzma make } package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install - - mv $pkgdir/usr/sbin $pkgdir/sbin - install -D -m644 kexec/kexec.8 $pkgdir/usr/share/man/man8/kexec.8 } md5sums=('4713026758923f5f3968905291b991ee') diff --git a/extra/kismet/PKGBUILD b/extra/kismet/PKGBUILD index f1de285d1..a50a798fc 100644 --- a/extra/kismet/PKGBUILD +++ b/extra/kismet/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 171085 2012-11-16 14:51:57Z allan $ +# $Id: PKGBUILD 186877 2013-05-31 13:31:02Z andrea $ # Maintainer: # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> # Contributor: Juergen Hoetzel <jason@archlinux.org> pkgname=kismet -pkgver=2011_03_R2 +pkgver=2013_03_R1b _realver="${pkgver//_/-}" -pkgrel=5.1 +pkgrel=1 pkgdesc="802.11 layer2 wireless network detector, sniffer, and intrusion detection system" arch=('i686' 'x86_64' 'mips64el') url="http://www.kismetwireless.net/" license=('GPL') -depends=('libcap' 'libnl1' 'pcre' 'ncurses' 'libpcap>=1.0.0' 'bluez' 'openssl' 'libusb-compat') +depends=('libpcap' 'pcre' 'bluez') optdepends=('gpsd: log coordinates of detected networks' 'wireshark-cli: provide OUI files used to determine device manufacturer' 'wireshark-cli: mergecap, to merge multiple capture files' @@ -24,8 +24,8 @@ backup=('etc/kismet.conf' 'etc/kismet_drone.conf') install=kismet.install changelog=kismet.changelog source=("http://www.kismetwireless.net/code/${pkgname}-${_realver}.tar.gz"{,.asc}) -md5sums=('8bf077e8111e6dc8c12cadefdf40aadd' - '500deff918ede6d0bc392a0419322833') +md5sums=('6cdcd78baf2e15edbe8a9de3c5493f02' + 'SKIP') build() { cd "${srcdir}/${pkgname}-${_realver}" diff --git a/extra/konversation/PKGBUILD b/extra/konversation/PKGBUILD index ff8df1217..92423728f 100644 --- a/extra/konversation/PKGBUILD +++ b/extra/konversation/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 172103 2012-11-28 12:37:26Z stephane $ +# $Id: PKGBUILD 186022 2013-05-20 14:06:29Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: James Rayner <iphitus@gmail.com> @@ -6,12 +6,12 @@ pkgname=konversation pkgver=1.4 -pkgrel=5 +pkgrel=6 pkgdesc="A user friendly IRC client for KDE" arch=('i686' 'x86_64' 'mips64el') url="http://konversation.kde.org" depends=('kdebase-runtime' 'kdepimlibs') -makedepends=('automoc4' 'cmake' 'pkgconfig' 'docbook-xml') +makedepends=('automoc4' 'cmake' 'pkgconfig' 'docbook-xml' 'optipng') optdepends=('python: python scripting support' 'kdebase-konsole: open a terminal in konversation' 'qca-ossl: Diffie-Hellman key exchange and Blowfish ECB/CBC support') @@ -21,6 +21,12 @@ options=('!makeflags') source=("http://download.kde.org/download.php?url=stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") sha1sums=('90741721f68a02d4345b9006a8ae53bc49ef3777') +prepare() { + cd "$srcdir/$pkgname-$pkgver" + # libpng16 fix + find -name '*.png' -exec optipng -quiet -force -fix {} + +} + build() { cd "${srcdir}" mkdir build diff --git a/extra/kwebkitpart/PKGBUILD b/extra/kwebkitpart/PKGBUILD index 9ddd39c29..9369118e6 100644 --- a/extra/kwebkitpart/PKGBUILD +++ b/extra/kwebkitpart/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 179888 2013-03-10 21:31:07Z andrea $ +# $Id: PKGBUILD 186710 2013-05-30 17:03:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kwebkitpart -pkgver=1.3.2 +pkgver=1.3.3 pkgrel=2 pkgdesc="A WebKit browser component for KDE" url="https://projects.kde.org/projects/extragear/base/kwebkitpart/" @@ -11,8 +11,9 @@ license=('LGPL') depends=('kdelibs') makedepends=('cmake' 'automoc4') install=${pkgname}.install +# Generate using kde releaseme scripts source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('2df1c70371b99e5f638fff702f789ba1') +md5sums=('82640f97f23ce72bed1da6527909bb5d') build() { sed -i '/add_subdirectory(kdelauncher)/d' ${pkgname}-${pkgver}/CMakeLists.txt diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD index 8cb92af07..5cb642dd3 100644 --- a/extra/lftp/PKGBUILD +++ b/extra/lftp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180226 2013-03-18 16:47:18Z andyrtr $ +# $Id: PKGBUILD 186572 2013-05-29 15:13:14Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=lftp -pkgver=4.4.5 +pkgver=4.4.8 pkgrel=1 pkgdesc="Sophisticated command line based FTP client" arch=('i686' 'x86_64' 'mips64el') @@ -12,8 +12,8 @@ depends=('gcc-libs' 'readline>=6.2' "gnutls" "expat>=2.0.1-4" 'sh') optdepends=('perl: needed for convert-netscape-cookies and verify-file') url="http://lftp.yar.ru/" backup=('etc/lftp.conf') -source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2) -md5sums=('a8abdc87a00174571908ffaf5cdffd45') +source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2 ) +md5sums=('7140263fbe12f17f74183cf065a7d381') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/libaio/PKGBUILD b/extra/libaio/PKGBUILD new file mode 100644 index 000000000..ac29bc982 --- /dev/null +++ b/extra/libaio/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 186545 2013-05-28 18:17:04Z tpowa $ +# Maintainer: BartÅ‚omiej Piotrowski <barthalion@gmail.com> +# Contributor: Thomas S Hatch <thatch45 at gmail dot com> + +pkgname=libaio +pkgver=0.3.109 +_patchver=${pkgver}-2 +pkgrel=6 +pkgdesc="The Linux-native asynchronous I/O facility (aio) library" +arch=('i686' 'x86_64' 'mips64el') +url="http://lse.sourceforge.net/io/aio.html" +license=('LGPL') +source=(http://ftp.de.debian.org/debian/pool/main/liba/$pkgname/${pkgname}_${pkgver}.orig.tar.gz +http://ftp.de.debian.org/debian/pool/main/liba/${pkgname}/${pkgname}_${_patchver}.debian.tar.gz) + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # Debian patches for extra arches + patch -Np1 -i ../debian/patches/00_arches.patch + + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make prefix="$pkgdir/usr" install +} + +md5sums=('435a5b16ca6198eaf01155263d855756' + 'f942fe72127b612b93636387de47001b') diff --git a/extra/libbluray/PKGBUILD b/extra/libbluray/PKGBUILD index ba2ee7b36..1f4d9c706 100644 --- a/extra/libbluray/PKGBUILD +++ b/extra/libbluray/PKGBUILD @@ -1,46 +1,30 @@ -# $Id: PKGBUILD 167258 2012-09-29 12:58:04Z ibiru $ +# $Id: PKGBUILD 186521 2013-05-28 10:28:20Z ioni $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrew Cook <ariscop@gmail.com> pkgname=libbluray -pkgver=0.2.3 +pkgver=0.3.0 pkgrel=1 pkgdesc="Library to access Blu-Ray disks for video playback" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/developers/libbluray.html" license=('LGPL2.1') -depends=('libxml2') -if [ "$CARCH" != "mips64el" ]; then -makedepends=('apache-ant' 'jdk7-openjdk') -optdepends=('java-environment: Blu-ray Disc Java support library') -fi +depends=('libxml2' 'freetype2') options=(!libtool) source=(ftp://ftp.videolan.org/pub/videolan/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) -sha512sums=('b84fd172523facb207134bb1fee09c7f65914d22f6120fbfd6f312f0435229f3b110e8cc8ea121159929cda3760cfac4b52f84de39d0fb976f8c88d1f7e6d278') +sha512sums=('96eedf23ff756e97fa64d9624a49608daccbac169714b9b231a284ed4eb63c77ee2ecbdfc42c311781571146cfa0fe340854ac831d3fe1312131e1742a4a7b02') build() { cd "$pkgname-$pkgver" -if [ "$CARCH" != "mips64el" ]; then - . /etc/profile.d/jdk.sh ./configure --prefix=/usr \ - --enable-bdjava \ - --with-jdk=${JAVA_HOME} \ --disable-static -else - ./configure --prefix=/usr \ - --disable-static -fi make } package() { cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install - #install bdj -if [ "$CARCH" != "mips64el" ]; then - install -Dm644 src/.libs/libbluray.jar "$pkgdir/usr/share/java/libbluray.jar" -fi } # vim:set ts=2 sw=2 et: diff --git a/extra/libbsd/PKGBUILD b/extra/libbsd/PKGBUILD index e22966655..9fdf78b95 100644 --- a/extra/libbsd/PKGBUILD +++ b/extra/libbsd/PKGBUILD @@ -4,7 +4,7 @@ pkgname=libbsd pkgver=0.4.2 -pkgrel=1 +pkgrel=1.1 pkgdesc="Provides useful functions commonly found on BSD systems like strlcpy()" arch=('i686' 'x86_64' 'mips64el') url="http://libbsd.freedesktop.org" diff --git a/extra/libburn/PKGBUILD b/extra/libburn/PKGBUILD index 290f72f9f..d59f1283d 100644 --- a/extra/libburn/PKGBUILD +++ b/extra/libburn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180384 2013-03-20 20:56:09Z andyrtr $ +# $Id: PKGBUILD 186945 2013-06-01 10:04:29Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=libburn -pkgver=1.2.8 +pkgver=1.3.0.pl01 pkgrel=1 pkgdesc="Library for reading, mastering and writing optical discs" arch=('i686' 'x86_64' 'mips64el') @@ -12,17 +12,17 @@ license=('GPL') depends=('glibc') source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig}) options=('!libtool' '!emptydirs') -md5sums=('2838ff6fdd32e69394305f97f806002b' - 'b67455e5a50d2d956d45591529575408') +md5sums=('1ccbb8624b8c2b9937727000e46b52cf' + 'SKIP') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgname}-${pkgver/.pl01/} ./configure --prefix=/usr --disable-static make } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgname}-${pkgver/.pl01/} make DESTDIR=${pkgdir} install } diff --git a/extra/libchamplain/PKGBUILD b/extra/libchamplain/PKGBUILD index 044f5cf7c..9c9101c43 100644 --- a/extra/libchamplain/PKGBUILD +++ b/extra/libchamplain/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183426 2013-04-21 22:11:10Z heftig $ +# $Id: PKGBUILD 186991 2013-06-02 19:42:55Z heftig $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Michael Kanis <mkanis@gmx.de> pkgname=libchamplain -pkgver=0.12.3 +pkgver=0.12.4 pkgrel=2 pkgdesc="Gtk3 widget for displaying rasterized maps" url="http://projects.gnome.org/libchamplain/" @@ -13,15 +13,19 @@ options=('!libtool') depends=('clutter-gtk' 'libsoup' 'cairo' 'sqlite') makedepends=('gobject-introspection' 'gtk-doc' 'vala') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('3d03d4e6892305a3b5b78e0718e486f6a13271df33d82383fd8361ef71f3e658') +sha256sums=('631ce8e91b02c596e29778d3f7c1d28013e2e40d080a88f2d9a06f8b79f9e493') build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --disable-static --disable-debug --enable-vala - make + cd $pkgname-$pkgver + ./configure --prefix=/usr --disable-static --disable-debug --enable-vala + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make } package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/extra/libdmx/PKGBUILD b/extra/libdmx/PKGBUILD index 323e1f733..8c7b0a4a1 100644 --- a/extra/libdmx/PKGBUILD +++ b/extra/libdmx/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 152803 2012-03-09 17:01:00Z andyrtr $ +# $Id: PKGBUILD 186576 2013-05-29 15:18:36Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdmx -pkgver=1.1.2 -pkgrel=1.1 +pkgver=1.1.3 +pkgrel=1 pkgdesc="X11 Distributed Multihead extension library" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +13,7 @@ depends=('dmxproto' 'libxext') makedepends=('xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('76956d4127ded2e6d1bb5746a6d1603ee23b442a') +sha256sums=('c97da36d2e56a2d7b6e4f896241785acc95e97eb9557465fd66ba2a155a7b201') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD index 022ca05c1..d7da69d70 100644 --- a/extra/libdrm/PKGBUILD +++ b/extra/libdrm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183612 2013-04-25 11:57:24Z jgc $ +# $Id: PKGBUILD 185754 2013-05-18 10:51:46Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdrm -pkgver=2.4.44 -pkgrel=2 +pkgver=2.4.45 +pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64 'mips64el') license=('custom') @@ -16,7 +16,7 @@ url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2 no-pthread-stubs.patch COPYING) -sha256sums=('42b45ad15bb1bc52630a4b37b7afcfaea27e01b3c0b4791ef25d0f7b2456f6a2' +sha256sums=('3ef0a70c16080fb90c50e807b660b7353d82509c03647f6ecc00bbfa1caee208' 'c2d2e8575dac9d08f1271b2cfa68ac3b42e69f99efe6e3a7e20064f22f7e28ab' '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93') diff --git a/extra/libetpan/PKGBUILD b/extra/libetpan/PKGBUILD index 436af32fa..6796e20b4 100644 --- a/extra/libetpan/PKGBUILD +++ b/extra/libetpan/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 168431 2012-10-11 16:04:57Z andyrtr $ +# $Id: PKGBUILD 185576 2013-05-15 08:05:36Z bpiotrowski $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=libetpan pkgver=1.1 -pkgrel=1 +pkgrel=2 pkgdesc="A portable middleware for email access" arch=('i686' 'x86_64' 'mips64el') url="http://www.etpan.org/" license=("custom:etpan") -depends=('db>=5.3.15' 'libsasl>=2.1.23' 'curl>=7.23.1' 'expat>=2.0.1-1') +depends=('db>=5.3.15' 'libsasl>=2.1.26' 'curl>=7.23.1' 'expat>=2.0.1-1') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) md5sums=('6fee60d08506e941642b8fa087e60b07') diff --git a/extra/libfs/PKGBUILD b/extra/libfs/PKGBUILD index 9d16938d1..a06ca8611 100644 --- a/extra/libfs/PKGBUILD +++ b/extra/libfs/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 151846 2012-03-03 13:40:06Z andyrtr $ -#Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 186578 2013-05-29 15:21:31Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libfs -pkgver=1.0.4 -pkgrel=1.1 +pkgver=1.0.5 +pkgrel=1 pkgdesc="X11 Font Services Library" arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -12,7 +13,7 @@ depends=('glibc' 'xproto' 'fontsproto') makedepends=('xorg-util-macros' 'xtrans') options=('!libtool') source=("${url}/releases/individual/lib/libFS-${pkgver}.tar.bz2") -sha1sums=('f114f32f60eb84d3e1d0e6f0dfe7679b07e91295') +sha256sums=('22eb3005dd8053aef7ff82758da5dd59ca9738410bcf847e675780e3a1f96107') build() { cd "${srcdir}/libFS-${pkgver}" diff --git a/extra/libgweather/PKGBUILD b/extra/libgweather/PKGBUILD index 0ddf4e0c7..9230c7938 100644 --- a/extra/libgweather/PKGBUILD +++ b/extra/libgweather/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183432 2013-04-21 22:11:21Z heftig $ +# $Id: PKGBUILD 185424 2013-05-14 09:29:29Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libgweather -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="Provides access to weather information from the net" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ install=libgweather.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz gettext-not-xml.patch no_external_gettext.patch) -sha256sums=('4649f51a881ec375853a782ec1cd279f242baa4b6c1b9ebe09614ac65dd6081a' +sha256sums=('b053c1328d756a6c653e44464b7a41bec451752fa9686ade32e2e4c6e2a6deb5' '40325e0b5464ebb75eaad3c9292c0bab7b15cfefb93011d9ccc0ab82635a9533' 'f07ac07a70ad4999c3acd5d5b82aabd8831e6a45beb9aaed239f212057ded672') diff --git a/extra/libical/PKGBUILD b/extra/libical/PKGBUILD index 4d5dfdad5..810e82fa0 100644 --- a/extra/libical/PKGBUILD +++ b/extra/libical/PKGBUILD @@ -1,29 +1,29 @@ -# $Id: PKGBUILD 157971 2012-04-30 07:57:27Z andrea $ +# $Id: PKGBUILD 185545 2013-05-14 21:40:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=libical -pkgver=0.48 -pkgrel=1.1 +pkgver=1.0 +pkgrel=2 pkgdesc="An open source reference implementation of the icalendar data type and serialization format" arch=('i686' 'x86_64' 'mips64el') url='http://sourceforge.net/projects/freeassociation/' license=('LGPL' 'MPL') depends=('glibc') -options=('!libtool') +makedepends=('cmake') source=("http://downloads.sourceforge.net/freeassociation/${pkgname}-${pkgver}.tar.gz") -md5sums=('e549f434d5fbf9cd156c60ed4943618f') +md5sums=('4438c31d00ec434f02867a267a92f8a1') build() { - cd "${srcdir}"/${pkgname}-${pkgver} - - ./configure --prefix=/usr \ - --enable-shared \ - --disable-static + mkdir -p build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr make } package() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/libiscsi/PKGBUILD b/extra/libiscsi/PKGBUILD new file mode 100644 index 000000000..26f3c5381 --- /dev/null +++ b/extra/libiscsi/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 186551 2013-05-28 18:43:28Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +pkgname=libiscsi +pkgver=1.7.0 +pkgrel=1 +depends=('glibc' 'popt') +pkgdesc="Library that provides generic access to USB device" +arch=(i686 x86_64) +url="https://github.com/sahlberg/libiscsi" +license=('LGPL') +source=(https://github.com/downloads/sahlberg/${pkgname}/${pkgname}-${pkgver}.tar.gz) +options=(!libtool) + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./autogen.sh + ./configure --prefix=/usr --disable-static --libdir=/usr/lib + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package () { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} +md5sums=('4ba621f47d016d48ab93d5301ae5a363') diff --git a/extra/libisoburn/PKGBUILD b/extra/libisoburn/PKGBUILD index d70689935..e733b5295 100644 --- a/extra/libisoburn/PKGBUILD +++ b/extra/libisoburn/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 180386 2013-03-20 20:56:13Z andyrtr $ +# $Id: PKGBUILD 185770 2013-05-18 14:58:09Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Gour <Gour <gour@mail.inet.hr> pkgname=libisoburn -pkgver=1.2.8 +pkgver=1.3.0 pkgrel=1 pkgdesc="frontend for libraries libburn and libisofs" url="http://libburnia.pykix.org/wiki/Libisoburn" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') -depends=('libburn>=1.2.8' 'libisofs>=1.2.8' 'readline') +depends=('libburn>=1.3.0' 'libisofs>=1.3.0' 'readline') options=('!libtool') install=${pkgname}.install source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('1f02aa98d56c4b3e568e641a91640ecc' - '766281eec985df34f584aabd6963d71d') +md5sums=('1341e87e385cb559ee1cd2605e372dec' + 'SKIP') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/libisofs/PKGBUILD b/extra/libisofs/PKGBUILD index 9faf3acd4..2700c317f 100644 --- a/extra/libisofs/PKGBUILD +++ b/extra/libisofs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180385 2013-03-20 20:56:10Z andyrtr $ +# $Id: PKGBUILD 185768 2013-05-18 14:55:44Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Hugo Doria <hugodoria@gmail.com> # Contributor: Bjorn Martensen pkgname=libisofs -pkgver=1.2.8 +pkgver=1.3.0 pkgrel=1 pkgdesc="Library to pack up hard disk files and directories into a ISO 9660 disk image" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ license=('GPL') depends=('acl' 'zlib') source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig}) options=('!libtool') -md5sums=('9d3515929b80a08daa6423b8312be8c1' - 'f30c694e856d9c44df864b30b2139000') +md5sums=('5ab9f4a57d3c815d1183cbf49ce86a9e' + 'SKIP') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/libjpeg-turbo/PKGBUILD b/extra/libjpeg-turbo/PKGBUILD index 13e60a270..306bd875e 100644 --- a/extra/libjpeg-turbo/PKGBUILD +++ b/extra/libjpeg-turbo/PKGBUILD @@ -1,53 +1,42 @@ -# $Id: PKGBUILD 162914 2012-07-03 20:59:56Z eric $ +# $Id: PKGBUILD 186466 2013-05-26 22:08:45Z eric $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com> pkgname=libjpeg-turbo -pkgver=1.2.1 -pkgrel=1.1 +pkgver=1.3.0 +pkgrel=2 pkgdesc="libjpeg derivative with accelerated baseline JPEG compression and decompression" arch=('i686' 'x86_64' 'mips64el') url="http://libjpeg-turbo.virtualgl.org/" license=('GPL' 'custom') depends=('glibc') makedepends=('nasm') -provides=('libjpeg=8.0.2') -conflicts=('libjpeg') -replaces=('libjpeg') +provides=('libjpeg=8.0.2' 'turbojpeg') +conflicts=('libjpeg' 'turbojpeg') +replaces=('libjpeg' 'turbojpeg') options=('!libtool') source=(http://sourceforge.net/projects/$pkgname/files/$pkgver/$pkgname-$pkgver.tar.gz) -sha1sums=('a4992e102c6d88146709e8e6ce5896d5d0b5a361') +sha1sums=('1792c964b35604cebd3a8846f1ca6de5976e9c28') build() { - cd "$srcdir/$pkgname-$pkgver" - - # put documentation in a reasonable directory... - sed -i "/docdir = /s#/doc#/doc/libjpeg-turbo#" Makefile.in - sed -i "/exampledir = /s#/doc#/doc/libjpeg-turbo#" Makefile.in - + cd $pkgname-$pkgver ./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man make } check() { cd "$srcdir/$pkgname-$pkgver" - make test } package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir/" docdir=/usr/share/doc/libjpeg-turbo \ + exampledir=/usr/share/doc/libjpeg-turbo install # provide jpegint.h as it is required by various software install -m644 jpegint.h "$pkgdir/usr/include/" - # do not distributre libturbojpeg as it is unversioned - rm "$pkgdir"/usr/lib/libturbojpeg.{so,a} - rm "$pkgdir/usr/include/turbojpeg.h" - rm "$pkgdir/usr/bin/tjbench" - install -dm755 "$pkgdir/usr/share/licenses/libjpeg-turbo/" ln -s ../../doc/libjpeg-turbo/README \ "$pkgdir/usr/share/licenses/libjpeg-turbo/README" diff --git a/extra/libkgapi/PKGBUILD b/extra/libkgapi/PKGBUILD index 31f48faa7..d21ade318 100644 --- a/extra/libkgapi/PKGBUILD +++ b/extra/libkgapi/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 173820 2012-12-24 04:23:51Z andrea $ +# $Id: PKGBUILD 186926 2013-06-01 08:09:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkgapi -pkgver=0.4.4 +pkgver=2.0.1 pkgrel=1 pkgdesc="A KDE-based library for accessing various Google services via their public API" url='https://projects.kde.org/projects/extragear/libs/libkgapi' arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') -depends=('kdepimlibs' 'qjson') +depends=('kdepimlibs') makedepends=('cmake' 'automoc4' 'boost') replaces=('akonadi-google' 'libkgoogle') conflicts=('akonadi-google' 'libkgoogle') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('a26ddd6da675075f7529652f36f5c9f5') +md5sums=('a421c6b5e0b262136121e3734b29fcce') build() { mkdir build diff --git a/extra/liblo/PKGBUILD b/extra/liblo/PKGBUILD index 5bc4b86c6..46af636cb 100644 --- a/extra/liblo/PKGBUILD +++ b/extra/liblo/PKGBUILD @@ -1,25 +1,29 @@ -# $Id: PKGBUILD 150414 2012-02-17 12:41:31Z allan $ +# $Id: PKGBUILD 186897 2013-05-31 15:30:05Z schiv $ +# Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Pajaro pkgname=liblo -pkgver=0.26 -pkgrel=2.2 +pkgver=0.27 +pkgrel=1 pkgdesc="Lightweight OSC implementation: an implementation of the Open Sound Control protocol for POSIX systems" arch=(i686 x86_64 'mips64el') url="http://plugin.org.uk/liblo/" license=('GPL') +depends=('glibc') options=('!libtool') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('5351de14262560e15e7f23865293b16f') +md5sums=('e4317bab5b16003df350adfe2c181364') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr make } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install || return 1 + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install } diff --git a/extra/libmbim/PKGBUILD b/extra/libmbim/PKGBUILD new file mode 100644 index 000000000..901429d4c --- /dev/null +++ b/extra/libmbim/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 186608 2013-05-30 04:01:37Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> + +pkgname=libmbim +pkgver=1.0.0 +pkgrel=1 +pkgdesc="MBIM modem protocol helper library" +arch=(i686 x86_64) +url="http://cgit.freedesktop.org/libmbim/libmbim" +license=(GPL2) +depends=(glib2 bash systemd) +makedepends=(gtk-doc python) +options=('!libtool') +source=($url/snapshot/$pkgname-$pkgver.tar.xz format.patch) +sha256sums=('c3d668a5dc51700749a62fb5d50f149900e8dd4265e4d132c1d9cc4cb77eef0c' + 'fbf54d12660c132f756c59cebd448a38750e3bbc9de8a7a97ceda466440dcb41') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../format.patch +} + +build() { + cd $pkgname-$pkgver + ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --with-tests + make +} + +check() { + cd $pkgname-$pkgver + make check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/libmbim/format.patch b/extra/libmbim/format.patch new file mode 100644 index 000000000..4bd4c0eea --- /dev/null +++ b/extra/libmbim/format.patch @@ -0,0 +1,14 @@ +diff -u -r libmbim-1.0.0/cli/mbimcli-basic-connect.c libmbim-1.0.0-format/cli/mbimcli-basic-connect.c +--- libmbim-1.0.0/cli/mbimcli-basic-connect.c 2013-05-22 16:20:29.000000000 +0200 ++++ libmbim-1.0.0-format/cli/mbimcli-basic-connect.c 2013-05-30 05:53:49.269777442 +0200 +@@ -909,8 +909,8 @@ + "\t Network error: '%s'\n" + "\t Packet service state: '%s'\n" + "\tAvailable data classes: '%s'\n" +- "\t Uplink speed: '%lu bps'\n" +- "\t Downlink speed: '%lu bps'\n", ++ "\t Uplink speed: '%" G_GUINT64_FORMAT " bps'\n" ++ "\t Downlink speed: '%" G_GUINT64_FORMAT " bps'\n", + mbim_device_get_path_display (device), + VALIDATE_UNKNOWN (mbim_nw_error_get_string (nw_error)), + VALIDATE_UNKNOWN (mbim_packet_service_state_get_string (packet_service_state)), diff --git a/extra/libogg/PKGBUILD b/extra/libogg/PKGBUILD index f7a430ee9..8aa2a1105 100644 --- a/extra/libogg/PKGBUILD +++ b/extra/libogg/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 134991 2011-08-09 20:12:08Z eric $ -# Maintainer: +# $Id: PKGBUILD 186983 2013-06-02 16:07:31Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: John Proctor <jproctor@prium.net> pkgname=libogg -pkgver=1.3.0 -pkgrel=1.1 +pkgver=1.3.1 +pkgrel=1 pkgdesc="Ogg bitstream and framing library" arch=('i686' 'x86_64' 'mips64el') url="http://www.xiph.org/ogg/" @@ -13,8 +13,6 @@ depends=('glibc') options=('!libtool') source=(http://downloads.xiph.org/releases/ogg/$pkgname-$pkgver.tar.xz config_types.h) -md5sums=('84a35715170f2cd4c77a4448772b95d5' - 'a4d786b1b1955cb85b64fd16cbbee3f9') build() { cd "$srcdir/${pkgname}-${pkgver}" @@ -36,3 +34,5 @@ package() { "${pkgdir}/usr/include/ogg/config_types.h" fi } +md5sums=('ca25d8da0ddfc8c6cbbf78d847a209fe' + 'a4d786b1b1955cb85b64fd16cbbee3f9') diff --git a/extra/libproxy/PKGBUILD b/extra/libproxy/PKGBUILD index 70f9e5041..7bcc2a9a5 100644 --- a/extra/libproxy/PKGBUILD +++ b/extra/libproxy/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 24494 2009-01-17 20:42:01Z jgc $ +# $Id: PKGBUILD 186388 2013-05-26 09:24:47Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libproxy pkgver=0.4.11 -pkgrel=1 +pkgrel=2 pkgdesc="A library that provides automatic proxy configuration management" arch=(i686 x86_64 'mips64el') license=('LGPL') diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index ac39bf8cd..a81628eb0 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185016 2013-05-10 07:10:14Z andyrtr $ +# $Id: PKGBUILD 186348 2013-05-25 05:24:32Z foutrelis $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -21,7 +21,7 @@ pkgname=('libreoffice-common' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) _LOver=4.0.3.3 pkgver=4.0.3 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -33,7 +33,7 @@ makedepends=( # makedepends # the runtime dependencies "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=51.1" - 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'poppler>=0.22.3' + 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'poppler>=0.22.4' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' 'ttf-dejavu') # to satisfy regression tests @@ -274,8 +274,8 @@ package_libreoffice-common() { pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" install=libreoffice-common.install - depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib' - 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=51.1" 'clucene' 'lcms2' "poppler>=0.22.3" + depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib' 'librsvg' + 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=51.1" 'clucene' 'lcms2' "poppler>=0.22.4" 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') optdepends=('libreoffice-langpack: additional language support' 'java-runtime: adds java support' diff --git a/extra/libseccomp/PKGBUILD b/extra/libseccomp/PKGBUILD new file mode 100644 index 000000000..9bdaee4fc --- /dev/null +++ b/extra/libseccomp/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Daniel Micay <danielmicay@gmail.com> +# Contributor: Patryk Kowalczyk < patryk at kowalczyk dot ws> + +pkgname=libseccomp +pkgver=2.0.0 +pkgrel=2 +pkgdesc='Enhanced seccomp library' +arch=('i686' 'x86_64') +license=('LGPL2.1') +url="http://sourceforge.net/projects/libseccomp/" +depends=('glibc') +source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('f988feac6a3425f2c918f32b28df1caa') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/libtiff/PKGBUILD b/extra/libtiff/PKGBUILD index 08e987e47..cf529d757 100644 --- a/extra/libtiff/PKGBUILD +++ b/extra/libtiff/PKGBUILD @@ -1,33 +1,55 @@ -# $Id: PKGBUILD 167697 2012-10-03 05:10:48Z eric $ +# $Id: PKGBUILD 186503 2013-05-28 01:47:37Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=libtiff pkgver=4.0.3 -pkgrel=1.1 +pkgrel=2 pkgdesc="Library for manipulation of TIFF images" arch=('i686' 'x86_64' 'mips64el') url="http://www.remotesensing.org/libtiff/" license=('custom') -depends=('libjpeg' 'zlib' 'xz') -makedepends=('freeglut') +depends=('gcc-libs' 'libjpeg' 'zlib' 'xz') +makedepends=('freeglut' 'glu' 'mesa') optdepends=('freeglut: for using tiffgt') options=('!libtool') -source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz) -sha1sums=('652e97b78f1444237a82cbcfe014310e776eb6f0') +source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz + tiff-3.9.7-CVE-2012-4447.patch + tiff-3.9.7-CVE-2012-4564.patch + tiff-4.0.3-CVE-2013-1960.patch + tiff-4.0.3-CVE-2013-1961.patch + tiff-4.0.3-libjpeg-turbo.patch + tiff-4.0.3-tiff2pdf-colors.patch) +sha1sums=('652e97b78f1444237a82cbcfe014310e776eb6f0' + '41be661638282dae0d07bd2788414cb6650f8981' + '6cb3d480908132335c05c769b5a51f951413725d' + '5903355afdd0bb27ea3746339e2196720f9fac9d' + '29a91870cca5d4cd9ca1c464f8074088eddc3fb8' + '02d57835df50d3f84587571ec52b36f5af838de2' + '23443ad0bc130d70860b6cc6d19b69584ae7a6cc') + +prepare() { + cd tiff-${pkgver} + patch -p0 -i "${srcdir}/tiff-4.0.3-tiff2pdf-colors.patch" + patch -p1 -i "${srcdir}/tiff-3.9.7-CVE-2012-4447.patch" + patch -p1 -i "${srcdir}/tiff-3.9.7-CVE-2012-4564.patch" + patch -p1 -i "${srcdir}/tiff-4.0.3-CVE-2013-1960.patch" + patch -p1 -i "${srcdir}/tiff-4.0.3-CVE-2013-1961.patch" + patch -p1 -i "${srcdir}/tiff-4.0.3-libjpeg-turbo.patch" +} build() { - cd "${srcdir}/tiff-${pkgver}" + cd tiff-${pkgver} ./configure --prefix=/usr make } check() { - cd "${srcdir}/tiff-${pkgver}" -# make check + cd tiff-${pkgver} + make check } package() { - cd "${srcdir}/tiff-${pkgver}" + cd tiff-${pkgver} make DESTDIR="${pkgdir}" install install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/libtiff/tiff-3.9.7-CVE-2012-4447.patch b/extra/libtiff/tiff-3.9.7-CVE-2012-4447.patch new file mode 100644 index 000000000..f23e98466 --- /dev/null +++ b/extra/libtiff/tiff-3.9.7-CVE-2012-4447.patch @@ -0,0 +1,37 @@ +Upstream patch for CVE-2012-4447. This also covers an out-of-bounds-read +possibility in the same file, which wasn't given a separate CVE. + + +diff -Naur tiff-3.9.4.orig/libtiff/tif_pixarlog.c tiff-3.9.4/libtiff/tif_pixarlog.c +--- tiff-3.9.4.orig/libtiff/tif_pixarlog.c 2010-06-08 14:50:42.000000000 -0400 ++++ tiff-3.9.4/libtiff/tif_pixarlog.c 2012-12-10 15:50:14.421538317 -0500 +@@ -641,6 +641,20 @@ + return bytes; + } + ++static tsize_t ++add_ms(tsize_t m1, tsize_t m2) ++{ ++ tsize_t bytes = m1 + m2; ++ ++ /* if either input is zero, assume overflow already occurred */ ++ if (m1 == 0 || m2 == 0) ++ bytes = 0; ++ else if (bytes <= m1 || bytes <= m2) ++ bytes = 0; ++ ++ return bytes; ++} ++ + static int + PixarLogSetupDecode(TIFF* tif) + { +@@ -661,6 +675,8 @@ + td->td_samplesperpixel : 1); + tbuf_size = multiply(multiply(multiply(sp->stride, td->td_imagewidth), + td->td_rowsperstrip), sizeof(uint16)); ++ /* add one more stride in case input ends mid-stride */ ++ tbuf_size = add_ms(tbuf_size, sizeof(uint16) * sp->stride); + if (tbuf_size == 0) + return (0); + sp->tbuf = (uint16 *) _TIFFmalloc(tbuf_size); diff --git a/extra/libtiff/tiff-3.9.7-CVE-2012-4564.patch b/extra/libtiff/tiff-3.9.7-CVE-2012-4564.patch new file mode 100644 index 000000000..98a6e6c44 --- /dev/null +++ b/extra/libtiff/tiff-3.9.7-CVE-2012-4564.patch @@ -0,0 +1,77 @@ +Upstream patch for CVE-2012-4564. + + +diff -Naur tiff-3.9.4.orig/tools/ppm2tiff.c tiff-3.9.4/tools/ppm2tiff.c +--- tiff-3.9.4.orig/tools/ppm2tiff.c 2010-06-08 14:50:44.000000000 -0400 ++++ tiff-3.9.4/tools/ppm2tiff.c 2012-12-10 16:16:05.154045877 -0500 +@@ -68,6 +68,17 @@ + exit(-2); + } + ++static tsize_t ++multiply_ms(tsize_t m1, tsize_t m2) ++{ ++ tsize_t bytes = m1 * m2; ++ ++ if (m1 && bytes / m1 != m2) ++ bytes = 0; ++ ++ return bytes; ++} ++ + int + main(int argc, char* argv[]) + { +@@ -85,6 +96,7 @@ + int c; + extern int optind; + extern char* optarg; ++ tsize_t scanline_size; + + if (argc < 2) { + fprintf(stderr, "%s: Too few arguments\n", argv[0]); +@@ -217,7 +229,8 @@ + } + switch (bpp) { + case 1: +- linebytes = (spp * w + (8 - 1)) / 8; ++ /* if round-up overflows, result will be zero, OK */ ++ linebytes = (multiply_ms(spp, w) + (8 - 1)) / 8; + if (rowsperstrip == (uint32) -1) { + TIFFSetField(out, TIFFTAG_ROWSPERSTRIP, h); + } else { +@@ -226,15 +239,31 @@ + } + break; + case 8: +- linebytes = spp * w; ++ linebytes = multiply_ms(spp, w); + TIFFSetField(out, TIFFTAG_ROWSPERSTRIP, + TIFFDefaultStripSize(out, rowsperstrip)); + break; + } +- if (TIFFScanlineSize(out) > linebytes) ++ if (linebytes == 0) { ++ fprintf(stderr, "%s: scanline size overflow\n", infile); ++ (void) TIFFClose(out); ++ exit(-2); ++ } ++ scanline_size = TIFFScanlineSize(out); ++ if (scanline_size == 0) { ++ /* overflow - TIFFScanlineSize already printed a message */ ++ (void) TIFFClose(out); ++ exit(-2); ++ } ++ if (scanline_size < linebytes) + buf = (unsigned char *)_TIFFmalloc(linebytes); + else +- buf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(out)); ++ buf = (unsigned char *)_TIFFmalloc(scanline_size); ++ if (buf == NULL) { ++ fprintf(stderr, "%s: Not enough memory\n", infile); ++ (void) TIFFClose(out); ++ exit(-2); ++ } + if (resolution > 0) { + TIFFSetField(out, TIFFTAG_XRESOLUTION, resolution); + TIFFSetField(out, TIFFTAG_YRESOLUTION, resolution); diff --git a/extra/libtiff/tiff-4.0.3-CVE-2013-1960.patch b/extra/libtiff/tiff-4.0.3-CVE-2013-1960.patch new file mode 100644 index 000000000..1c8dfb7bc --- /dev/null +++ b/extra/libtiff/tiff-4.0.3-CVE-2013-1960.patch @@ -0,0 +1,145 @@ +diff -Naur tiff-4.0.3.orig/tools/tiff2pdf.c tiff-4.0.3/tools/tiff2pdf.c +--- tiff-4.0.3.orig/tools/tiff2pdf.c 2012-07-25 22:56:43.000000000 -0400 ++++ tiff-4.0.3/tools/tiff2pdf.c 2013-05-02 12:04:49.057090227 -0400 +@@ -3341,33 +3341,56 @@ + uint32 height){ + + tsize_t i=0; +- uint16 ri =0; +- uint16 v_samp=1; +- uint16 h_samp=1; +- int j=0; +- +- i++; +- +- while(i<(*striplength)){ ++ ++ while (i < *striplength) { ++ tsize_t datalen; ++ uint16 ri; ++ uint16 v_samp; ++ uint16 h_samp; ++ int j; ++ int ncomp; ++ ++ /* marker header: one or more FFs */ ++ if (strip[i] != 0xff) ++ return(0); ++ i++; ++ while (i < *striplength && strip[i] == 0xff) ++ i++; ++ if (i >= *striplength) ++ return(0); ++ /* SOI is the only pre-SOS marker without a length word */ ++ if (strip[i] == 0xd8) ++ datalen = 0; ++ else { ++ if ((*striplength - i) <= 2) ++ return(0); ++ datalen = (strip[i+1] << 8) | strip[i+2]; ++ if (datalen < 2 || datalen >= (*striplength - i)) ++ return(0); ++ } + switch( strip[i] ){ +- case 0xd8: +- /* SOI - start of image */ ++ case 0xd8: /* SOI - start of image */ + _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), 2); + *bufferoffset+=2; +- i+=2; + break; +- case 0xc0: +- case 0xc1: +- case 0xc3: +- case 0xc9: +- case 0xca: ++ case 0xc0: /* SOF0 */ ++ case 0xc1: /* SOF1 */ ++ case 0xc3: /* SOF3 */ ++ case 0xc9: /* SOF9 */ ++ case 0xca: /* SOF10 */ + if(no==0){ +- _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), strip[i+2]+2); +- for(j=0;j<buffer[*bufferoffset+9];j++){ +- if( (buffer[*bufferoffset+11+(2*j)]>>4) > h_samp) +- h_samp = (buffer[*bufferoffset+11+(2*j)]>>4); +- if( (buffer[*bufferoffset+11+(2*j)] & 0x0f) > v_samp) +- v_samp = (buffer[*bufferoffset+11+(2*j)] & 0x0f); ++ _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), datalen+2); ++ ncomp = buffer[*bufferoffset+9]; ++ if (ncomp < 1 || ncomp > 4) ++ return(0); ++ v_samp=1; ++ h_samp=1; ++ for(j=0;j<ncomp;j++){ ++ uint16 samp = buffer[*bufferoffset+11+(3*j)]; ++ if( (samp>>4) > h_samp) ++ h_samp = (samp>>4); ++ if( (samp & 0x0f) > v_samp) ++ v_samp = (samp & 0x0f); + } + v_samp*=8; + h_samp*=8; +@@ -3381,45 +3404,43 @@ + (unsigned char) ((height>>8) & 0xff); + buffer[*bufferoffset+6]= + (unsigned char) (height & 0xff); +- *bufferoffset+=strip[i+2]+2; +- i+=strip[i+2]+2; +- ++ *bufferoffset+=datalen+2; ++ /* insert a DRI marker */ + buffer[(*bufferoffset)++]=0xff; + buffer[(*bufferoffset)++]=0xdd; + buffer[(*bufferoffset)++]=0x00; + buffer[(*bufferoffset)++]=0x04; + buffer[(*bufferoffset)++]=(ri >> 8) & 0xff; + buffer[(*bufferoffset)++]= ri & 0xff; +- } else { +- i+=strip[i+2]+2; + } + break; +- case 0xc4: +- case 0xdb: +- _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), strip[i+2]+2); +- *bufferoffset+=strip[i+2]+2; +- i+=strip[i+2]+2; ++ case 0xc4: /* DHT */ ++ case 0xdb: /* DQT */ ++ _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), datalen+2); ++ *bufferoffset+=datalen+2; + break; +- case 0xda: ++ case 0xda: /* SOS */ + if(no==0){ +- _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), strip[i+2]+2); +- *bufferoffset+=strip[i+2]+2; +- i+=strip[i+2]+2; ++ _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), datalen+2); ++ *bufferoffset+=datalen+2; + } else { + buffer[(*bufferoffset)++]=0xff; + buffer[(*bufferoffset)++]= + (unsigned char)(0xd0 | ((no-1)%8)); +- i+=strip[i+2]+2; + } +- _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i-1]), (*striplength)-i-1); +- *bufferoffset+=(*striplength)-i-1; ++ i += datalen + 1; ++ /* copy remainder of strip */ ++ _TIFFmemcpy(&(buffer[*bufferoffset]), &(strip[i]), *striplength - i); ++ *bufferoffset+= *striplength - i; + return(1); + default: +- i+=strip[i+2]+2; ++ /* ignore any other marker */ ++ break; + } ++ i += datalen + 1; + } +- + ++ /* failed to find SOS marker */ + return(0); + } + #endif diff --git a/extra/libtiff/tiff-4.0.3-CVE-2013-1961.patch b/extra/libtiff/tiff-4.0.3-CVE-2013-1961.patch new file mode 100644 index 000000000..0ea9b52e3 --- /dev/null +++ b/extra/libtiff/tiff-4.0.3-CVE-2013-1961.patch @@ -0,0 +1,759 @@ +diff -Naur tiff-4.0.3.orig/contrib/dbs/xtiff/xtiff.c tiff-4.0.3/contrib/dbs/xtiff/xtiff.c +--- tiff-4.0.3.orig/contrib/dbs/xtiff/xtiff.c 2010-06-08 14:55:15.000000000 -0400 ++++ tiff-4.0.3/contrib/dbs/xtiff/xtiff.c 2013-05-02 12:02:42.782287939 -0400 +@@ -512,9 +512,9 @@ + Arg args[1]; + + if (tfMultiPage) +- sprintf(buffer, "%s - page %d", fileName, tfDirectory); ++ snprintf(buffer, sizeof(buffer), "%s - page %d", fileName, tfDirectory); + else +- strcpy(buffer, fileName); ++ snprintf(buffer, sizeof(buffer), "%s", fileName); + XtSetArg(args[0], XtNlabel, buffer); + XtSetValues(labelWidget, args, 1); + } +diff -Naur tiff-4.0.3.orig/libtiff/tif_codec.c tiff-4.0.3/libtiff/tif_codec.c +--- tiff-4.0.3.orig/libtiff/tif_codec.c 2010-12-14 09:18:28.000000000 -0500 ++++ tiff-4.0.3/libtiff/tif_codec.c 2013-05-02 12:02:42.783287946 -0400 +@@ -108,7 +108,8 @@ + const TIFFCodec* c = TIFFFindCODEC(tif->tif_dir.td_compression); + char compression_code[20]; + +- sprintf( compression_code, "%d", tif->tif_dir.td_compression ); ++ snprintf(compression_code, sizeof(compression_code), "%d", ++ tif->tif_dir.td_compression ); + TIFFErrorExt(tif->tif_clientdata, tif->tif_name, + "%s compression support is not configured", + c ? c->name : compression_code ); +diff -Naur tiff-4.0.3.orig/libtiff/tif_dirinfo.c tiff-4.0.3/libtiff/tif_dirinfo.c +--- tiff-4.0.3.orig/libtiff/tif_dirinfo.c 2012-08-19 12:56:34.000000000 -0400 ++++ tiff-4.0.3/libtiff/tif_dirinfo.c 2013-05-02 12:02:42.784287953 -0400 +@@ -711,7 +711,7 @@ + * note that this name is a special sign to TIFFClose() and + * _TIFFSetupFields() to free the field + */ +- sprintf(fld->field_name, "Tag %d", (int) tag); ++ snprintf(fld->field_name, 32, "Tag %d", (int) tag); + + return fld; + } +diff -Naur tiff-4.0.3.orig/tools/rgb2ycbcr.c tiff-4.0.3/tools/rgb2ycbcr.c +--- tiff-4.0.3.orig/tools/rgb2ycbcr.c 2011-05-31 13:03:16.000000000 -0400 ++++ tiff-4.0.3/tools/rgb2ycbcr.c 2013-05-02 12:02:42.785287961 -0400 +@@ -332,7 +332,8 @@ + TIFFSetField(out, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG); + { char buf[2048]; + char *cp = strrchr(TIFFFileName(in), '/'); +- sprintf(buf, "YCbCr conversion of %s", cp ? cp+1 : TIFFFileName(in)); ++ snprintf(buf, sizeof(buf), "YCbCr conversion of %s", ++ cp ? cp+1 : TIFFFileName(in)); + TIFFSetField(out, TIFFTAG_IMAGEDESCRIPTION, buf); + } + TIFFSetField(out, TIFFTAG_SOFTWARE, TIFFGetVersion()); +diff -Naur tiff-4.0.3.orig/tools/tiff2bw.c tiff-4.0.3/tools/tiff2bw.c +--- tiff-4.0.3.orig/tools/tiff2bw.c 2010-07-08 12:10:24.000000000 -0400 ++++ tiff-4.0.3/tools/tiff2bw.c 2013-05-02 12:02:42.785287961 -0400 +@@ -205,7 +205,7 @@ + } + } + TIFFSetField(out, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISBLACK); +- sprintf(thing, "B&W version of %s", argv[optind]); ++ snprintf(thing, sizeof(thing), "B&W version of %s", argv[optind]); + TIFFSetField(out, TIFFTAG_IMAGEDESCRIPTION, thing); + TIFFSetField(out, TIFFTAG_SOFTWARE, "tiff2bw"); + outbuf = (unsigned char *)_TIFFmalloc(TIFFScanlineSize(out)); +diff -Naur tiff-4.0.3.orig/tools/tiff2pdf.c tiff-4.0.3/tools/tiff2pdf.c +--- tiff-4.0.3.orig/tools/tiff2pdf.c 2012-07-25 22:56:43.000000000 -0400 ++++ tiff-4.0.3/tools/tiff2pdf.c 2013-05-02 12:02:42.788287983 -0400 +@@ -3609,7 +3609,9 @@ + char buffer[16]; + int buflen=0; + +- buflen=sprintf(buffer, "%%PDF-%u.%u ", t2p->pdf_majorversion&0xff, t2p->pdf_minorversion&0xff); ++ buflen = snprintf(buffer, sizeof(buffer), "%%PDF-%u.%u ", ++ t2p->pdf_majorversion&0xff, ++ t2p->pdf_minorversion&0xff); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t)"\n%\342\343\317\323\n", 7); + +@@ -3623,10 +3625,10 @@ + tsize_t t2p_write_pdf_obj_start(uint32 number, TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + +- buflen=sprintf(buffer, "%lu", (unsigned long)number); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)number); + written += t2pWriteFile(output, (tdata_t) buffer, buflen ); + written += t2pWriteFile(output, (tdata_t) " 0 obj\n", 7); + +@@ -3665,13 +3667,13 @@ + written += t2pWriteFile(output, (tdata_t) "/", 1); + for (i=0;i<namelen;i++){ + if ( ((unsigned char)name[i]) < 0x21){ +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + nextchar=1; + } + if ( ((unsigned char)name[i]) > 0x7E){ +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + nextchar=1; +@@ -3679,57 +3681,57 @@ + if (nextchar==0){ + switch (name[i]){ + case 0x23: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x25: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x28: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x29: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x2F: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x3C: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x3E: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x5B: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x5D: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x7B: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; + case 0x7D: +- sprintf(buffer, "#%.2X", name[i]); ++ snprintf(buffer, sizeof(buffer), "#%.2X", name[i]); + buffer[sizeof(buffer) - 1] = '\0'; + written += t2pWriteFile(output, (tdata_t) buffer, 3); + break; +@@ -3844,14 +3846,14 @@ + tsize_t t2p_write_pdf_stream_dict(tsize_t len, uint32 number, TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + + written += t2pWriteFile(output, (tdata_t) "/Length ", 8); + if(len!=0){ + written += t2p_write_pdf_stream_length(len, output); + } else { +- buflen=sprintf(buffer, "%lu", (unsigned long)number); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)number); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R \n", 6); + } +@@ -3892,10 +3894,10 @@ + tsize_t t2p_write_pdf_stream_length(tsize_t len, TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + +- buflen=sprintf(buffer, "%lu", (unsigned long)len); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)len); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "\n", 1); + +@@ -3909,7 +3911,7 @@ + tsize_t t2p_write_pdf_catalog(T2P* t2p, TIFF* output) + { + tsize_t written = 0; +- char buffer[16]; ++ char buffer[32]; + int buflen = 0; + + written += t2pWriteFile(output, +@@ -3948,7 +3950,6 @@ + written += t2p_write_pdf_string(t2p->pdf_datetime, output); + } + written += t2pWriteFile(output, (tdata_t) "\n/Producer ", 11); +- _TIFFmemset((tdata_t)buffer, 0x00, sizeof(buffer)); + snprintf(buffer, sizeof(buffer), "libtiff / tiff2pdf - %d", TIFFLIB_VERSION); + written += t2p_write_pdf_string(buffer, output); + written += t2pWriteFile(output, (tdata_t) "\n", 1); +@@ -4089,7 +4090,7 @@ + { + tsize_t written=0; + tdir_t i=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + + int page=0; +@@ -4097,7 +4098,7 @@ + (tdata_t) "<< \n/Type /Pages \n/Kids [ ", 26); + page = t2p->pdf_pages+1; + for (i=0;i<t2p->tiff_pagecount;i++){ +- buflen=sprintf(buffer, "%d", page); ++ buflen=snprintf(buffer, sizeof(buffer), "%d", page); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); + if ( ((i+1)%8)==0 ) { +@@ -4112,8 +4113,7 @@ + } + } + written += t2pWriteFile(output, (tdata_t) "] \n/Count ", 10); +- _TIFFmemset(buffer, 0x00, 16); +- buflen=sprintf(buffer, "%d", t2p->tiff_pagecount); ++ buflen=snprintf(buffer, sizeof(buffer), "%d", t2p->tiff_pagecount); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " \n>> \n", 6); + +@@ -4128,28 +4128,28 @@ + + unsigned int i=0; + tsize_t written=0; +- char buffer[16]; ++ char buffer[256]; + int buflen=0; + + written += t2pWriteFile(output, (tdata_t) "<<\n/Type /Page \n/Parent ", 24); +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_pages); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_pages); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R \n", 6); + written += t2pWriteFile(output, (tdata_t) "/MediaBox [", 11); +- buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.x1); ++ buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.x1); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " ", 1); +- buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.y1); ++ buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.y1); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " ", 1); +- buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.x2); ++ buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.x2); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " ", 1); +- buflen=sprintf(buffer, "%.4f",t2p->pdf_mediabox.y2); ++ buflen=snprintf(buffer, sizeof(buffer), "%.4f",t2p->pdf_mediabox.y2); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "] \n", 3); + written += t2pWriteFile(output, (tdata_t) "/Contents ", 10); +- buflen=sprintf(buffer, "%lu", (unsigned long)(object + 1)); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)(object + 1)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R \n", 6); + written += t2pWriteFile(output, (tdata_t) "/Resources << \n", 15); +@@ -4157,15 +4157,13 @@ + written += t2pWriteFile(output, (tdata_t) "/XObject <<\n", 12); + for(i=0;i<t2p->tiff_tiles[t2p->pdf_page].tiles_tilecount;i++){ + written += t2pWriteFile(output, (tdata_t) "/Im", 3); +- buflen = sprintf(buffer, "%u", t2p->pdf_page+1); ++ buflen = snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_page+1); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "_", 1); +- buflen = sprintf(buffer, "%u", i+1); ++ buflen = snprintf(buffer, sizeof(buffer), "%u", i+1); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " ", 1); +- buflen = sprintf( +- buffer, +- "%lu", ++ buflen = snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)(object+3+(2*i)+t2p->tiff_pages[t2p->pdf_page].page_extra)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); +@@ -4177,12 +4175,10 @@ + } else { + written += t2pWriteFile(output, (tdata_t) "/XObject <<\n", 12); + written += t2pWriteFile(output, (tdata_t) "/Im", 3); +- buflen = sprintf(buffer, "%u", t2p->pdf_page+1); ++ buflen = snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_page+1); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " ", 1); +- buflen = sprintf( +- buffer, +- "%lu", ++ buflen = snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)(object+3+(2*i)+t2p->tiff_pages[t2p->pdf_page].page_extra)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); +@@ -4191,9 +4187,7 @@ + if(t2p->tiff_transferfunctioncount != 0) { + written += t2pWriteFile(output, (tdata_t) "/ExtGState <<", 13); + t2pWriteFile(output, (tdata_t) "/GS1 ", 5); +- buflen = sprintf( +- buffer, +- "%lu", ++ buflen = snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)(object + 3)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); +@@ -4566,7 +4560,7 @@ + if(t2p->tiff_tiles[t2p->pdf_page].tiles_tilecount>0){ + for(i=0;i<t2p->tiff_tiles[t2p->pdf_page].tiles_tilecount; i++){ + box=t2p->tiff_tiles[t2p->pdf_page].tiles_tiles[i].tile_box; +- buflen=sprintf(buffer, ++ buflen=snprintf(buffer, sizeof(buffer), + "q %s %.4f %.4f %.4f %.4f %.4f %.4f cm /Im%d_%ld Do Q\n", + t2p->tiff_transferfunctioncount?"/GS1 gs ":"", + box.mat[0], +@@ -4581,7 +4575,7 @@ + } + } else { + box=t2p->pdf_imagebox; +- buflen=sprintf(buffer, ++ buflen=snprintf(buffer, sizeof(buffer), + "q %s %.4f %.4f %.4f %.4f %.4f %.4f cm /Im%d Do Q\n", + t2p->tiff_transferfunctioncount?"/GS1 gs ":"", + box.mat[0], +@@ -4606,59 +4600,48 @@ + TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + + written += t2p_write_pdf_stream_dict(0, t2p->pdf_xrefcount+1, output); + written += t2pWriteFile(output, + (tdata_t) "/Type /XObject \n/Subtype /Image \n/Name /Im", + 42); +- buflen=sprintf(buffer, "%u", t2p->pdf_page+1); ++ buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_page+1); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + if(tile != 0){ + written += t2pWriteFile(output, (tdata_t) "_", 1); +- buflen=sprintf(buffer, "%lu", (unsigned long)tile); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)tile); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + } + written += t2pWriteFile(output, (tdata_t) "\n/Width ", 8); +- _TIFFmemset((tdata_t)buffer, 0x00, 16); + if(tile==0){ +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->tiff_width); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->tiff_width); + } else { + if(t2p_tile_is_right_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)!=0){ +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilewidth); + } else { +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilewidth); + } + } + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "\n/Height ", 9); +- _TIFFmemset((tdata_t)buffer, 0x00, 16); + if(tile==0){ +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->tiff_length); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->tiff_length); + } else { + if(t2p_tile_is_bottom_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)!=0){ +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilelength); + } else { +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilelength); + } + } + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "\n/BitsPerComponent ", 19); +- _TIFFmemset((tdata_t)buffer, 0x00, 16); +- buflen=sprintf(buffer, "%u", t2p->tiff_bitspersample); ++ buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->tiff_bitspersample); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "\n/ColorSpace ", 13); + written += t2p_write_pdf_xobject_cs(t2p, output); +@@ -4702,11 +4685,10 @@ + t2p->pdf_colorspace ^= T2P_CS_PALETTE; + written += t2p_write_pdf_xobject_cs(t2p, output); + t2p->pdf_colorspace |= T2P_CS_PALETTE; +- buflen=sprintf(buffer, "%u", (0x0001 << t2p->tiff_bitspersample)-1 ); ++ buflen=snprintf(buffer, sizeof(buffer), "%u", (0x0001 << t2p->tiff_bitspersample)-1 ); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " ", 1); +- _TIFFmemset(buffer, 0x00, 16); +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_palettecs ); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_palettecs ); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ]\n", 7); + return(written); +@@ -4740,10 +4722,10 @@ + X_W /= Y_W; + Z_W /= Y_W; + Y_W = 1.0F; +- buflen=sprintf(buffer, "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W); ++ buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "/Range ", 7); +- buflen=sprintf(buffer, "[%d %d %d %d] \n", ++ buflen=snprintf(buffer, sizeof(buffer), "[%d %d %d %d] \n", + t2p->pdf_labrange[0], + t2p->pdf_labrange[1], + t2p->pdf_labrange[2], +@@ -4759,26 +4741,26 @@ + tsize_t t2p_write_pdf_transfer(T2P* t2p, TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + + written += t2pWriteFile(output, (tdata_t) "<< /Type /ExtGState \n/TR ", 25); + if(t2p->tiff_transferfunctioncount == 1){ +- buflen=sprintf(buffer, "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)(t2p->pdf_xrefcount + 1)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); + } else { + written += t2pWriteFile(output, (tdata_t) "[ ", 2); +- buflen=sprintf(buffer, "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)(t2p->pdf_xrefcount + 1)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); +- buflen=sprintf(buffer, "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)(t2p->pdf_xrefcount + 2)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); +- buflen=sprintf(buffer, "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)(t2p->pdf_xrefcount + 3)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R ", 5); +@@ -4800,7 +4782,7 @@ + written += t2pWriteFile(output, (tdata_t) "/FunctionType 0 \n", 17); + written += t2pWriteFile(output, (tdata_t) "/Domain [0.0 1.0] \n", 19); + written += t2pWriteFile(output, (tdata_t) "/Range [0.0 1.0] \n", 18); +- buflen=sprintf(buffer, "/Size [%u] \n", (1<<t2p->tiff_bitspersample)); ++ buflen=snprintf(buffer, sizeof(buffer), "/Size [%u] \n", (1<<t2p->tiff_bitspersample)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "/BitsPerSample 16 \n", 19); + written += t2p_write_pdf_stream_dict(((tsize_t)1)<<(t2p->tiff_bitspersample+1), 0, output); +@@ -4827,7 +4809,7 @@ + tsize_t t2p_write_pdf_xobject_calcs(T2P* t2p, TIFF* output){ + + tsize_t written=0; +- char buffer[128]; ++ char buffer[256]; + int buflen=0; + + float X_W=0.0; +@@ -4895,16 +4877,16 @@ + written += t2pWriteFile(output, (tdata_t) "<< \n", 4); + if(t2p->pdf_colorspace & T2P_CS_CALGRAY){ + written += t2pWriteFile(output, (tdata_t) "/WhitePoint ", 12); +- buflen=sprintf(buffer, "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W); ++ buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "/Gamma 2.2 \n", 12); + } + if(t2p->pdf_colorspace & T2P_CS_CALRGB){ + written += t2pWriteFile(output, (tdata_t) "/WhitePoint ", 12); +- buflen=sprintf(buffer, "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W); ++ buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f] \n", X_W, Y_W, Z_W); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "/Matrix ", 8); +- buflen=sprintf(buffer, "[%.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f] \n", ++ buflen=snprintf(buffer, sizeof(buffer), "[%.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f %.4f] \n", + X_R, Y_R, Z_R, + X_G, Y_G, Z_G, + X_B, Y_B, Z_B); +@@ -4923,11 +4905,11 @@ + tsize_t t2p_write_pdf_xobject_icccs(T2P* t2p, TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + + written += t2pWriteFile(output, (tdata_t) "[/ICCBased ", 11); +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_icccs); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_icccs); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " 0 R] \n", 7); + +@@ -4937,11 +4919,11 @@ + tsize_t t2p_write_pdf_xobject_icccs_dict(T2P* t2p, TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + + written += t2pWriteFile(output, (tdata_t) "/N ", 3); +- buflen=sprintf(buffer, "%u \n", t2p->tiff_samplesperpixel); ++ buflen=snprintf(buffer, sizeof(buffer), "%u \n", t2p->tiff_samplesperpixel); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) "/Alternate ", 11); + t2p->pdf_colorspace ^= T2P_CS_ICCBASED; +@@ -5006,7 +4988,7 @@ + tsize_t t2p_write_pdf_xobject_stream_filter(ttile_t tile, T2P* t2p, TIFF* output){ + + tsize_t written=0; +- char buffer[16]; ++ char buffer[32]; + int buflen=0; + + if(t2p->pdf_compression==T2P_COMPRESS_NONE){ +@@ -5021,41 +5003,33 @@ + written += t2pWriteFile(output, (tdata_t) "<< /K -1 ", 9); + if(tile==0){ + written += t2pWriteFile(output, (tdata_t) "/Columns ", 9); +- buflen=sprintf(buffer, "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_width); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " /Rows ", 7); +- buflen=sprintf(buffer, "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_length); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + } else { + if(t2p_tile_is_right_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)==0){ + written += t2pWriteFile(output, (tdata_t) "/Columns ", 9); +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilewidth); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + } else { + written += t2pWriteFile(output, (tdata_t) "/Columns ", 9); +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilewidth); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + } + if(t2p_tile_is_bottom_edge(t2p->tiff_tiles[t2p->pdf_page], tile-1)==0){ + written += t2pWriteFile(output, (tdata_t) " /Rows ", 7); +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_tilelength); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + } else { + written += t2pWriteFile(output, (tdata_t) " /Rows ", 7); +- buflen=sprintf( +- buffer, +- "%lu", ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_tiles[t2p->pdf_page].tiles_edgetilelength); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + } +@@ -5082,21 +5056,17 @@ + if(t2p->pdf_compressionquality%100){ + written += t2pWriteFile(output, (tdata_t) "/DecodeParms ", 13); + written += t2pWriteFile(output, (tdata_t) "<< /Predictor ", 14); +- _TIFFmemset(buffer, 0x00, 16); +- buflen=sprintf(buffer, "%u", t2p->pdf_compressionquality%100); ++ buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->pdf_compressionquality%100); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " /Columns ", 10); +- _TIFFmemset(buffer, 0x00, 16); +- buflen = sprintf(buffer, "%lu", ++ buflen = snprintf(buffer, sizeof(buffer), "%lu", + (unsigned long)t2p->tiff_width); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " /Colors ", 9); +- _TIFFmemset(buffer, 0x00, 16); +- buflen=sprintf(buffer, "%u", t2p->tiff_samplesperpixel); ++ buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->tiff_samplesperpixel); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " /BitsPerComponent ", 19); +- _TIFFmemset(buffer, 0x00, 16); +- buflen=sprintf(buffer, "%u", t2p->tiff_bitspersample); ++ buflen=snprintf(buffer, sizeof(buffer), "%u", t2p->tiff_bitspersample); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) ">>\n", 3); + } +@@ -5116,16 +5086,16 @@ + tsize_t t2p_write_pdf_xreftable(T2P* t2p, TIFF* output){ + + tsize_t written=0; +- char buffer[21]; ++ char buffer[64]; + int buflen=0; + uint32 i=0; + + written += t2pWriteFile(output, (tdata_t) "xref\n0 ", 7); +- buflen=sprintf(buffer, "%lu", (unsigned long)(t2p->pdf_xrefcount + 1)); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)(t2p->pdf_xrefcount + 1)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); + written += t2pWriteFile(output, (tdata_t) " \n0000000000 65535 f \n", 22); + for (i=0;i<t2p->pdf_xrefcount;i++){ +- sprintf(buffer, "%.10lu 00000 n \n", ++ snprintf(buffer, sizeof(buffer), "%.10lu 00000 n \n", + (unsigned long)t2p->pdf_xrefoffsets[i]); + written += t2pWriteFile(output, (tdata_t) buffer, 20); + } +@@ -5149,17 +5119,14 @@ + snprintf(t2p->pdf_fileid + i, 9, "%.8X", rand()); + + written += t2pWriteFile(output, (tdata_t) "trailer\n<<\n/Size ", 17); +- buflen = sprintf(buffer, "%lu", (unsigned long)(t2p->pdf_xrefcount+1)); ++ buflen = snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)(t2p->pdf_xrefcount+1)); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); +- _TIFFmemset(buffer, 0x00, 32); + written += t2pWriteFile(output, (tdata_t) "\n/Root ", 7); +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_catalog); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_catalog); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); +- _TIFFmemset(buffer, 0x00, 32); + written += t2pWriteFile(output, (tdata_t) " 0 R \n/Info ", 12); +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_info); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_info); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); +- _TIFFmemset(buffer, 0x00, 32); + written += t2pWriteFile(output, (tdata_t) " 0 R \n/ID[<", 11); + written += t2pWriteFile(output, (tdata_t) t2p->pdf_fileid, + sizeof(t2p->pdf_fileid) - 1); +@@ -5167,9 +5134,8 @@ + written += t2pWriteFile(output, (tdata_t) t2p->pdf_fileid, + sizeof(t2p->pdf_fileid) - 1); + written += t2pWriteFile(output, (tdata_t) ">]\n>>\nstartxref\n", 16); +- buflen=sprintf(buffer, "%lu", (unsigned long)t2p->pdf_startxref); ++ buflen=snprintf(buffer, sizeof(buffer), "%lu", (unsigned long)t2p->pdf_startxref); + written += t2pWriteFile(output, (tdata_t) buffer, buflen); +- _TIFFmemset(buffer, 0x00, 32); + written += t2pWriteFile(output, (tdata_t) "\n%%EOF\n", 7); + + return(written); +diff -Naur tiff-4.0.3.orig/tools/tiff2ps.c tiff-4.0.3/tools/tiff2ps.c +--- tiff-4.0.3.orig/tools/tiff2ps.c 2011-05-31 13:10:18.000000000 -0400 ++++ tiff-4.0.3/tools/tiff2ps.c 2013-05-02 12:02:42.789287990 -0400 +@@ -1781,8 +1781,8 @@ + imageOp = "imagemask"; + + (void)strcpy(im_x, "0"); +- (void)sprintf(im_y, "%lu", (long) h); +- (void)sprintf(im_h, "%lu", (long) h); ++ (void)snprintf(im_y, sizeof(im_y), "%lu", (long) h); ++ (void)snprintf(im_h, sizeof(im_h), "%lu", (long) h); + tile_width = w; + tile_height = h; + if (TIFFIsTiled(tif)) { +@@ -1803,7 +1803,7 @@ + } + if (tile_height < h) { + fputs("/im_y 0 def\n", fd); +- (void)sprintf(im_y, "%lu im_y sub", (unsigned long) h); ++ (void)snprintf(im_y, sizeof(im_y), "%lu im_y sub", (unsigned long) h); + } + } else { + repeat_count = tf_numberstrips; +@@ -1815,7 +1815,7 @@ + fprintf(fd, "/im_h %lu def\n", + (unsigned long) tile_height); + (void)strcpy(im_h, "im_h"); +- (void)sprintf(im_y, "%lu im_y sub", (unsigned long) h); ++ (void)snprintf(im_y, sizeof(im_y), "%lu im_y sub", (unsigned long) h); + } + } + +diff -Naur tiff-4.0.3.orig/tools/tiffcrop.c tiff-4.0.3/tools/tiffcrop.c +--- tiff-4.0.3.orig/tools/tiffcrop.c 2010-12-14 09:18:28.000000000 -0500 ++++ tiff-4.0.3/tools/tiffcrop.c 2013-05-02 12:02:42.791288005 -0400 +@@ -2077,7 +2077,7 @@ + return 1; + } + +- sprintf (filenum, "-%03d%s", findex, export_ext); ++ snprintf(filenum, sizeof(filenum), "-%03d%s", findex, export_ext); + filenum[14] = '\0'; + strncat (exportname, filenum, 15); + } +@@ -2230,8 +2230,8 @@ + + /* dump.infilename is guaranteed to be NUL termimated and have 20 bytes + fewer than PATH_MAX */ +- memset (temp_filename, '\0', PATH_MAX + 1); +- sprintf (temp_filename, "%s-read-%03d.%s", dump.infilename, dump_images, ++ snprintf(temp_filename, sizeof(temp_filename), "%s-read-%03d.%s", ++ dump.infilename, dump_images, + (dump.format == DUMP_TEXT) ? "txt" : "raw"); + if ((dump.infile = fopen(temp_filename, dump.mode)) == NULL) + { +@@ -2249,8 +2249,8 @@ + + /* dump.outfilename is guaranteed to be NUL termimated and have 20 bytes + fewer than PATH_MAX */ +- memset (temp_filename, '\0', PATH_MAX + 1); +- sprintf (temp_filename, "%s-write-%03d.%s", dump.outfilename, dump_images, ++ snprintf(temp_filename, sizeof(temp_filename), "%s-write-%03d.%s", ++ dump.outfilename, dump_images, + (dump.format == DUMP_TEXT) ? "txt" : "raw"); + if ((dump.outfile = fopen(temp_filename, dump.mode)) == NULL) + { +diff -Naur tiff-4.0.3.orig/tools/tiffdither.c tiff-4.0.3/tools/tiffdither.c +--- tiff-4.0.3.orig/tools/tiffdither.c 2010-03-10 13:56:50.000000000 -0500 ++++ tiff-4.0.3/tools/tiffdither.c 2013-05-02 12:02:42.792288013 -0400 +@@ -260,7 +260,7 @@ + TIFFSetField(out, TIFFTAG_FILLORDER, fillorder); + else + CopyField(TIFFTAG_FILLORDER, shortv); +- sprintf(thing, "Dithered B&W version of %s", argv[optind]); ++ snprintf(thing, sizeof(thing), "Dithered B&W version of %s", argv[optind]); + TIFFSetField(out, TIFFTAG_IMAGEDESCRIPTION, thing); + CopyField(TIFFTAG_PHOTOMETRIC, shortv); + CopyField(TIFFTAG_ORIENTATION, shortv); diff --git a/extra/libtiff/tiff-4.0.3-libjpeg-turbo.patch b/extra/libtiff/tiff-4.0.3-libjpeg-turbo.patch new file mode 100644 index 000000000..92cff7ea4 --- /dev/null +++ b/extra/libtiff/tiff-4.0.3-libjpeg-turbo.patch @@ -0,0 +1,122 @@ +Back-port upstream patch to avoid assuming quite so much about what libjpeg +will return. Needed because libjpeg-turbo with the jpeg8 API broke the +expectations of the previous coding. + + +diff -Naur tiff-4.0.3.orig/test/raw_decode.c tiff-4.0.3/test/raw_decode.c +--- tiff-4.0.3.orig/test/raw_decode.c 2012-07-06 13:05:16.000000000 -0400 ++++ tiff-4.0.3/test/raw_decode.c 2012-12-19 13:04:37.609738276 -0500 +@@ -71,33 +71,54 @@ + return 1; + } + +-static int check_rgb_pixel( int pixel, int red, int green, int blue, unsigned char *buffer ) { ++static int check_rgb_pixel( int pixel, ++ int min_red, int max_red, ++ int min_green, int max_green, ++ int min_blue, int max_blue, ++ unsigned char *buffer ) { + unsigned char *rgb = buffer + 3 * pixel; + +- if( rgb[0] == red && rgb[1] == green && rgb[2] == blue ) { ++ if( rgb[0] >= min_red && rgb[0] <= max_red && ++ rgb[1] >= min_green && rgb[1] <= max_green && ++ rgb[2] >= min_blue && rgb[2] <= max_blue ) { + return 0; + } + + fprintf( stderr, "Pixel %d did not match expected results.\n", pixel ); +- fprintf( stderr, "Expect: %3d %3d %3d\n", red, green, blue ); +- fprintf( stderr, " Got: %3d %3d %3d\n", rgb[0], rgb[1], rgb[2] ); ++ fprintf( stderr, "Got R=%d (expected %d..%d), G=%d (expected %d..%d), B=%d (expected %d..%d)\n", ++ rgb[0], min_red, max_red, ++ rgb[1], min_green, max_green, ++ rgb[2], min_blue, max_blue ); + return 1; + } + +-static int check_rgba_pixel( int pixel, int red, int green, int blue, int alpha, uint32 *buffer ) { ++static int check_rgba_pixel( int pixel, ++ int min_red, int max_red, ++ int min_green, int max_green, ++ int min_blue, int max_blue, ++ int min_alpha, int max_alpha, ++ uint32 *buffer ) { + /* RGBA images are upside down - adjust for normal ordering */ + int adjusted_pixel = pixel % 128 + (127 - (pixel/128)) * 128; + uint32 rgba = buffer[adjusted_pixel]; + +- if( TIFFGetR(rgba) == (uint32) red && TIFFGetG(rgba) == (uint32) green && +- TIFFGetB(rgba) == (uint32) blue && TIFFGetA(rgba) == (uint32) alpha ) { ++ if( TIFFGetR(rgba) >= (uint32) min_red && ++ TIFFGetR(rgba) <= (uint32) max_red && ++ TIFFGetG(rgba) >= (uint32) min_green && ++ TIFFGetG(rgba) <= (uint32) max_green && ++ TIFFGetB(rgba) >= (uint32) min_blue && ++ TIFFGetB(rgba) <= (uint32) max_blue && ++ TIFFGetA(rgba) >= (uint32) min_alpha && ++ TIFFGetA(rgba) <= (uint32) max_alpha ) { + return 0; + } + + fprintf( stderr, "Pixel %d did not match expected results.\n", pixel ); +- fprintf( stderr, "Expect: %3d %3d %3d %3d\n", red, green, blue, alpha ); +- fprintf( stderr, " Got: %3d %3d %3d %3d\n", +- TIFFGetR(rgba), TIFFGetG(rgba), TIFFGetB(rgba), TIFFGetA(rgba) ); ++ fprintf( stderr, "Got R=%d (expected %d..%d), G=%d (expected %d..%d), B=%d (expected %d..%d), A=%d (expected %d..%d)\n", ++ TIFFGetR(rgba), min_red, max_red, ++ TIFFGetG(rgba), min_green, max_green, ++ TIFFGetB(rgba), min_blue, max_blue, ++ TIFFGetA(rgba), min_alpha, max_alpha ); + return 1; + } + +@@ -191,15 +212,17 @@ + return 1; + } + +-#if JPEG_LIB_VERSION >= 70 +- pixel_status |= check_rgb_pixel( 0, 18, 0, 41, buffer ); +- pixel_status |= check_rgb_pixel( 64, 0, 0, 0, buffer ); +- pixel_status |= check_rgb_pixel( 512, 5, 34, 196, buffer ); +-#else +- pixel_status |= check_rgb_pixel( 0, 15, 0, 18, buffer ); +- pixel_status |= check_rgb_pixel( 64, 0, 0, 2, buffer ); +- pixel_status |= check_rgb_pixel( 512, 6, 36, 182, buffer ); +-#endif ++ /* ++ * JPEG decoding is inherently inexact, so we can't test for exact ++ * pixel values. (Well, if we knew exactly which libjpeg version ++ * we were using, and with what settings, we could expect specific ++ * values ... but it's not worth the trouble to keep track of.) ++ * Hence, use ranges of expected values. The ranges may need to be ++ * widened over time as more versions of libjpeg appear. ++ */ ++ pixel_status |= check_rgb_pixel( 0, 15, 18, 0, 0, 18, 41, buffer ); ++ pixel_status |= check_rgb_pixel( 64, 0, 0, 0, 0, 0, 2, buffer ); ++ pixel_status |= check_rgb_pixel( 512, 5, 6, 34, 36, 182, 196, buffer ); + + free( buffer ); + +@@ -224,15 +247,12 @@ + * accomplish it from the YCbCr subsampled buffer ourselves in which + * case the results may be subtly different but similar. + */ +-#if JPEG_LIB_VERSION >= 70 +- pixel_status |= check_rgba_pixel( 0, 18, 0, 41, 255, rgba_buffer ); +- pixel_status |= check_rgba_pixel( 64, 0, 0, 0, 255, rgba_buffer ); +- pixel_status |= check_rgba_pixel( 512, 5, 34, 196, 255, rgba_buffer ); +-#else +- pixel_status |= check_rgba_pixel( 0, 15, 0, 18, 255, rgba_buffer ); +- pixel_status |= check_rgba_pixel( 64, 0, 0, 2, 255, rgba_buffer ); +- pixel_status |= check_rgba_pixel( 512, 6, 36, 182, 255, rgba_buffer ); +-#endif ++ pixel_status |= check_rgba_pixel( 0, 15, 18, 0, 0, 18, 41, 255, 255, ++ rgba_buffer ); ++ pixel_status |= check_rgba_pixel( 64, 0, 0, 0, 0, 0, 2, 255, 255, ++ rgba_buffer ); ++ pixel_status |= check_rgba_pixel( 512, 5, 6, 34, 36, 182, 196, 255, 255, ++ rgba_buffer ); + + free( rgba_buffer ); + TIFFClose(tif); diff --git a/extra/libtiff/tiff-4.0.3-tiff2pdf-colors.patch b/extra/libtiff/tiff-4.0.3-tiff2pdf-colors.patch new file mode 100644 index 000000000..a503444b1 --- /dev/null +++ b/extra/libtiff/tiff-4.0.3-tiff2pdf-colors.patch @@ -0,0 +1,15 @@ +http://bugs.gentoo.org/145055 + +http://build.opensuse.org/package/view_file?file=tiff-4.0.2-tiff2pdf-colors.patch&package=tiff&project=openSUSE%3AFactory + +--- tools/tiff2pdf.c ++++ tools/tiff2pdf.c +@@ -4991,7 +4991,7 @@ + + if(t2p->tiff_photometric != PHOTOMETRIC_YCBCR) { + written += t2pWriteFile(output, (tdata_t) "/DecodeParms ", 13); +- written += t2pWriteFile(output, (tdata_t) "<< /ColorTransform 0 >>\n", 24); ++ written += t2pWriteFile(output, (tdata_t) "<< /ColorTransform 1 >>\n", 24); + } + break; + #endif diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD index 728f89d57..b00864a6e 100644 --- a/extra/libtorrent-rasterbar/PKGBUILD +++ b/extra/libtorrent-rasterbar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 181124 2013-03-31 19:16:50Z stephane $ +# $Id: PKGBUILD 186514 2013-05-28 09:58:04Z ioni $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=libtorrent-rasterbar -pkgver=0.16.9 -pkgrel=2 +pkgver=0.16.10 +pkgrel=1 epoch=1 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around" url="http://www.rasterbar.com/products/libtorrent/" @@ -14,7 +14,7 @@ depends=('boost-libs' 'geoip' 'python2') makedepends=('boost') options=('!libtool' '!emptydirs') source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz) -sha1sums=('4335c8b275f041d6d34a493b21f2d7234ffca34b') +sha1sums=('8b24442132e52f8765c79b20ffdea8b33bc5aa42') build() { cd $pkgname-$pkgver diff --git a/extra/libwps/PKGBUILD b/extra/libwps/PKGBUILD index 9384d2a88..4a107f84c 100644 --- a/extra/libwps/PKGBUILD +++ b/extra/libwps/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183268 2013-04-20 07:13:33Z andyrtr $ +# $Id: PKGBUILD 186454 2013-05-26 18:05:27Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Robert McCathie <archaur at rmcc dot com dot au> pkgname=libwps -pkgver=0.2.8 +pkgver=0.2.9 pkgrel=1 pkgdesc="a Microsoft Works file word processor format import filter library" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('libwpd>=0.9.6') makedepends=('boost') options=(!libtool) source=("http://downloads.sourceforge.net/project/libwps/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2") -md5sums=('78196c097db366fac66841d032b1ddac') +md5sums=('46eb0e7f213ad61bd5dee0c494132cb0') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/libxau/PKGBUILD b/extra/libxau/PKGBUILD index be159570b..939afbe5b 100644 --- a/extra/libxau/PKGBUILD +++ b/extra/libxau/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 152650 2012-03-07 19:44:52Z andyrtr $ +# $Id: PKGBUILD 186350 2013-05-25 08:48:08Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxau -pkgver=1.0.7 -pkgrel=1.1 +pkgver=1.0.8 +pkgrel=1 pkgdesc="X11 authorisation library" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -13,7 +14,7 @@ makedepends=('pkgconfig') license=('custom') options=('!libtool') source=(${url}/releases/individual/lib/libXau-${pkgver}.tar.bz2) -sha1sums=('29c47207fd246425b906f525b2220235ce4cd0f6') +sha256sums=('fdd477320aeb5cdd67272838722d6b7d544887dfe7de46e1e7cc0c27c2bea4f2') build() { cd "${srcdir}/libXau-${pkgver}" diff --git a/extra/libxcb/PKGBUILD b/extra/libxcb/PKGBUILD index c646844a3..f2e695ec7 100644 --- a/extra/libxcb/PKGBUILD +++ b/extra/libxcb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 177994 2013-02-12 20:05:14Z andyrtr $ +# $Id: PKGBUILD 186724 2013-05-30 19:02:49Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxcb -pkgver=1.9 -pkgrel=3 +pkgver=1.9.1 +pkgrel=1 pkgdesc="X11 client-side library" arch=('i686' 'x86_64' 'mips64el') url="http://xcb.freedesktop.org/" @@ -14,8 +14,8 @@ options=('!libtool') license=('custom') source=($url/dist/$pkgname-$pkgver.tar.bz2 libxcb-1.1-no-pthread-stubs.patch) -sha1sums=('ad2fb95eeec41ba3d39502a4f7460c3b64fdf061' - 'd2df03ddf3e949c10c2c185256b0eb7fa02837ab') +sha256sums=('d44a5ff4eb0b9569e6f7183b51fdaf6f58da90e7d6bfc36b612d7263f83e362f' + '1ec7a6e7dc8639baa6c3fbc61ca8556108fb824598bd6ab5ef1fa50d48d6d310') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/libxcursor/PKGBUILD b/extra/libxcursor/PKGBUILD index e4e6e420f..c78fcd474 100644 --- a/extra/libxcursor/PKGBUILD +++ b/extra/libxcursor/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 152769 2012-03-09 16:04:11Z andyrtr $ +# $Id: PKGBUILD 186698 2013-05-30 14:35:12Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxcursor -pkgver=1.1.13 -pkgrel=1.1 +pkgver=1.1.14 +pkgrel=1 pkgdesc="X cursor management library" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -13,7 +14,7 @@ depends=('libxfixes' 'libxrender') makedepends=('xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/libXcursor-${pkgver}.tar.bz2) -sha1sums=('4e461d9e4324689ca8a84706926a8c0fe9470e47') +sha256sums=('9bc6acb21ca14da51bda5bc912c8955bc6e5e433f0ab00c5e8bef842596c33df') build() { cd "${srcdir}/libXcursor-${pkgver}" diff --git a/extra/libxext/PKGBUILD b/extra/libxext/PKGBUILD index 206746699..fc784a468 100644 --- a/extra/libxext/PKGBUILD +++ b/extra/libxext/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 152773 2012-03-09 16:10:15Z andyrtr $ +# $Id: PKGBUILD 186939 2013-06-01 09:47:26Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxext -pkgver=1.3.1 -pkgrel=1.1 +pkgver=1.3.2 +pkgrel=1 pkgdesc="X11 miscellaneous extensions library" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +13,7 @@ depends=('libx11' 'xextproto') makedepends=('xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/libXext-${pkgver}.tar.bz2") -sha1sums=('764ac472ae19a0faade193717a9e0938d3430aaa') +sha256sums=('f829075bc646cdc085fa25d98d5885d83b1759ceb355933127c257e8e50432e0') build() { cd "${srcdir}/libXext-${pkgver}" diff --git a/extra/libxfixes/PKGBUILD b/extra/libxfixes/PKGBUILD index 8801230ba..c4fc9f965 100644 --- a/extra/libxfixes/PKGBUILD +++ b/extra/libxfixes/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 151418 2012-02-26 10:42:43Z pierre $ -#Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 186580 2013-05-29 15:23:58Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxfixes -pkgver=5.0 -pkgrel=2.1 +pkgver=5.0.1 +pkgrel=1 pkgdesc="X11 miscellaneous 'fixes' extension library" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +13,7 @@ depends=('libx11' 'fixesproto>=5.0') makedepends=('xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/libXfixes-${pkgver}.tar.bz2") -sha1sums=('3e4d374e9026111a04cd669d4b3434273fc34fe0') +sha256sums=('63bec085084fa3caaee5180490dd871f1eb2020ba9e9b39a30f93693ffc34767') build() { cd "${srcdir}/libXfixes-${pkgver}" diff --git a/extra/libxinerama/PKGBUILD b/extra/libxinerama/PKGBUILD index 90e9f0e21..c5468dacf 100644 --- a/extra/libxinerama/PKGBUILD +++ b/extra/libxinerama/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 152778 2012-03-09 16:15:35Z andyrtr $ +# $Id: PKGBUILD 186881 2013-05-31 14:01:07Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxinerama -pkgver=1.1.2 -pkgrel=1.1 +pkgver=1.1.3 +pkgrel=1 pkgdesc="X11 Xinerama extension library" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -13,7 +14,7 @@ depends=('libxext' 'xineramaproto') makedepends=('xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/libXinerama-${pkgver}.tar.bz2") -sha1sums=('06a5b636305725ce09f6c3a4d5a15f2f188b5afd') +sha256sums=('7a45699f1773095a3f821e491cbd5e10c887c5a5fce5d8d3fced15c2ff7698e2') build() { cd "${srcdir}/libXinerama-${pkgver}" diff --git a/extra/libxp/PKGBUILD b/extra/libxp/PKGBUILD index d199ed32c..cbb27982b 100644 --- a/extra/libxp/PKGBUILD +++ b/extra/libxp/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 151429 2012-02-26 10:49:41Z pierre $ -#Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 186883 2013-05-31 14:02:47Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> +# Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxp -pkgver=1.0.1 -pkgrel=3.1 +pkgver=1.0.2 +pkgrel=1 pkgdesc="X11 X Print Library" arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -13,7 +14,7 @@ makedepends=('xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/libXp-${pkgver}.tar.bz2") license=('custom') -sha1sums=('9c76823c7cfcb43f097963d0c930dcc4e38807a8') +sha256sums=('952fe5b5e90abd2cf04739aef3a9b63a253cd9309ed066a82bab7ca9112fd0b5') build() { cd "${srcdir}/libXp-${pkgver}" diff --git a/extra/libxrandr/PKGBUILD b/extra/libxrandr/PKGBUILD index 0bfb732dc..1dff6ef33 100644 --- a/extra/libxrandr/PKGBUILD +++ b/extra/libxrandr/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 165113 2012-08-11 08:21:35Z andyrtr $ +# $Id: PKGBUILD 186941 2013-06-01 09:48:56Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxrandr -pkgver=1.4.0 -pkgrel=1.1 +pkgver=1.4.1 +pkgrel=1 pkgdesc="X11 RandR extension library" arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -14,7 +14,7 @@ depends=('libxext' 'libxrender' 'randrproto>=1.4.0') makedepends=('xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/libXrandr-${pkgver}.tar.bz2) -sha256sums=('033ad0ac2f012afb05268660f6d78705c85f84689f92fa7b47ce12959b15f5c3') +sha256sums=('d914a0490fd0a2ea6c3194505b5b28c56e2a277d8f4648b0275ee0ee370fb905') build() { cd "${srcdir}/libXrandr-${pkgver}" diff --git a/extra/libxres/PKGBUILD b/extra/libxres/PKGBUILD index c252f8a3f..f7bbb1b36 100644 --- a/extra/libxres/PKGBUILD +++ b/extra/libxres/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 152788 2012-03-09 16:26:13Z andyrtr $ +# $Id: PKGBUILD 186885 2013-05-31 14:04:26Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxres -pkgver=1.0.6 -pkgrel=1.1 +pkgver=1.0.7 +pkgrel=1 pkgdesc="X11 Resource extension library" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org" @@ -12,7 +13,7 @@ depends=('libxext') makedepends=('resourceproto' 'damageproto' 'compositeproto' 'scrnsaverproto' 'xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/libXres-${pkgver}.tar.bz2") -sha1sums=('31a9b7d4f7a978de36c6f1c867dced29bfe7ef0f') +sha256sums=('26899054aa87f81b17becc68e8645b240f140464cf90c42616ebb263ec5fa0e5') build() { cd "${srcdir}/libXres-${pkgver}" diff --git a/extra/libxt/PKGBUILD b/extra/libxt/PKGBUILD index 1c9bd18a0..c0b6a26ec 100644 --- a/extra/libxt/PKGBUILD +++ b/extra/libxt/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 153609 2012-03-16 17:09:01Z andyrtr $ -#Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 186887 2013-05-31 14:06:19Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> +# Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxt -pkgver=1.1.3 -pkgrel=1.1 +pkgver=1.1.4 +pkgrel=1 pkgdesc="X11 toolkit intrinsics library" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +13,7 @@ depends=('libsm' 'libx11') makedepends=('xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/libXt-${pkgver}.tar.bz2") -sha1sums=('2cef068bc4d7170e31b89b5c06aeaf4451a7699a') +sha256sums=('843a97a988f5654872682a4120486d987d853a71651515472f55519ffae2dd57') build() { cd "${srcdir}/libXt-${pkgver}" diff --git a/extra/libxtst/PKGBUILD b/extra/libxtst/PKGBUILD index b690e1d00..3921bb8f1 100644 --- a/extra/libxtst/PKGBUILD +++ b/extra/libxtst/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 152793 2012-03-09 16:30:31Z andyrtr $ +# $Id: PKGBUILD 186893 2013-05-31 14:14:53Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxtst -pkgver=1.2.1 -pkgrel=1.1 +pkgver=1.2.2 +pkgrel=1 pkgdesc="X11 Testing -- Resource extension library" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') -depends=('libxext' 'libxi' 'recordproto' 'inputproto') +depends=('libxext' 'libxi' 'recordproto' 'inputproto' 'libxfixes') makedepends=('xorg-util-macros') options=('!libtool') source=("${url}/releases/individual/lib/libXtst-${pkgver}.tar.bz2") -sha1sums=('44e19899f9938d3db5546e51c338d6f86d88cfe2') +sha256sums=('ef0a7ffd577e5f1a25b1663b375679529663a1880151beaa73e9186c8309f6d9') build() { cd "${srcdir}/libXtst-${pkgver}" diff --git a/extra/libxv/PKGBUILD b/extra/libxv/PKGBUILD index 367067e7c..fb2886ffd 100644 --- a/extra/libxv/PKGBUILD +++ b/extra/libxv/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 152795 2012-03-09 16:32:25Z andyrtr $ +# $Id: PKGBUILD 186943 2013-06-01 09:51:55Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxv -pkgver=1.0.7 -pkgrel=1.1 +pkgver=1.0.8 +pkgrel=1 pkgdesc="X11 Video extension library" arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -12,7 +13,7 @@ depends=('libxext' 'videoproto') makedepends=('pkgconfig') options=('!libtool') source=("${url}/releases/individual/lib/libXv-${pkgver}.tar.bz2") -sha1sums=('49c87e0ccb999966b7b1b4e72cb927f05e0835bd') +sha256sums=('4f00eb5347390909cea4e53a69425839d2a6a44e0e0613321d59e7e4aeaf73d7') build() { cd "${srcdir}/libXv-${pkgver}" diff --git a/extra/libxxf86dga/PKGBUILD b/extra/libxxf86dga/PKGBUILD index 5eebaf323..2af625e53 100644 --- a/extra/libxxf86dga/PKGBUILD +++ b/extra/libxxf86dga/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 152799 2012-03-09 16:36:28Z andyrtr $ +# $Id: PKGBUILD 186889 2013-05-31 14:07:54Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=libxxf86dga -pkgver=1.1.3 +pkgver=1.1.4 pkgrel=1 pkgdesc="X11 Direct Graphics Access extension library" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +14,7 @@ depends=('libxext' 'xf86dgaproto') makedepends=('xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/libXxf86dga-${pkgver}.tar.bz2) -sha1sums=('5af5d7d2f239b31035ae5b9d3e3718c833af8b56') +sha256sums=('8eecd4b6c1df9a3704c04733c2f4fa93ef469b55028af5510b25818e2456c77e') build() { cd "${srcdir}/libXxf86dga-${pkgver}" diff --git a/extra/libxxf86vm/PKGBUILD b/extra/libxxf86vm/PKGBUILD index 94dfbf043..19b6d3bb4 100644 --- a/extra/libxxf86vm/PKGBUILD +++ b/extra/libxxf86vm/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 152801 2012-03-09 16:38:21Z andyrtr $ -#Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 186891 2013-05-31 14:09:38Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> +# Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxxf86vm -pkgver=1.1.2 -pkgrel=1.1 +pkgver=1.1.3 +pkgrel=1 pkgdesc="X11 XFree86 video mode extension library" arch=('x86_64' 'i686' 'mips64el') license=('custom') @@ -12,7 +13,7 @@ depends=('libxext' 'xf86vidmodeproto') makedepends=('xorg-util-macros') options=('!libtool') source=(${url}/releases/individual/lib/libXxf86vm-${pkgver}.tar.bz2) -sha1sums=('57bbf3bb69a49f6a6dec515813394a383f85502f') +sha256sums=('da5e86c32ee2069b9e6d820e4c2e4242d4877cb155a2b2fbf2675a1480ec37b8') build() { cd "${srcdir}/libXxf86vm-${pkgver}" diff --git a/extra/licq/PKGBUILD b/extra/licq/PKGBUILD index 1e87777ff..ea2478447 100644 --- a/extra/licq/PKGBUILD +++ b/extra/licq/PKGBUILD @@ -1,32 +1,39 @@ -# $Id: PKGBUILD 181125 2013-03-31 19:16:53Z stephane $ +# $Id: PKGBUILD 186068 2013-05-20 21:46:39Z foutrelis $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> pkgname=licq pkgver=1.7.1 -pkgrel=3 -pkgdesc="Advanced graphical ICQ clone and more for Unix" +pkgrel=4 +pkgdesc="Advanced graphical ICQ clone and more for Unix" arch=('i686' 'x86_64' 'mips64el') url="http://www.licq.org" license=('GPL') depends=('boost-libs' 'gpgme' 'libxss' 'qt4') -makedepends=('cmake' 'boost') +makedepends=('cmake' 'boost' 'optipng') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/licq/licq-${pkgver}.tar.bz2) md5sums=('701e57efedc2b7ece64c3d2d2e9f9e16') +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + + mkdir {,plugins/qt4-gui/}build + + # Fix invalid PNG images to work with libpng 1.6 + # https://github.com/licq-im/licq/pull/32 + optipng -quiet -force -fix plugins/qt4-gui/share/skins/Mirabilis/*.png +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" # licq - mkdir build cd build cmake -DCMAKE_INSTALL_PREFIX=/usr .. make # qt4-gui - cd ../plugins/qt4-gui - mkdir build - cd build + cd ../plugins/qt4-gui/build cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_MODULE_PATH="${srcdir}/${pkgname}-${pkgver}/cmake" .. make } diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index b2de0df03..4d4a02319 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184020 2013-05-01 05:23:57Z giovanni $ +# $Id: PKGBUILD 186968 2013-06-01 19:28:52Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2013.04.30 +pkgver=2013.05.30 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('95533d91bd196e42fd748076dc244b09') +md5sums=('c3f776e18b3aa5f1cafc7a551fcf8059') build() { cd ${srcdir}/live diff --git a/extra/llvm-amdgpu-snapshot/PKGBUILD b/extra/llvm-amdgpu-snapshot/PKGBUILD new file mode 100644 index 000000000..cdac9521c --- /dev/null +++ b/extra/llvm-amdgpu-snapshot/PKGBUILD @@ -0,0 +1,88 @@ +# $Id: PKGBUILD 186322 2013-05-24 18:14:34Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Maintainer: Laurent Carlier <lordheavym@gmail.com> +# Contributor: Thomas Dziedzic < gostrc at gmail > +# Contributor: Roberto Alsina <ralsina@kde.org> +# Contributor: Tomas Lindquist Olsen <tomas@famolsen.dk> +# Contributor: Anders Bergh <anders@archlinuxppc.org> +# Contributor: Tomas Wilhelmsson <tomas.wilhelmsson@gmail.com> + +pkgbase=llvm-amdgpu-snapshot +pkgname=('llvm-amdgpu-snapshot' 'llvm-amdgpu-lib-snapshot') +pkgver=20130403 +pkgrel=3 +pkgdesc='Low Level Virtual Machine with AMDGPU enabled to build r600g shader llvm support' +arch=('i686' 'x86_64') +url="http://llvm.org" +license=('custom:University of Illinois/NCSA Open Source License') +makedepends=('libffi' 'python2' 'ocaml') +source=(ftp://ftp.archlinux.org/other/packages/llvm-amdgpu/llvm-amdgpu-master.${pkgver}.tar.gz) +md5sums=('4baa7b8da9eff4811952b6f855c141ca') + +prepare() { + cd "$srcdir"/llvm-c* + + sed -i 's/python$/python2/' utils/llvm-build/llvm-build +} + +build() { + cd "$srcdir"/llvm-c* + + # Apply strip option to configure + _optimized_switch="enable" + [[ $(check_option strip) == n ]] && _optimized_switch="disable" + + # Include location of libffi headers in CPPFLAGS + export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)" + + # Force the use of GCC instead of clang + PYTHON=python2 CC=gcc CXX=g++ \ + ./configure \ + --prefix=/usr \ + --libdir=/usr/lib/llvm \ + --sysconfdir=/etc \ + --enable-shared \ + --enable-libffi \ + --enable-targets=all \ + --enable-experimental-targets=R600 \ + --disable-expensive-checks \ + --with-binutils-include=/usr/include \ + --$_optimized_switch-optimized + + make REQUIRES_RTTI=1 +} + +package_llvm-amdgpu-snapshot() { + depends=("llvm-amdgpu-lib-snapshot=${pkgver}" 'python2') + conflicts=('llvm') + + cd "$srcdir"/llvm-c* + + make DESTDIR="$pkgdir" install + + # Remove useless files + rm -r "$pkgdir"/usr/{docs,lib/ocaml} + # moved to llvm-amdgpu-lib-snapshot + rm "$pkgdir"/usr/lib/libLLVM-3.2svn.so + # Fix permissions of static libs + chmod -x "$pkgdir"/usr/lib/lib*.a + + install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_llvm-amdgpu-lib-snapshot() { + depends=('libffi' 'gcc-libs') + + cd "$srcdir"/llvm-c* + + make DESTDIR="$pkgdir" install + + mv -v "$pkgdir"/usr/lib/libLLVM-3.2svn.so "$pkgdir"/ + + # Remove useless files + rm -r "$pkgdir"/usr/{bin,include,docs,lib/*} + + mv "$pkgdir"/libLLVM-3.2svn.so "$pkgdir"/usr/lib/ + + install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/extra/lm_sensors/PKGBUILD b/extra/lm_sensors/PKGBUILD index 06f0fe0a9..a68e230c5 100644 --- a/extra/lm_sensors/PKGBUILD +++ b/extra/lm_sensors/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185203 2013-05-12 06:52:48Z eric $ +# $Id: PKGBUILD 186563 2013-05-29 04:09:51Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=lm_sensors -pkgver=3.3.3 -pkgrel=3 +pkgver=3.3.4 +pkgrel=1 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring" arch=('i686' 'x86_64' 'mips64el') url="http://www.lm-sensors.org/" @@ -16,7 +16,7 @@ options=('!emptydirs') source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2{,.sig} \ healthd healthd.conf fancontrol.service sensord.service healthd.service \ linux_3.0.patch lm_sensors-fancontrol.patch) -sha1sums=('b55c06f425993e42f13553f204066c446da36fd3' +sha1sums=('4e62538ca99973ff505f2eeb5b841bb402e996d8' 'SKIP' '1c91ae403d3cd02b6177ad1f1b2f2c3a7a3257f5' '6c4e8a2d89dd2fd3ca2f0f4f3b1230111e01b0fc' @@ -24,7 +24,7 @@ sha1sums=('b55c06f425993e42f13553f204066c446da36fd3' 'cea1ff07374a784cc4be1d28dc6c80641fcae99d' 'd72ec328e9303acef86342483b6f8537de6117d9' '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c' - 'd3e419b4019451fb039ae3d3b8e0ec55121b9f17') + 'b0bc977348610d6a008d75a43f65800251c4c9f7') prepare() { cd ${pkgname}-${pkgver} diff --git a/extra/lm_sensors/lm_sensors-fancontrol.patch b/extra/lm_sensors/lm_sensors-fancontrol.patch index e58891695..c42d7b870 100644 --- a/extra/lm_sensors/lm_sensors-fancontrol.patch +++ b/extra/lm_sensors/lm_sensors-fancontrol.patch @@ -4,8 +4,8 @@ cd $DIR # Check for configuration change --if [ -z "$DEVPATH" -o -z "$DEVNAME" ] -+if [ -z "$DEVPATH" ] || [ -z "$DEVNAME" ] +-if [ "$DIR" != "/" ] && [ -z "$DEVPATH" -o -z "$DEVNAME" ] ++if [[ "$DIR" != "/" && ( -z "$DEVPATH" || -z "$DEVNAME" ) ]] then echo "Configuration is too old, please run pwmconfig again" >&2 exit 1 diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD index 2a10ef5b1..81e62cbbc 100644 --- a/extra/mariadb/PKGBUILD +++ b/extra/mariadb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180833 2013-03-26 15:59:12Z bpiotrowski $ +# $Id: PKGBUILD 186282 2013-05-23 19:15:33Z bpiotrowski $ # Maintainer: BartÅ‚omiej Piotrowski <nospam@bpiotrowski.pl> pkgbase=mariadb pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb') -pkgver=5.5.30 -pkgrel=2 +pkgver=5.5.31 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url='http://mariadb.org/' @@ -14,7 +14,7 @@ source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$pkgver/kvm-tarbake-jaunt mariadb.service mariadb-post.sh mariadb-tmpfile.conf) -sha256sums=('64dba5f1819f1d4ebf7ed31d74e4106c981a24b88259995deba3734fb7c4635f' +sha256sums=('70b28e5dca7e9213fd092a669f74a537e7c88e0f670e32628907ce3ebcef2d28' 'a6cf5446159fff16598d0d787dd3a3c30a53a656a5f876ddb608bc60e234d334' '368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd' '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd') @@ -106,7 +106,7 @@ package_mariadb() { pkgdesc='Fast SQL database server, drop-in replacement for MySQL' backup=('etc/mysql/my.cnf') install=mariadb.install - depends=('mariadb-clients') + depends=('mariadb-clients' 'inetutils') conflicts=('mysql' 'mytop') provides=("mysql=$pkgver" 'mytop') optdepends=('perl-dbd-mysql: mytop dependency' diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index 7341c2243..f8407e622 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184144 2013-05-02 17:00:09Z giovanni $ +# $Id: PKGBUILD 185603 2013-05-15 19:30:15Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=mercurial -pkgver=2.6 +pkgver=2.6.1 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" 'mercurial.profile') -md5sums=('d012d8bb5f85369d3b6a630a80667170' +md5sums=('db34e6085b71c33ba250e689b1535101' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index 83648b26f..013152b1c 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184295 2013-05-05 17:57:33Z bpiotrowski $ +# $Id: PKGBUILD 186351 2013-05-25 08:49:44Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=mesa pkgname=('mesa' 'mesa-libgl') -pkgver=9.1.2 +pkgver=9.1.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage' @@ -19,7 +19,7 @@ options=('!libtool') source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2 #ftp://ftp.freedesktop.org/pub/mesa/9.1/MesaLib-9.1-rc2.tar.bz2 # for RC testing LICENSE) -md5sums=('df2aab86ff4a510ce5b0d074caa0a59f' +md5sums=('952ccd03547ed72333b64e1746cf8ada' '5c65a0fe315dd347e09b1f2826a1df5a') build() { @@ -43,6 +43,7 @@ build() { --with-dri-driverdir=/usr/lib/xorg/modules/dri \ --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast \ --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \ + --with-llvm-shared-libs \ --enable-gallium-llvm \ --enable-egl \ --enable-gallium-egl \ @@ -70,7 +71,7 @@ build() { package_ati-dri() { pkgdesc="Mesa drivers for AMD/ATI Radeon" - depends=("mesa-libgl=${pkgver}") + depends=("mesa-libgl=${pkgver}" 'llvm-amdgpu-lib-snapshot') conflicts=('xf86-video-ati<6.9.0-6') install -m755 -d ${pkgdir}/usr/lib/vdpau/ @@ -99,7 +100,7 @@ package_intel-dri() { package_nouveau-dri() { pkgdesc="Mesa drivers for Nouveau" - depends=("mesa-libgl=${pkgver}") + depends=("mesa-libgl=${pkgver}" 'llvm-amdgpu-lib-snapshot') install -m755 -d ${pkgdir}/usr/lib/vdpau/ mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_nouveau.* ${pkgdir}/usr/lib/vdpau/ @@ -116,7 +117,7 @@ package_nouveau-dri() { package_svga-dri() { pkgdesc="Gallium3D VMware guest GL driver" - depends=('gcc-libs' 'libdrm' 'expat' 'libffi') + depends=('gcc-libs' 'libdrm' 'expat' 'libffi' 'llvm-amdgpu-lib-snapshot') install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/vmwgfx_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/ @@ -135,7 +136,7 @@ package_mesa() { provides=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel') conflicts=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel') replaces=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel') - [ "$CARCH" != "mips64el" ] && depends+=('libvdpau') + [ "$CARCH" != "mips64el" ] && depends+=('libvdpau' 'llvm-amdgpu-lib-snapshot') mv -v ${srcdir}/fakeinstall/* ${pkgdir} # rename libgl.so to not conflict with blobs - may break gl.pc ? diff --git a/extra/metalog/PKGBUILD b/extra/metalog/PKGBUILD index fd87ef8c8..efdeaf7fc 100644 --- a/extra/metalog/PKGBUILD +++ b/extra/metalog/PKGBUILD @@ -1,36 +1,30 @@ -# $Id: PKGBUILD 167973 2012-10-04 13:24:41Z juergen $ +# $Id: PKGBUILD 186745 2013-05-31 01:44:03Z eric $ # Maintainer: juergen <juergen@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=metalog pkgver=3.0 -pkgrel=0 -pkgdesc="Metalog is a modern replacement for syslogd and klogd" +pkgrel=2 +pkgdesc="A modern replacement for syslogd and klogd" url="http://metalog.sourceforge.net" license=('GPL') arch=('i686' 'x86_64' 'mips64el') depends=('pcre') provides=('logger') -backup=('etc/metalog.conf' 'etc/conf.d/metalog') -source=("http://sourceforge.net/projects/metalog/files/metalog-3.tar.xz/download" 'metalog' 'metalog.confd' 'metalog.service') +backup=('etc/metalog.conf') +source=("http://sourceforge.net/projects/metalog/files/metalog-3.tar.xz/download" 'metalog.service') md5sums=('6fe404e49764fa24108fd090417bacb5' - '9e73301a7f0be291749ee30638527cb9' - '86bccd5a02996921e29eff8a0394d11f' - 'f005e6970c25bfdaf0596791e9135f98') + '42b8138e8868ecdf0616f73efca7b339') build() { - cd $srcdir/$pkgname-3 - ./configure --prefix=/usr --sysconfdir=/etc + cd $pkgname-3 + ./configure --prefix=/usr --sysconfdir=/etc --sbin=/usr/bin make } package() { - cd $srcdir/$pkgname-3 - make DESTDIR=$pkgdir install - install -D -m755 $srcdir/metalog $pkgdir/etc/rc.d/metalog - install -D -m644 $srcdir/metalog.confd $pkgdir/etc/conf.d/metalog - install -D -m644 metalog.conf $pkgdir/etc/metalog.conf - - install -d "${pkgdir}"/usr/lib/systemd/system - install -Dm644 "${srcdir}"/metalog.service "${pkgdir}"/usr/lib/systemd/system/ + cd $pkgname-3 + make DESTDIR="$pkgdir" install + install -D -m644 metalog.conf "$pkgdir/etc/metalog.conf" + install -Dm644 "${srcdir}"/metalog.service "${pkgdir}"/usr/lib/systemd/system/metalog.service } diff --git a/extra/metalog/metalog b/extra/metalog/metalog deleted file mode 100644 index 211002401..000000000 --- a/extra/metalog/metalog +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -# source application-specific settings -[ -f /etc/conf.d/metalog ] && . /etc/conf.d/metalog - -. /etc/rc.conf -. /etc/rc.d/functions - -if [ -f /var/run/metalog.pid ]; then - PID=$(cat /var/run/metalog.pid) 2>/dev/null -fi - -case "$1" in - start) - stat_busy "Starting Metalog" - [ -z "$PID" ] && /usr/sbin/metalog -B $METALOG_OPTS 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon metalog - stat_done - fi - ;; - stop) - stat_busy "Stopping Metalog" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon metalog - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/metalog/metalog.confd b/extra/metalog/metalog.confd deleted file mode 100644 index 3d76ffab3..000000000 --- a/extra/metalog/metalog.confd +++ /dev/null @@ -1,8 +0,0 @@ -# -# Parameters to be passed to metalog -# - -# NOTE: Since v.0.7, metalog disables buffering by default. -# Add '-a' if you want buffering. - -METALOG_OPTS="" diff --git a/extra/metalog/metalog.service b/extra/metalog/metalog.service index 5982c8804..82a81ea98 100644 --- a/extra/metalog/metalog.service +++ b/extra/metalog/metalog.service @@ -2,7 +2,7 @@ Description=System Logger Daemon [Service] -ExecStart=/usr/sbin/metalog +ExecStart=/usr/bin/metalog [Install] WantedBy=multi-user.target diff --git a/extra/misdnuser/PKGBUILD b/extra/misdnuser/PKGBUILD new file mode 100644 index 000000000..ed7751ba4 --- /dev/null +++ b/extra/misdnuser/PKGBUILD @@ -0,0 +1,55 @@ +# $Id: PKGBUILD 186032 2013-05-20 17:17:10Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> + +pkgname=misdnuser +pkgver=2.0.17_20120917 +pkgrel=2 +pkgdesc="Tools and library for mISDN" +arch=('i686' 'x86_64') +url="http://www.misdn.org" +license=('GPL') +depends=('isdn4k-utils' 'spandsp') +backup=('etc/capi20.conf') +options=('!makeflags' '!libtool' '!strip') +source=(ftp://ftp.archlinux.org/other/misdnuser/${pkgname}-${pkgver}.tar.gz + mISDNcapid.service + c2faxrecv-mISDNcapid.service + mISDNcapid.conf + fix-compile-gcc48.patch) + +prepare() { + cd ${srcdir}/${pkgname}-${pkgver} + # fix gcc48 compile error + patch -Np1 -i ${srcdir}/fix-compile-gcc48.patch +} + +build() { + # only enable for debugging! + #export CFLAGS+=" -g -O0" + #export CXXFLAGS+=" -g -O0" + cd ${srcdir}/${pkgname}-${pkgver} + make + ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --enable-capi --enable-softdsp --with-mISDN_group=uucp + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + # fix udev rule + mkdir -p ${pkgdir}/usr/lib/udev/rules.d + mv ${pkgdir}/etc/udev/rules.d/45-misdn.rules ${pkgdir}/usr/lib/udev/rules.d + rm -r ${pkgdir}/etc/udev/ + # add systemd files + install -D -m644 ${srcdir}/mISDNcapid.service ${pkgdir}/usr/lib/systemd/system/mISDNcapid.service + # mISDNcapid: + # tends to crash on avmfritz card, add an extra systemd file for + # restarting the services until segfaults are fixed! + 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=('4cdb52f2c0ff1a1426573ac5ef09e9f8' + 'bfd47480a54b41394ba5cc3f53587130' + '32ead7f063e007c784aa883d441f33c2' + '42c3b46880a68c3883ee1ed00af34b45' + 'b291e9a04378decec33c420a62a5a4b7') diff --git a/extra/misdnuser/c2faxrecv-mISDNcapid.service b/extra/misdnuser/c2faxrecv-mISDNcapid.service new file mode 100644 index 000000000..7a98ca435 --- /dev/null +++ b/extra/misdnuser/c2faxrecv-mISDNcapid.service @@ -0,0 +1,11 @@ +[Unit] +Description=mISDN CAPI to fax receive +Requires=faxq.service mISDNcapid.service +After=faxq.service mISDNcapid.service + +[Service] +ExecStart=/usr/bin/c2faxrecv +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/extra/misdnuser/fix-compile-gcc48.patch b/extra/misdnuser/fix-compile-gcc48.patch new file mode 100644 index 000000000..61f52d22e --- /dev/null +++ b/extra/misdnuser/fix-compile-gcc48.patch @@ -0,0 +1,15 @@ +X-Git-Url: http://misdn.eu/?p=projects%2FmISDNuser.git;a=blobdiff_plain;f=lib%2Flayer3%2Fq931.c;h=75716fe121a48a3c62fb785af85d856a688889bf;hp=705caf3e167bb5c50828c464151fcfe49af89e64;hb=ec4ac2763f737dc9100f9f4f9e91f4d7064a77b2;hpb=1dc4c24d27ed9c46e2fdbf7fb4b178e549a58e8d + +diff --git a/lib/layer3/q931.c b/lib/layer3/q931.c +index 705caf3..75716fe 100644 +--- a/lib/layer3/q931.c ++++ b/lib/layer3/q931.c +@@ -357,7 +357,7 @@ mi_encode_hlc(struct l3_msg *l3m, int hlc, int ehlc) + ie[1] = hlc & 0x7f; + + if (ehlc < 0) +- ie[1] | 0x80; ++ ie[1] |= 0x80; + else { + l = 3; + ie[2] = 0x80 | (ehlc & 0x7f); diff --git a/extra/misdnuser/mISDNcapid.conf b/extra/misdnuser/mISDNcapid.conf new file mode 100644 index 000000000..7607e262d --- /dev/null +++ b/extra/misdnuser/mISDNcapid.conf @@ -0,0 +1 @@ +D /var/run/mISDNcapid 0755 root root - diff --git a/extra/misdnuser/mISDNcapid.service b/extra/misdnuser/mISDNcapid.service new file mode 100644 index 000000000..53871dd95 --- /dev/null +++ b/extra/misdnuser/mISDNcapid.service @@ -0,0 +1,11 @@ +[Unit] +Description=mISDN CAPI daemon + +[Service] +Type=forking +ExecStart=/usr/bin/mISDNcapid +ExecReload=/bin/kill -HUP $MAINPID +Restart=on-abort + +[Install] +WantedBy=multi-user.target diff --git a/extra/mod_perl/PKGBUILD b/extra/mod_perl/PKGBUILD index d35ca0723..65437b6f4 100644 --- a/extra/mod_perl/PKGBUILD +++ b/extra/mod_perl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160911 2012-06-06 19:20:20Z foutrelis $ +# $Id: PKGBUILD 186389 2013-05-26 09:24:48Z bluewind $ # Maintainer: # Contributor: Firmicus <francois.archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=mod_perl -pkgver=2.0.7 +pkgver=2.0.8 pkgrel=1 pkgdesc="Apache module that embeds the Perl interpreter within the server" arch=('i686' 'x86_64' 'mips64el') @@ -12,12 +12,12 @@ url="http://perl.apache.org/" license=('APACHE') depends=('perl' 'apache' 'db' 'apr-util' 'perl-linux-pid') options=('!emptydirs') -source=(http://perl.apache.org/dist/$pkgname-$pkgver.tar.gz +source=(http://apache.org/dist/perl/$pkgname-$pkgver.tar.gz mod_perl-2.0.6-nolfs.patch) -sha256sums=('53414be9db843054b927f23a35edb7b82d99e32e031b3cd81d5ff2473f51e3c6' +sha256sums=('35dc1b7a40a90a395ce88bba2df84f22289975f34d1757de6d715560c20a20e6' '5d1b6a051d847108b23b5dc06ea5885c37dd81d3a9156b69d179d95b5cf92f08') -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" # Patch from openSUSE to fix segfaults on i686 (FS#25008): @@ -25,6 +25,10 @@ build() { # FILE_OFFSET_BITS=64 because the conflict isn't real and causes the perl # structures to be invalid if only the apache flags are used patch -Np1 -i "$srcdir/mod_perl-2.0.6-nolfs.patch" +} + +build() { + cd "$srcdir/$pkgname-$pkgver" # install module in vendor directories. perl Makefile.PL INSTALLDIRS=vendor MP_APXS=/usr/sbin/apxs diff --git a/extra/mono/PKGBUILD b/extra/mono/PKGBUILD index 4830eb61f..1a1200a8e 100644 --- a/extra/mono/PKGBUILD +++ b/extra/mono/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184799 2013-05-08 17:55:32Z bpiotrowski $ +# $Id: PKGBUILD 186332 2013-05-24 20:45:34Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Brice Carpentier <brice@dlfp.org> pkgname=mono -pkgver=2.10.9 +pkgver=3.0.7 pkgrel=1 pkgdesc="Free implementation of the .NET platform including runtime and compiler" arch=(i686 x86_64) @@ -16,14 +16,13 @@ provides=('monodoc') conflicts=('monodoc') source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 mono.binfmt.d) -md5sums=('bbbff9d3d0c36b904437ada36a27eb9e' +md5sums=('76ebec9c97347aac13d9f28fc58b347d' 'b9ef8a65fea497acf176cca16c1e2402') build() { cd "${srcdir}"/${pkgname}-${pkgver} # build mono - ./configure --prefix=/usr --sysconfdir=/etc \ - --with-libgdiplus=installed + ./configure --prefix=/usr --sysconfdir=/etc make # build jay diff --git a/extra/monodevelop/PKGBUILD b/extra/monodevelop/PKGBUILD index 7aaeb4c1f..e1eba8ade 100644 --- a/extra/monodevelop/PKGBUILD +++ b/extra/monodevelop/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 178505 2013-02-24 19:40:36Z daniel $ +# $Id: PKGBUILD 186330 2013-05-24 20:45:12Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Timm Preetz <timm@preetz.us> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=monodevelop -pkgver=4.0 +pkgver=4.0.8 pkgrel=1 pkgdesc="An IDE primarily designed for C# and other .NET languages" @@ -14,12 +14,12 @@ arch=('i686' 'x86_64') url="http://www.monodevelop.com" license=('GPL') depends=('mono>=2.10.8' 'mono-addins>=0.6.2' 'gnome-sharp' 'desktop-file-utils' 'hicolor-icon-theme') -makedepends=('rsync') +makedepends=('rsync' 'git') options=(!makeflags) install=monodevelop.install -source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 +source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.gz monodevelop-core-addins.pc.in.patch) -md5sums=('811e09cbddc262d138fed1e119a52df7' +md5sums=('84a03fabcd3399807c7bf2c2027c87bf' '8466d032735130e37d4091a793a7966c') build() { @@ -30,13 +30,16 @@ build() { # fix location for MonoDevelop.Gettext.dll - breaks gdb build # patch -Np0 -i ${srcdir}/monodevelop-core-addins.pc.in.patch - ./configure --prefix=/usr --disable-update-mimedb --disable-update-desktopdb + ./configure --prefix=/usr --profile stable LD_PRELOAD="" make } package() { cd $srcdir/$pkgname-$pkgver + LD_PRELOAD="" make DESTDIR=$pkgdir install + # delete conflicting files + find $pkgdir/usr/share/mime/ -type f -exec rm {} \; rm -r $MONO_SHARED_DIR } diff --git a/extra/mpg123/PKGBUILD b/extra/mpg123/PKGBUILD index 0671606be..15855b9e2 100644 --- a/extra/mpg123/PKGBUILD +++ b/extra/mpg123/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181379 2013-04-04 01:34:05Z eric $ +# $Id: PKGBUILD 186257 2013-05-23 01:22:39Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=mpg123 -pkgver=1.15.3 +pkgver=1.15.4 pkgrel=1 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3" arch=('i686' 'x86_64' 'mips64el') @@ -13,22 +13,20 @@ makedepends=('sdl' 'jack' 'libpulse') optdepends=('sdl: for sdl audio support' 'jack: for jack audio support' 'libpulse: for pulse audio support') -conflicts=('mpg321') -provides=('mpg321') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}) -sha1sums=('915eb8782106a62b103a1171364571d69cb64e25' - '90614c85da88f965d9aa3165c111b6eeba711903') +sha1sums=('f39d927bcf7abf4f9d857f10cd97c8ceccaffbfa' + 'SKIP') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --enable-int-quality --with-module-suffix=.so \ --with-audio="alsa oss sdl jack pulse" make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -m755 scripts/conplay "${pkgdir}/usr/bin/conplay" } diff --git a/extra/msmtp/PKGBUILD b/extra/msmtp/PKGBUILD index 8df27fa48..8b2870dc0 100644 --- a/extra/msmtp/PKGBUILD +++ b/extra/msmtp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185211 2013-05-12 07:33:11Z eric $ +# $Id: PKGBUILD 185614 2013-05-16 03:14:17Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=msmtp pkgname=('msmtp' 'msmtp-mta') pkgver=1.4.31 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') license=('GPL3') url="http://msmtp.sourceforge.net" @@ -48,6 +48,7 @@ package_msmtp-mta() { provides=('smtp-forwarder') conflicts=('smtp-forwarder') - install -d "${pkgdir}/usr/bin" + install -d "${pkgdir}"/usr/{s,}bin ln -s msmtp "${pkgdir}/usr/bin/sendmail" + ln -s ../bin/msmtp "${pkgdir}/usr/sbin/sendmail" } diff --git a/extra/mtr/PKGBUILD b/extra/mtr/PKGBUILD index c1af1911b..dd19ab8f1 100644 --- a/extra/mtr/PKGBUILD +++ b/extra/mtr/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 182370 2013-04-09 18:07:19Z ioni $ +# $Id: PKGBUILD 186756 2013-05-31 04:03:04Z foutrelis $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgbase=mtr pkgname=(mtr mtr-gtk) pkgver=0.84 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('GPL') makedepends=('ncurses' 'gtk2') @@ -16,11 +16,11 @@ md5sums=('df61096ae1b18b27f915feeb907ae48c') build() { cp -r $pkgbase-$pkgver $pkgbase-cli cd mtr-cli - ./configure --prefix=/usr --without-gtk + ./configure --prefix=/usr --without-gtk --sbindir=/usr/bin make cd "$srcdir/$pkgbase-$pkgver" - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make } diff --git a/extra/mutt/PKGBUILD b/extra/mutt/PKGBUILD index c83d61c7f..86a7acdba 100644 --- a/extra/mutt/PKGBUILD +++ b/extra/mutt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 167418 2012-10-02 02:04:08Z bisson $ +# $Id: PKGBUILD 185574 2013-05-15 08:05:34Z bpiotrowski $ # Contributor: tobias [tobias [at] archlinux.org] # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=mutt pkgver=1.5.21 -pkgrel=8.1 +pkgrel=9 pkgdesc='Small but very powerful text-based mail client' url='http://www.mutt.org/' license=('GPL') diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD index 1c9518299..6df2b9bed 100644 --- a/extra/mutter/PKGBUILD +++ b/extra/mutter/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 183445 2013-04-21 22:11:45Z heftig $ +# $Id: PKGBUILD 186664 2013-05-30 12:25:27Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Michael Kanis <mkanis_at_gmx_dot_de> pkgname=mutter -pkgver=3.8.1 -pkgrel=1 +pkgver=3.8.2 +pkgrel=2 pkgdesc="A window manager for GNOME" arch=(i686 x86_64 mips64el) license=('GPL') @@ -16,7 +16,7 @@ groups=('gnome') options=('!libtool' '!emptydirs') install=mutter.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('a41a992620e7e51b6a34709db26a215e86f03927e828b4db03e9111d925ef52f') +sha256sums=('2dddb1f699a94e9d294c36127e0642f5afa1fa8853cb1b47187ece16457fce65') build() { cd "$pkgname-$pkgver" @@ -24,6 +24,10 @@ build() { --libexecdir=/usr/lib/mutter \ --localstatedir=/var --disable-static \ --disable-schemas-compile --enable-compile-warnings=minimum + + #https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } diff --git a/extra/net-snmp/PKGBUILD b/extra/net-snmp/PKGBUILD index 4b376fdc5..039094166 100644 --- a/extra/net-snmp/PKGBUILD +++ b/extra/net-snmp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 182744 2013-04-14 04:22:21Z eric $ +# $Id: PKGBUILD 186390 2013-05-26 09:24:49Z bluewind $ # Maintainer: # Contributor: Dale Blount <dale@archlinux.org> pkgname=net-snmp pkgver=5.7.2 -pkgrel=4 +pkgrel=7 pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6" arch=('i686' 'x86_64' 'mips64el') url="http://www.net-snmp.org/" @@ -16,10 +16,11 @@ optdepends=('perl-term-readkey: for snmpcheck application' 'python2: for the python modules') options=('!libtool' '!emptydirs' '!makeflags') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc} - snmpd.service libnl32.patch) + snmpd.service snmptrapd.service libnl32.patch) sha1sums=('c493027907f32400648244d81117a126aecd27ee' 'SKIP' - '2ad00f89ecb8ec97adfbae7adfbfa3499319e5d7' + '84e32c54d32e6b608747054e04a3ddfe6d6638cc' + '0244e91c7baa0abebfb5c0560e8ce04c966c5992' '74a9848b95f63378eb1753fc309d2b74de5afb0f') prepare() { @@ -32,7 +33,7 @@ prepare() { build() { cd ${pkgname}-${pkgver} PYTHONPROG=/usr/bin/python2 ./configure --prefix=/usr \ - --sysconfdir=/etc \ + --sysconfdir=/etc --sbindir=/usr/bin \ --mandir=/usr/share/man \ --enable-ucd-snmp-compatibility \ --enable-ipv6 \ @@ -52,5 +53,6 @@ package() { sed -i -e "s:install --basedir=\$\$dir:install --basedir=\$\$dir --root=${pkgdir}:" Makefile make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor install install -D -m644 "${srcdir}/snmpd.service" "${pkgdir}/usr/lib/systemd/system/snmpd.service" + install -D -m644 "${srcdir}/snmptrapd.service" "${pkgdir}/usr/lib/systemd/system/snmptrapd.service" install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/net-snmp/snmpd.service b/extra/net-snmp/snmpd.service index 3e5dbc534..e9f713cab 100644 --- a/extra/net-snmp/snmpd.service +++ b/extra/net-snmp/snmpd.service @@ -5,7 +5,7 @@ After=syslog.target network.target [Service] Type=forking PIDFile=/run/snmpd.pid -ExecStart=/usr/sbin/snmpd -p /run/snmpd.pid +ExecStart=/usr/bin/snmpd -p /run/snmpd.pid ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/extra/net-snmp/snmptrapd.service b/extra/net-snmp/snmptrapd.service new file mode 100644 index 000000000..50eee7ac8 --- /dev/null +++ b/extra/net-snmp/snmptrapd.service @@ -0,0 +1,12 @@ +[Unit] +Description=Simple Network Management Protocol (SNMP) TRAP Daemon +After=syslog.target network.target + +[Service] +Type=forking +PIDFile=/run/snmptrapd.pid +ExecStart=/usr/bin/snmptrapd -p /run/snmptrapd.pid +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/extra/netkit-bsd-finger/PKGBUILD b/extra/netkit-bsd-finger/PKGBUILD index 8b42c46c5..ae56aeda5 100644 --- a/extra/netkit-bsd-finger/PKGBUILD +++ b/extra/netkit-bsd-finger/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 150721 2012-02-21 07:25:55Z andrea $ +# $Id: PKGBUILD 185297 2013-05-13 03:44:34Z eric $ # Maintainer: # Contributor: dorphell <dorphell@archlinux.org> pkgname=netkit-bsd-finger pkgver=0.17 -pkgrel=7.1 +pkgrel=8 pkgdesc="BSD-finger ported to Linux" arch=('i686' 'x86_64' 'mips64el') url='ftp://ftp.uk.linux.org/pub/linux/Networking/netkit' @@ -15,27 +15,29 @@ source=("ftp://ftp.archlinux.org/other/${pkgname}/bsd-finger-${pkgver}.tar.gz" 'finger.xinetd' 'LICENSE' 'fix-manpage-typo.patch') md5sums=('52bf281aac8814bf56cdc92f7661ee75' - 'a8682004dc8dee356065162bde892b47' + 'a71333c0f3a6ac2ca9e37a6425abfc52' '5fc568418a0379fc3a358ed1c2523b44' '9c4ad79a8df81ade6d1938955f1debbd') -build() { - cd ${srcdir}/bsd-finger-${pkgver} - +prepare() { + cd bsd-finger-${pkgver} # FS#28232 patch -p1 -i "${srcdir}"/fix-manpage-typo.patch - - ./configure --prefix=/usr sed -i 's@include <sys/time.h>@include <time.h>@' finger/lprint.c sed -i 's@include <sys/time.h>@include <time.h>@' finger/sprint.c +} + +build() { + cd bsd-finger-${pkgver} + ./configure --prefix=/usr make } package() { - cd ${srcdir}/bsd-finger-${pkgver} - install -d ${pkgdir}/usr/{bin,sbin} ${pkgdir}/usr/share/man/{man1,man8} - make INSTALLROOT=${pkgdir} MANDIR=/usr/share/man install + cd bsd-finger-${pkgver} + install -d "${pkgdir}"/usr/{bin,share/man/{man1,man8}} + make INSTALLROOT="${pkgdir}" SBINDIR=/usr/bin MANDIR=/usr/share/man install - install -D -m644 ${srcdir}/finger.xinetd ${pkgdir}/etc/xinetd.d/finger - install -D -m644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + install -D -m644 "${srcdir}/finger.xinetd" "${pkgdir}/etc/xinetd.d/finger" + install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/netkit-bsd-finger/finger.xinetd b/extra/netkit-bsd-finger/finger.xinetd index cc9a8b15d..b2c5fce44 100644 --- a/extra/netkit-bsd-finger/finger.xinetd +++ b/extra/netkit-bsd-finger/finger.xinetd @@ -3,6 +3,6 @@ service finger socket_type = stream wait = no user = nobody - server = /usr/sbin/in.fingerd + server = /usr/bin/in.fingerd disable = yes } diff --git a/extra/nettle/PKGBUILD b/extra/nettle/PKGBUILD index 4ee5fc2bf..f8fad946a 100644 --- a/extra/nettle/PKGBUILD +++ b/extra/nettle/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183668 2013-04-26 12:45:09Z andyrtr $ +# $Id: PKGBUILD 186700 2013-05-30 14:40:21Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: bender02 at gmx dot com pkgname=nettle -pkgver=2.7 +pkgver=2.7.1 pkgrel=1 pkgdesc="A low-level cryptographic library" arch=('i686' 'x86_64' 'mips64el') @@ -11,8 +11,10 @@ url="http://www.lysator.liu.se/~nisse/nettle/" license=('GPL2') install=$pkgname.install depends=('gmp') -source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('2caa1bd667c35db71becb93c5d89737f') +source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz{,.sig}) +md5sums=('003d5147911317931dd453520eb234a5' + 'SKIP') + build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/networkmanager-vpnc/PKGBUILD b/extra/networkmanager-vpnc/PKGBUILD index e6745b3d3..84be26b9f 100644 --- a/extra/networkmanager-vpnc/PKGBUILD +++ b/extra/networkmanager-vpnc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179572 2013-03-07 11:54:29Z foutrelis $ +# $Id: PKGBUILD 185909 2013-05-19 18:47:29Z dreisner $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-vpnc pkgver=0.9.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="NetworkManager VPN plugin for vpnc" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -13,8 +13,15 @@ makedepends=('intltool') optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') options=('!libtool') install=networkmanager-vpnc.install -source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz) -sha256sums=('e4504c569315c20f2468995f073123a787cdb66695d321f20f994abd1d7eb1c1') +source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz + "vpnc-paths.patch") +sha256sums=('e4504c569315c20f2468995f073123a787cdb66695d321f20f994abd1d7eb1c1' + '0b07abc21823b316bfd9a9faf7bf34ded35d66e904d081c5e285f8dc8ce30a54') + +prepare() { + cd NetworkManager-vpnc-${pkgver} + patch -Np1 <"$srcdir/vpnc-paths.patch" +} build() { cd NetworkManager-vpnc-${pkgver} diff --git a/extra/networkmanager-vpnc/vpnc-paths.patch b/extra/networkmanager-vpnc/vpnc-paths.patch new file mode 100644 index 000000000..eccdf65b2 --- /dev/null +++ b/extra/networkmanager-vpnc/vpnc-paths.patch @@ -0,0 +1,10 @@ +--- a/src/nm-vpnc-service.c 2013-05-19 14:21:35.465816746 -0400 ++++ b/src/nm-vpnc-service.c 2013-05-19 14:23:57.554908088 -0400 +@@ -54,6 +54,7 @@ + + static const char *vpnc_binary_paths[] = + { ++ "/usr/bin/vpnc", + "/usr/sbin/vpnc", + "/sbin/vpnc", + "/usr/local/sbin/vpnc", diff --git a/extra/ntfs-3g_ntfsprogs/PKGBUILD b/extra/ntfs-3g_ntfsprogs/PKGBUILD index e78410587..aaa1795b7 100644 --- a/extra/ntfs-3g_ntfsprogs/PKGBUILD +++ b/extra/ntfs-3g_ntfsprogs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179546 2013-03-06 15:52:21Z eric $ +# $Id: PKGBUILD 185299 2013-05-13 04:23:22Z eric $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Ronald van Haren <ronald.archlinux.org> # Contributor: Thomas Bächler <thomas.archlinux.org> @@ -6,7 +6,7 @@ pkgbase=ntfs-3g_ntfsprogs pkgname=ntfs-3g pkgver=2013.1.13 -pkgrel=2 +pkgrel=3 pkgdesc="NTFS filesystem utilities" arch=('i686' 'x86_64' 'mips64el') url="http://www.tuxera.com/community/ntfs-3g-download/" @@ -19,18 +19,22 @@ options=('!libtool') source=(http://tuxera.com/opensource/$pkgbase-$pkgver.tgz) sha1sums=('8c12b7644d90ae9fb8d0aca0d7ebd5f8fac2c818') -build() { - cd "$srcdir/$pkgbase-$pkgver" +prepare() { + cd $pkgbase-$pkgver sed -i 's|$(DESTDIR)/sbin|$(DESTDIR)/usr/bin|' {ntfsprogs,src}/Makefile.in +} + +build() { + cd $pkgbase-$pkgver ./configure --prefix=/usr \ --with-fuse=external --disable-static \ --enable-posix-acls --disable-ldconfig \ - --mandir=/usr/share/man + --mandir=/usr/share/man --sbin=/usr/bin make } package_ntfs-3g() { - cd "$srcdir/$pkgbase-$pkgver" + cd $pkgbase-$pkgver make DESTDIR="$pkgdir" rootbindir=/usr/bin rootsbindir=/usr/bin rootlibdir=/usr/lib install ln -s /usr/bin/ntfs-3g "$pkgdir/usr/bin/mount.ntfs" } diff --git a/extra/obex-data-server/PKGBUILD b/extra/obex-data-server/PKGBUILD index 500501846..17a50e340 100644 --- a/extra/obex-data-server/PKGBUILD +++ b/extra/obex-data-server/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180312 2013-03-20 02:35:33Z eric $ +# $Id: PKGBUILD 186962 2013-06-01 15:32:06Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,14 +6,21 @@ pkgname=obex-data-server pkgver=0.4.6 -pkgrel=5 +pkgrel=6 pkgdesc="A D-Bus service providing high-level OBEX client and server side functionality" arch=('i686' 'x86_64' 'mips64el') url="http://wiki.muiline.com/obex-data-server" license=('GPL') depends=('dbus-glib' 'openobex' 'imagemagick') -source=("http://tadas.dailyda.com/software/${pkgname}-${pkgver}.tar.gz") -md5sums=('961ca5db6fe9c97024e133cc6203cc4d') +source=("http://tadas.dailyda.com/software/${pkgname}-${pkgver}.tar.gz" + "obex-data-server-openobex17.patch") +md5sums=('961ca5db6fe9c97024e133cc6203cc4d' + '4199b3f0178d2b58eb36ee36ed1d07d5') + +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}/obex-data-server-openobex17.patch" +} build() { cd ${pkgname}-${pkgver} diff --git a/extra/obex-data-server/obex-data-server-openobex17.patch b/extra/obex-data-server/obex-data-server-openobex17.patch new file mode 100644 index 000000000..047c46c50 --- /dev/null +++ b/extra/obex-data-server/obex-data-server-openobex17.patch @@ -0,0 +1,12 @@ +diff -Naur obex-data-server-0.4.6-orig/src/ods-obex.c obex-data-server-0.4.6/src/ods-obex.c +--- obex-data-server-0.4.6-orig/src/ods-obex.c 2013-05-29 16:01:54.051692334 -0400 ++++ obex-data-server-0.4.6/src/ods-obex.c 2013-05-29 16:03:23.200697099 -0400 +@@ -412,7 +412,7 @@ + goto err; + } + +- interfaces_num = OBEX_FindInterfaces(obex_context->obex_handle, &obex_intf); ++ interfaces_num = OBEX_EnumerateInterfaces(obex_context->obex_handle); + if (intf_num >= interfaces_num) { + g_set_error (error, ODS_ERROR, ODS_ERROR_FAILED, "Invalid interface number"); + goto err; diff --git a/extra/obexftp/PKGBUILD b/extra/obexftp/PKGBUILD index 3c3426120..420eeadb4 100644 --- a/extra/obexftp/PKGBUILD +++ b/extra/obexftp/PKGBUILD @@ -1,35 +1,42 @@ -# $Id: PKGBUILD 143919 2011-11-30 20:53:04Z giovanni $ +# $Id: PKGBUILD 186963 2013-06-01 15:32:07Z eric $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> pkgname=obexftp -pkgver=0.23 -pkgrel=5 +pkgver=0.24 +pkgrel=1 pkgdesc="A tool for transfer files to/from any OBEX enabled device" arch=('i686' 'x86_64' 'mips64el') url="http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp" license=('GPL') -depends=('openobex' 'python2') -makedepends=('pkg-config') -options=('!libtool') -source=("http://downloads.sourceforge.net/openobex/${pkgname}-${pkgver}.tar.bz2") -md5sums=('f20762061b68bc921e80be4aebc349eb') +depends=('openobex') +makedepends=('cmake' 'asciidoc' 'xmlto' 'fuse' 'swig' 'ruby' 'tk') +optdepends=('ruby: ruby bindings' + 'tk: TCL/Tk bindings') +options=('!makeflags' '!libtool' '!docs') +source=("http://downloads.sourceforge.net/openobex/${pkgname}-${pkgver}-Source.tar.gz") +md5sums=('31a50dbbd09c63cbb5399772aaff7936') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/" - ./configure --prefix=/usr \ - --disable-ruby \ - --enable-python - make + mkdir build + cd build + cmake ../${pkgname}-${pkgver}-Source \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DCMAKE_INSTALL_SBINDIR=bin \ + -DENABLE_PERL=YES \ + -DENABLE_PYTHON=YES \ + -DENABLE_RUBY=YES \ + -DENABLE_TCL=YES + make doc } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/build" make DESTDIR="${pkgdir}" install - - # remove nasty files - # mv ${pkgdir}/usr/lib/perl5/site_perl/5.10.0 ${pkgdir}/usr/lib/perl5/site_perl/current - rm -f ${pkgdir}/usr/lib/perl5/core_perl/perllocal.pod } diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD index e21601d8d..7bb35ecce 100644 --- a/extra/octave/PKGBUILD +++ b/extra/octave/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 178113 2013-02-16 16:08:30Z ronald $ +# $Id: PKGBUILD 186980 2013-06-02 10:21:27Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor : shining <shiningxc.at.gmail.com> # Contributor : cyberdune <cyberdune@gmail.com> pkgname=octave -pkgver=3.6.3 +pkgver=3.6.4 pkgrel=2 pkgdesc="A high-level language, primarily intended for numerical computations." arch=('i686' 'x86_64' 'mips64el') @@ -15,24 +15,21 @@ makedepends=('gcc-fortran' 'texlive-core') optdepends=('texinfo: for help-support in octave' 'gnuplot: alternative plotting') source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2{,.sig} - octave-gethelp.patch) + mex-gcc-4.8.patch) options=('!emptydirs') install=octave.install -sha1sums=('e8bd0c0b33ab9714ddb524f2258546c3536f0628' - 'de009a9e6803de6b831cbd836cbc85c291de8a3c' - 'd39d54763ac86114029f8bc5d60763d2adce27bb') +sha1sums=('3cc9366b6dbbd336eaf90fe70ad16e63705d82c4' + 'SKIP' + '0608af9b7ccce8455f534d2fc4acf2f4c8f83a60') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sci-mathematics/octave/files/octave-3.4.3-help.patch?view=log - patch -Np0 -i "${srcdir}/octave-gethelp.patch" + # https://savannah.gnu.org/bugs/?38746 + patch -Np1 -i "${srcdir}/mex-gcc-4.8.patch" autoreconf -vfi - # http://www.nabble.com/Random-rounding-errors-td16010966.html - FFLAGS="-O -ffloat-store" \ - ./configure --prefix=/usr --libexecdir=/usr/lib \ --enable-shared --disable-static \ --with-umfpack="-lumfpack -lsuitesparseconfig" # https://mailman.cae.wisc.edu/pipermail/help-octave/2012-September/053991.html diff --git a/extra/octave/mex-gcc-4.8.patch b/extra/octave/mex-gcc-4.8.patch new file mode 100644 index 000000000..99d501879 --- /dev/null +++ b/extra/octave/mex-gcc-4.8.patch @@ -0,0 +1,31 @@ +# HG changeset patch +# User Clemens Buchacher <drizzd@aon.at> +# Date 1369937542 14400 +# Thu May 30 14:12:22 2013 -0400 +# Node ID 122d3f62e179ba044d47e58510905719220d8706 +# Parent e38a0fa08368d4dd6f3a0dfd20cbe28cf8555f73 +do not include C++ header in extern "C" context (bug #38746) + +* mex.h: Include mexproto.h outside of extern "C" block. + +diff -r e38a0fa08368 -r 122d3f62e179 src/mex.h +--- a/src/mex.h Mon May 27 21:41:57 2013 +0200 ++++ b/src/mex.h Thu May 30 14:12:22 2013 -0400 +@@ -64,6 +64,8 @@ + + #define mxMAXNAME 64 + ++#include "mexproto.h" ++ + #if defined (__cplusplus) + extern "C" { + #endif +@@ -74,8 +76,6 @@ + void mexFunction (int nlhs, mxArray* plhs[], int nrhs, const mxArray *prhs[]); + #endif + +-#include "mexproto.h" +- + /* V4 floating point routines renamed in V5. */ + #define mexIsNaN mxIsNaN + #define mexIsFinite mxIsFinite diff --git a/extra/octave/octave-gethelp.patch b/extra/octave/octave-gethelp.patch deleted file mode 100644 index c0e693abc..000000000 --- a/extra/octave/octave-gethelp.patch +++ /dev/null @@ -1,13 +0,0 @@ -Help parallel compilation -patch by Sebastien Fabbro ---- scripts/Makefile.am.orig 2011-06-09 22:27:22.688268651 +0100 -+++ scripts/Makefile.am 2011-02-08 10:00:51.000000000 +0000 -@@ -316,7 +316,7 @@ - - gethelp_SOURCES = gethelp.cc - --.DOCSTRINGS: $(FCN_FILES) $(GEN_FCN_FILES) mkdoc $(gethelp_SOURCES) Makefile -+.DOCSTRINGS: $(FCN_FILES) $(GEN_FCN_FILES) mkdoc $(gethelp_SOURCES) Makefile gethelp - @$(MAKE) $(AM_MAKEFLAGS) gethelp$(BUILD_EXEEXT) - if [ "x$(srcdir)" != "x." ] && [ -f $(srcdir)/DOCSTRINGS ] && [ ! -f DOCSTRINGS ]; then \ - cp $(srcdir)/DOCSTRINGS DOCSTRINGS; \ diff --git a/extra/openconnect/PKGBUILD b/extra/openconnect/PKGBUILD index e80bd360c..22c6d4233 100644 --- a/extra/openconnect/PKGBUILD +++ b/extra/openconnect/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 167256 2012-09-29 12:54:29Z ibiru $ +# $Id: PKGBUILD 186524 2013-05-28 10:31:58Z ioni $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=openconnect -pkgver=4.07 +pkgver=5.00 pkgrel=1 epoch=1 pkgdesc="Open client for Cisco AnyConnect VPN" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.infradead.org/openconnect.html" -depends=('libxml2' 'openssl' 'libproxy' 'vpnc') -makedepends=('intltool') +depends=('libxml2' 'gnutls' 'libproxy' 'vpnc') +makedepends=('intltool' 'python2') options=('!libtool' '!emptydirs') source=(ftp://ftp.infradead.org/pub/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('61f26e7936d8b26c0f7e8119b7ef84b2') +md5sums=('b3677a4b15f8c530615f4c42dadce275') build() { cd $pkgname-$pkgver - ./configure --prefix=/usr \ + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --disable-static make } diff --git a/extra/openobex/PKGBUILD b/extra/openobex/PKGBUILD index 79ccb6b62..4c9edf088 100644 --- a/extra/openobex/PKGBUILD +++ b/extra/openobex/PKGBUILD @@ -1,34 +1,46 @@ -# $Id: PKGBUILD 150568 2012-02-18 15:04:06Z pierre $ -# Maintainer: Geoffroy Carrier <geoffroy@archlinux.org> +# $Id: PKGBUILD 186964 2013-06-01 15:32:09Z eric $ +# Maintainer: +# Contributor: Geoffroy Carrier <geoffroy@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=openobex -pkgver=1.5 -pkgrel=3.1 +pkgver=1.7 +pkgrel=5 pkgdesc="Implementation of the OBject EXchange (OBEX) protocol" url="http://dev.zuckschwerdt.org/openobex/" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL') -depends=('bluez' 'libusb-compat') -options=('!libtool') -source=("http://mirror.anl.gov/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2") -md5sums=('fce1b82eafb74bde54fe117372393ba8') +depends=('bluez' 'libusbx') +makedepends=('cmake') +options=('!makeflags') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}-Source.tar.gz) +md5sums=('11031f6f0b876bb6259bd27106491528') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + mkdir build + + cd ${pkgname}-${pkgver}-Source - [ "${CARCH}" = "x86_64" ] && export CFLAGS="${CFLAGS} -fPIC" + # Fix path to obex-check-device in udev rule + # https://bugs.archlinux.org/task/35547 + sed -i 's:/sbin/:/bin/:' udev/openobex.rules.in +} - ./configure --prefix=/usr \ - --enable-apps \ - --enable-irda \ - --enable-bluetooth \ - --enable-usb - make +build() { + cd build + cmake ../${pkgname}-${pkgver}-Source \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DCMAKE_INSTALL_SBINDIR=bin + make all openobex-apps } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd build make DESTDIR="${pkgdir}" install + cp ../${pkgname}-${pkgver}-Source/apps/lib/*.h "${pkgdir}/usr/include/openobex/" + install -m644 apps/lib/libopenobex-apps-common.a "${pkgdir}/usr/lib/libopenobex-apps-common.a" } diff --git a/extra/openslp/PKGBUILD b/extra/openslp/PKGBUILD index 9c2b9cd4a..987fb71c8 100644 --- a/extra/openslp/PKGBUILD +++ b/extra/openslp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165260 2012-08-14 16:48:24Z andyrtr $ +# $Id: PKGBUILD 185723 2013-05-17 17:27:12Z andyrtr $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=openslp pkgver=1.2.1 -pkgrel=5 +pkgrel=7 pkgdesc="Open-source implementation of Service Location Protocol" arch=('i686' 'x86_64' 'mips64el') url="http://www.openslp.org" @@ -11,16 +11,16 @@ license=('BSD') depends=('bash' 'openssl') backup=('etc/slp.conf' 'etc/slp.reg' 'etc/slp.spi') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz rc.slpd +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz #https://github.com/lunar-linux/moonbase-other/commit/ae74b5873e639d50db0a563d2424114a530c01ae openslp.service) md5sums=('ff9999d1b44017281dd00ed2c4d32330' - '4f6889a5944894b8be2c01404a9566d2' - '296dc3c8f75e7a1823fcb9dd97ea0971') + '90eea4426492287ebfc01b2056a3ef9d') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --disable-static \ --enable-slpv1 \ --enable-slpv2-security # service would fail to start without this @@ -31,6 +31,5 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} DOC_DIR=/usr/share/doc/openslp-${pkgver} install install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - install -D -m755 $srcdir/rc.slpd ${pkgdir}/etc/rc.d/slpd install -D -m644 $srcdir/openslp.service ${pkgdir}/usr/lib/systemd/system/openslp.service } diff --git a/extra/openslp/openslp.service b/extra/openslp/openslp.service index e17eb3b1d..a3c306aa2 100644 --- a/extra/openslp/openslp.service +++ b/extra/openslp/openslp.service @@ -4,7 +4,7 @@ After=network.target [Service] Type=forking -ExecStart=/usr/sbin/slpd -c /etc/slp.conf -r /etc/slp.reg -s /etc/slp.spi +ExecStart=/usr/bin/slpd -c /etc/slp.conf -r /etc/slp.reg -s /etc/slp.spi ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/extra/openslp/rc.slpd b/extra/openslp/rc.slpd deleted file mode 100755 index 4330c3760..000000000 --- a/extra/openslp/rc.slpd +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/slpd` -case "$1" in - start) - stat_busy "Starting SLPD" - [ -z "$PID" ] && /usr/sbin/slpd - if [ $? -gt 0 ]; then - stat_fail - else - echo $PID > /var/run/slpd.pid - add_daemon slpd - stat_done - fi - ;; - stop) - stat_busy "Stopping SLPD" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/slpd.pid - rm_daemon slpd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/orage/PKGBUILD b/extra/orage/PKGBUILD index 5b2adb494..a8cbc854b 100644 --- a/extra/orage/PKGBUILD +++ b/extra/orage/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 178517 2013-02-24 22:19:59Z eric $ +# $Id: PKGBUILD 185546 2013-05-14 21:40:26Z andrea $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Tobias Kieslich <tobias (at) archlinux.org> pkgname=orage pkgver=4.8.4 -pkgrel=1 +pkgrel=2 pkgdesc="A simple calendar application with reminders for Xfce" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -19,7 +19,7 @@ source=(http://archive.xfce.org/src/apps/${pkgname}/${pkgver%.*}/${pkgname}-${pk sha1sums=('8b9facb0393385e4d639dd6a886c216729672958') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ @@ -31,6 +31,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make -j1 DESTDIR="${pkgdir}" install + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install } diff --git a/extra/ossp/PKGBUILD b/extra/ossp/PKGBUILD index 28f73b367..db2a26652 100644 --- a/extra/ossp/PKGBUILD +++ b/extra/ossp/PKGBUILD @@ -1,51 +1,41 @@ -# $Id: PKGBUILD 157748 2012-04-29 05:59:42Z allan $ +# $Id: PKGBUILD 185305 2013-05-13 05:48:38Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jonathan Liu <net147@gmail.com> pkgname=ossp pkgver=1.3.2 -pkgrel=14 +pkgrel=15 pkgdesc="Emulate OSS device using CUSE" arch=(i686 x86_64 'mips64el') url="http://sourceforge.net/projects/osspd" license=(GPL2) depends=('fuse>=2.8.0') -makedepends=(libpulse alsa-lib) +makedepends=(libpulse alsa-lib git) optdepends=("libpulse: PulseAudio backend" "alsa-lib: ALSA backend") -backup=(etc/conf.d/osspd) -source=("http://downloads.sourceforge.net/project/osspd/${pkgname}-${pkgver}.tar.gz" - osspd.rc.d osspd.conf.d osspd.service osspd.modules-load) -md5sums=('ee2d8c894de2fa4eb3291804fbc7df45' - 'c58d5107a299fb26ae2099fa4b5ca6a1' - '5a5a3db1bb3c98d48d4794613cf12ef0' - '98dc2b2f55f69e3d2fb37f32742d30d4' +source=('ossp::git://git.code.sf.net/p/osspd/code#commit=097dc7b' + osspd.service osspd.modules-load) +md5sums=('SKIP' + 'd084bd24e3dff167541dd3ff860cdebf' '36c01e144db7cf253df12d8ad9dac942') -build() { - cd "$srcdir/$pkgname-$pkgver" +prepare() { + cd $pkgname + sed -i 's|/sbin|/bin|g' Makefile + sed -i 's|GROUP="audio"|SUBSYSTEM=="cuse", MODE="0666"|' 98-osscuse.rules +} - # Many implicit libraries. - export LDFLAGS="$LDFLAGS -lrt -lpthread" +build() { + cd $pkgname make } package() { - cd "$srcdir/$pkgname-$pkgver" - + cd $pkgname make DESTDIR="$pkgdir" prefix=/usr UDEVDIR=/usr/lib/udev/rules.d install - # Make compatible with udev ACLs - sed -e 's/GROUP="audio"/SUBSYSTEM=="cuse", MODE="0666"/' \ - -i "$pkgdir/usr/lib/udev/rules.d/98-osscuse.rules" - - install -Dm644 README "$pkgdir/usr/share/doc/$pkgname/README" - - # initscripts - install -Dm755 "$srcdir/osspd.rc.d" "$pkgdir/etc/rc.d/osspd" - install -Dm644 "$srcdir/osspd.conf.d" "$pkgdir/etc/conf.d/osspd" - - # systemd install -Dm644 "$srcdir/osspd.service" "$pkgdir/usr/lib/systemd/system/osspd.service" install -Dm644 "$srcdir/osspd.modules-load" "$pkgdir/usr/lib/modules-load.d/osspd.conf" + + install -Dm644 README "$pkgdir/usr/share/doc/$pkgname/README" } diff --git a/extra/ossp/osspd.conf.d b/extra/ossp/osspd.conf.d deleted file mode 100644 index 05d0d06c6..000000000 --- a/extra/ossp/osspd.conf.d +++ /dev/null @@ -1,10 +0,0 @@ -# Define the audio backend to use here. -# Leave undefined to autodetect. - -# Use Pulseaudio slave -#DSP_SLAVE=/usr/sbin/ossp-padsp - -# Use ALSA slave -#DSP_SLAVE=/usr/sbin/ossp-alsap - -# vim:set ft=sh: diff --git a/extra/ossp/osspd.rc.d b/extra/ossp/osspd.rc.d deleted file mode 100755 index edb7a1b27..000000000 --- a/extra/ossp/osspd.rc.d +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/osspd - - -if [[ -z "$DSP_SLAVE" ]]; then - # Autodetect - if [[ -x /usr/bin/pulseaudio ]]; then - DSP_SLAVE="/usr/sbin/ossp-padsp" - else - DSP_SLAVE="/usr/sbin/ossp-alsap" - fi -fi - -PID=`pidof -o %PPID /usr/sbin/osspd` -case "$1" in - start) - stat_busy "Starting OSS userspace bridge" - if [ -z "$PID" ]; then - modprobe -a cuse snd-seq-oss &>/dev/null - udevadm settle --quiet - /usr/sbin/osspd --dsp-slave="$DSP_SLAVE" - fi - if [ -n "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon osspd - stat_done - fi - ;; - stop) - stat_busy "Stopping OSS userspace bridge" - [ -n "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon osspd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac - -# vim:set ft=sh: diff --git a/extra/ossp/osspd.service b/extra/ossp/osspd.service index f0a5f3306..0d67c9213 100644 --- a/extra/ossp/osspd.service +++ b/extra/ossp/osspd.service @@ -2,7 +2,7 @@ Description=OSS Userspace Bridge [Service] -ExecStart=/usr/sbin/osspd -f +ExecStart=/usr/bin/osspd -f [Install] WantedBy=multi-user.target diff --git a/extra/oxygen-gtk2/PKGBUILD b/extra/oxygen-gtk2/PKGBUILD index 322688170..bf82523f9 100644 --- a/extra/oxygen-gtk2/PKGBUILD +++ b/extra/oxygen-gtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183540 2013-04-22 20:14:05Z andrea $ +# $Id: PKGBUILD 186908 2013-05-31 18:38:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: birdflesh <antkoul at gmail dot com> pkgname=oxygen-gtk2 -pkgver=1.3.3 +pkgver=1.3.4 pkgrel=1 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK2" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ conflicts=('oxygen-gtk') replaces=('oxygen-gtk') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('37b24d69d386eca5b4382424002ed762') +md5sums=('10a78d31de95168eae861d9c5b4be9ed') build() { mkdir build diff --git a/extra/oxygen-gtk3/PKGBUILD b/extra/oxygen-gtk3/PKGBUILD index 6fe117199..23a43e728 100644 --- a/extra/oxygen-gtk3/PKGBUILD +++ b/extra/oxygen-gtk3/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183542 2013-04-22 20:16:28Z andrea $ +# $Id: PKGBUILD 186910 2013-05-31 18:41:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=oxygen-gtk3 -pkgver=1.1.3 +pkgver=1.1.4 pkgrel=1 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK3" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('LGPL') depends=('gtk3') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('63ae9752dd39a3310d20d973dd6ea247') +md5sums=('6c6db0188d3780173af1994f34db8a71') build() { mkdir build diff --git a/extra/p11-kit/PKGBUILD b/extra/p11-kit/PKGBUILD index ff27d987f..96efe63a1 100644 --- a/extra/p11-kit/PKGBUILD +++ b/extra/p11-kit/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183529 2013-04-22 13:10:36Z heftig $ +# $Id: PKGBUILD 186511 2013-05-28 09:43:54Z ioni $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=p11-kit -pkgver=0.18.1 +pkgver=0.18.2 pkgrel=1 pkgdesc="Library to work with PKCS#11 modules" arch=(i686 x86_64 mips64el) @@ -11,7 +11,7 @@ license=('BSD') depends=('glibc' 'libtasn1') options=(!libtool) source=($url/releases/$pkgname-$pkgver.tar.gz{,.sig}) -md5sums=('e4ef21592dbd126b62e1a6d4ad65ce5c' +md5sums=('7bb1703f38fb778054bf57477c78dc8f' 'SKIP') build() { diff --git a/extra/pango-perl/PKGBUILD b/extra/pango-perl/PKGBUILD index d8e794ad3..32599db1e 100644 --- a/extra/pango-perl/PKGBUILD +++ b/extra/pango-perl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183483 2013-04-21 22:21:03Z heftig $ +# $Id: PKGBUILD 186391 2013-05-26 09:24:50Z bluewind $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=pango-perl pkgver=1.224 -pkgrel=1 +pkgrel=2 pkgdesc="Perl bindings for Pango" arch=(i686 x86_64 'mips64el') license=('LGPL') @@ -25,7 +25,7 @@ check() { make test } -package() { +package() { cd "${srcdir}/Pango-${pkgver}" make install DESTDIR="${pkgdir}" } diff --git a/extra/pango/PKGBUILD b/extra/pango/PKGBUILD index ed37014b7..d2577e193 100644 --- a/extra/pango/PKGBUILD +++ b/extra/pango/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183451 2013-04-21 22:11:56Z heftig $ +# $Id: PKGBUILD 185364 2013-05-13 17:48:00Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=pango -pkgver=1.34.0 +pkgver=1.34.1 pkgrel=1 pkgdesc="A library for layout and rendering of text" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ options=('!libtool') install=pango.install source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz) url="http://www.pango.org/" -sha256sums=('105da1efe019018a9de81681d88c9ace83d2111509ab625c4be9d124a1fdce27') +sha256sums=('1aea30df34a8ae4fcce71afd22aa5b57224b52916d46e3ea81ff9f1eb130e64c') build() { cd ${pkgname}-${pkgver} diff --git a/extra/parted/PKGBUILD b/extra/parted/PKGBUILD index 71c85b1dc..ecf78462b 100644 --- a/extra/parted/PKGBUILD +++ b/extra/parted/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 151858 2012-03-03 14:28:32Z giovanni $ +# $Id: PKGBUILD 185834 2013-05-19 14:21:08Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=parted pkgver=3.1 -pkgrel=1.2 +pkgrel=2 pkgdesc="A program for creating, destroying, resizing, checking and copying partitions" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') @@ -20,6 +20,7 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --disable-debug \ --disable-rpath make diff --git a/extra/parted/linux.c.patch b/extra/parted/linux.c.patch deleted file mode 100644 index c9feea142..000000000 --- a/extra/parted/linux.c.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/libparted/arch/linux.c 2011-05-27 14:52:37.000000000 +0200 -+++ b/libparted/arch/linux.c 2011-07-29 20:25:38.000000000 +0200 -@@ -601,17 +601,17 @@ - static int kver = -1; - - struct utsname uts; -- int major; -- int minor; -- int teeny; -+ int major = 0; -+ int minor = 0; -+ int teeny = 0; - - if (kver != -1) - return kver; - - if (uname (&uts)) - return kver = 0; -- if (sscanf (uts.release, "%u.%u.%u", &major, &minor, &teeny) != 3) -- return kver = 0; -+ int n = sscanf (uts.release, "%u.%u.%u", &major, &minor, &teeny); -+ assert (n == 2 || n == 3); - - return kver = KERNEL_VERSION (major, minor, teeny); - } diff --git a/extra/parted/parted.install b/extra/parted/parted.install index 5e00699e8..752a6871b 100644 --- a/extra/parted/parted.install +++ b/extra/parted/parted.install @@ -8,7 +8,7 @@ post_install() { } post_upgrade() { - post_install $1 + post_install } pre_remove() { diff --git a/extra/perl-async-interrupt/PKGBUILD b/extra/perl-async-interrupt/PKGBUILD index 3484ea0de..d3d154910 100644 --- a/extra/perl-async-interrupt/PKGBUILD +++ b/extra/perl-async-interrupt/PKGBUILD @@ -1,10 +1,10 @@ # Packager: Justin Davis (juster) <jrcd83@gmail.com> -# $Id: PKGBUILD 160503 2012-06-02 10:26:54Z bluewind $ +# $Id: PKGBUILD 186392 2013-05-26 09:24:51Z bluewind $ pkgname=perl-async-interrupt _ver=1.1 pkgver=1.10 -pkgrel=2 +pkgrel=3 pkgdesc='allow C/XS libraries to interrupt perl asynchronously' arch=(i686 x86_64 'mips64el') license=(PerlArtistic GPL) @@ -14,11 +14,10 @@ url=https://metacpan.org/release/Async-Interrupt source=("http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/Async-Interrupt-$_ver.tar.gz") md5sums=(18f19b1537ecf5d6195a6a243110e64b) sha512sums=(e8e62efc053c8103f509c08a19bfa0fefbfe760ca4e1e4670187de4ed4fbdec2e5a9a19bba1696cd2b721ad7fa6d4b723c24e342118b69dc8b7b1597f5e1385e) -_dir="$srcdir/Async-Interrupt-$_ver" build() ( - cd "$_dir" + cd "$srcdir/Async-Interrupt-$_ver" export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps unset PERL5LIB PERL_MM_OPT /usr/bin/perl Makefile.PL @@ -27,7 +26,7 @@ build() check() ( - cd "$_dir" + cd "$srcdir/Async-Interrupt-$_ver" export PERL_MM_USE_DEFAULT=1 unset PERL5LIB make test @@ -35,7 +34,7 @@ check() package() ( - cd "$_dir" + cd "$srcdir/Async-Interrupt-$_ver" make install INSTALLDIRS=vendor DESTDIR="$pkgdir" find "$pkgdir" -name .packlist -o -name perllocal.pod -delete ) diff --git a/extra/perl-bit-vector/Bit-Vector-destroy.patch b/extra/perl-bit-vector/Bit-Vector-destroy.patch new file mode 100644 index 000000000..580f4cf21 --- /dev/null +++ b/extra/perl-bit-vector/Bit-Vector-destroy.patch @@ -0,0 +1,27 @@ +From 0646f34fc3eeb47627822df860986cf7bee4ebed Mon Sep 17 00:00:00 2001 +From: Gisle Aas <gisle@activestate.com> +Date: Thu, 28 Mar 2013 00:41:07 -0700 +Subject: [PATCH] eval { 1->method } triggers different error in 5.17.11 + +--- + t/02_____destroy.t | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/t/02_____destroy.t b/t/02_____destroy.t +index 41e3aa3..adcf995 100644 +--- a/t/02_____destroy.t ++++ b/t/02_____destroy.t +@@ -17,7 +17,9 @@ if (ref($set) eq '') + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + eval { $set->DESTROY(); }; +-if ($@ =~ /Can't call method "DESTROY" without a package or object reference/) ++if ($@ =~ /Can't call method "DESTROY" without a package or object reference/ || ++ $@ =~ /Can't locate object method "DESTROY" via package "1"/ ++) + {print "ok $n\n";} else {print "not ok $n\n";} + $n++; + eval { Bit::Vector::DESTROY($set); }; +-- +1.7.0.5 + diff --git a/extra/perl-bit-vector/PKGBUILD b/extra/perl-bit-vector/PKGBUILD index 648a65b45..e0852fbc8 100644 --- a/extra/perl-bit-vector/PKGBUILD +++ b/extra/perl-bit-vector/PKGBUILD @@ -1,19 +1,29 @@ -# $Id: PKGBUILD 160505 2012-06-02 10:26:56Z bluewind $ -# Maintainer: Kevin Piche <kevin@archlinux.org> +# $Id: PKGBUILD 186393 2013-05-26 09:24:52Z bluewind $ +# Maintainer: +# Contributor: Kevin Piche <kevin@archlinux.org> # Contributor: K. Piche <kpiche@rogers.com> pkgname=perl-bit-vector _cpanname=Bit-Vector pkgver=7.2 -pkgrel=2 +pkgrel=3 pkgdesc='Efficient bit vector, set of integers and "big int" math library' arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'PerlArtistic') url="http://search.cpan.org/dist/${_cpanname}/" depends=('perl-carp-clan' 'perl') options=('!emptydirs') -source=(http://search.cpan.org/CPAN/authors/id/A/AN/ANDK/${_cpanname}-${pkgver}.tar.gz) -md5sums=('bc6ae34738b8f889290bf50099ff8aed') +source=(http://search.cpan.org/CPAN/authors/id/A/AN/ANDK/${_cpanname}-${pkgver}.tar.gz + Bit-Vector-destroy.patch) +md5sums=('bc6ae34738b8f889290bf50099ff8aed' + 'c86a55b84cb05dd04004ee8f56ee2ee3') + +prepare() { + cd "${srcdir}/${_cpanname}-$pkgver" + + # https://rt.cpan.org/Public/Bug/Display.html?id=84250 + patch -Np1 -i "${srcdir}/Bit-Vector-destroy.patch" +} build() { cd "${srcdir}/${_cpanname}-$pkgver" diff --git a/extra/perl-compress-bzip2/PKGBUILD b/extra/perl-compress-bzip2/PKGBUILD index 88c9d0eed..788ff4ddb 100644 --- a/extra/perl-compress-bzip2/PKGBUILD +++ b/extra/perl-compress-bzip2/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 160507 2012-06-02 10:27:00Z bluewind $ +# $Id: PKGBUILD 186394 2013-05-26 09:24:54Z bluewind $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=perl-compress-bzip2 _realname=Compress-Bzip2 -pkgver=2.09 -pkgrel=5 +pkgver=2.15 +pkgrel=1 pkgdesc="Interface to Bzip2 compression library" arch=(i686 x86_64 'mips64el') license=(GPL2) depends=(perl bzip2) url="http://search.cpan.org/dist/Compress-Bzip2" options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/A/AR/ARJAY/$_realname-$pkgver.tar.gz") -md5sums=('1699fde3e86f2a036f135ae606d456bf') +source=("http://search.cpan.org/CPAN/authors/id/R/RU/RURBAN/$_realname-$pkgver.tar.gz") +md5sums=('f1cc338445e60dfd22f5a3a302fc22ca') build() { cd "$srcdir/$_realname-$pkgver" diff --git a/extra/perl-crypt-openssl-bignum/PKGBUILD b/extra/perl-crypt-openssl-bignum/PKGBUILD index 845e348c4..08a00553e 100644 --- a/extra/perl-crypt-openssl-bignum/PKGBUILD +++ b/extra/perl-crypt-openssl-bignum/PKGBUILD @@ -4,7 +4,7 @@ pkgname=perl-crypt-openssl-bignum pkgver=0.04 -pkgrel=7 +pkgrel=9 pkgdesc="OpenSSL's multiprecision integer arithmetic " arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Crypt-OpenSSL-Bignum" diff --git a/extra/perl-crypt-openssl-random/PKGBUILD b/extra/perl-crypt-openssl-random/PKGBUILD index 54091888d..37b05c472 100644 --- a/extra/perl-crypt-openssl-random/PKGBUILD +++ b/extra/perl-crypt-openssl-random/PKGBUILD @@ -4,7 +4,7 @@ pkgname=perl-crypt-openssl-random pkgver=0.04 -pkgrel=7 +pkgrel=9 pkgdesc="Interface to OpenSSL PRNG methods" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Crypt-OpenSSL-Random" diff --git a/extra/perl-crypt-openssl-rsa/PKGBUILD b/extra/perl-crypt-openssl-rsa/PKGBUILD index e8ebbf7c6..f1c0e7f21 100644 --- a/extra/perl-crypt-openssl-rsa/PKGBUILD +++ b/extra/perl-crypt-openssl-rsa/PKGBUILD @@ -4,7 +4,7 @@ pkgname=perl-crypt-openssl-rsa pkgver=0.28 -pkgrel=3 +pkgrel=4 pkgdesc="Interface to OpenSSL RSA methods" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Crypt-OpenSSL-RSA" diff --git a/extra/perl-crypt-ssleay/PKGBUILD b/extra/perl-crypt-ssleay/PKGBUILD index fd7e53650..e14a7078a 100644 --- a/extra/perl-crypt-ssleay/PKGBUILD +++ b/extra/perl-crypt-ssleay/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 164793 2012-08-06 08:07:22Z giovanni $ +# $Id: PKGBUILD 186398 2013-05-26 09:25:03Z bluewind $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-crypt-ssleay pkgver=0.64 -pkgrel=1 +pkgrel=2 pkgdesc="OpenSSL glue that provides LWP https support" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/Crypt-SSLeay" diff --git a/extra/perl-dbd-mysql/PKGBUILD b/extra/perl-dbd-mysql/PKGBUILD index 825ab0b59..dd12529d5 100644 --- a/extra/perl-dbd-mysql/PKGBUILD +++ b/extra/perl-dbd-mysql/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 180686 2013-03-25 19:15:37Z bpiotrowski $ -# Maintainer: kevin <kevin@archlinux.org> +# $Id: PKGBUILD 186399 2013-05-26 09:25:04Z bluewind $ +# Maintainer: BartÅ‚omiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor: kevin <kevin@archlinux.org> # Contributor: Eric Johnson <eric@coding-zone.com> pkgname=perl-dbd-mysql _realname=DBD-mysql -pkgver=4.022 -pkgrel=3 +pkgver=4.023 +pkgrel=2 pkgdesc="Perl/CPAN DBD::mysql module for interacting with MySQL via DBD" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'PerlArtistic') @@ -14,10 +15,10 @@ depends=('libmariadbclient' 'perl-dbi') makedepends=('mariadb') options=('!emptydirs') source=(http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/${_realname}-${pkgver}.tar.gz) -md5sums=('20fb571245e3b9ac275b8329025c4bf6') +md5sums=('6ee956cf33ddce6441b36b6c1c983528') build() { - cd "${srcdir}/${_realname}-${pkgver}" + cd $_realname-$pkgver # install module in vendor directories. perl Makefile.PL INSTALLDIRS=vendor --testsocket=/tmp/socket.mysql @@ -25,7 +26,7 @@ build() { } check() { - cd "${srcdir}/${_realname}-${pkgver}" + cd $_realname-$pkgver mkdir -p /tmp/mysql_test mysql_install_db \ --basedir=/usr \ @@ -40,6 +41,6 @@ check() { } package() { - cd "${srcdir}/${_realname}-${pkgver}" - make install DESTDIR="${pkgdir}" + cd $_realname-$pkgver + make install DESTDIR="$pkgdir" } diff --git a/extra/perl-dbd-sqlite/PKGBUILD b/extra/perl-dbd-sqlite/PKGBUILD index 99ae66f19..be6f51b14 100644 --- a/extra/perl-dbd-sqlite/PKGBUILD +++ b/extra/perl-dbd-sqlite/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163611 2012-07-17 02:14:42Z eric $ +# $Id: PKGBUILD 186400 2013-05-26 09:25:06Z bluewind $ # Maintainer: # Contributor: Tom Killian <tomk@runbox.com> # Contributor: francois at archlinux dot org @@ -6,12 +6,12 @@ pkgname=perl-dbd-sqlite _cpanname=DBD-SQLite pkgver=1.37 -pkgrel=1 +pkgrel=2 pkgdesc="Self-contained RDBMS in a DBI driver" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/${_cpanname}" license=('GPL' 'PerlArtistic') -depends=('perl-dbi>=1.61' 'sqlite') +depends=('perl-dbi' 'sqlite') options=('!emptydirs') source=(http://www.cpan.org/authors/id/A/AD/ADAMK/${_cpanname}-${pkgver}.tar.gz) md5sums=('b8ac1c584befa63cd5ffc391b2366e84') diff --git a/extra/perl-dbi/PKGBUILD b/extra/perl-dbi/PKGBUILD index a93b49575..c67d5c757 100644 --- a/extra/perl-dbi/PKGBUILD +++ b/extra/perl-dbi/PKGBUILD @@ -1,10 +1,8 @@ -# $Id: PKGBUILD 182702 2013-04-12 23:53:53Z eric $ -# Maintainer: kevin <kevin@archlinux.org> -# Contributor: Matt Thompson <mattt@defunct.ca> +# $Id: PKGBUILD 186584 2013-05-29 15:44:45Z eric $ +# Maintainer: pkgname=perl-dbi -_realname=DBI -pkgver=1.625 +pkgver=1.627 pkgrel=1 pkgdesc="Database independent interface for Perl" arch=('i686' 'x86_64' 'mips64el') @@ -12,25 +10,21 @@ license=('GPL' 'PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" depends=('perl') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/T/TI/TIMB/${_realname}-${pkgver}.tar.gz) -md5sums=('b0521be412faff4ec8d511cd5f3f6a31') +source=(http://www.cpan.org/authors/id/T/TI/TIMB/DBI-${pkgver}.tar.gz) +md5sums=('aab49be51b0f4867a1894145b023d2c5') build() { - cd "${srcdir}/${_realname}-${pkgver}" - - # install module in vendor directories. + cd DBI-${pkgver} perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "${srcdir}/${_realname}-${pkgver}" + cd DBI-${pkgver} make test } package() { - cd "${srcdir}/${_realname}-${pkgver}" + cd DBI-${pkgver} make install DESTDIR="${pkgdir}" } - -# vim: ts=2 sw=2 et ft=sh diff --git a/extra/perl-digest-nilsimsa/PKGBUILD b/extra/perl-digest-nilsimsa/PKGBUILD index c7ee8a74e..9cf565b89 100644 --- a/extra/perl-digest-nilsimsa/PKGBUILD +++ b/extra/perl-digest-nilsimsa/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 160523 2012-06-02 10:27:26Z bluewind $ -# Maintainer: kevin <kevin@archlinux.org> +# $Id: PKGBUILD 186402 2013-05-26 09:25:08Z bluewind $ +# Maintainer: +# Contributor: kevin <kevin@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-digest-nilsimsa _realname=Digest-Nilsimsa pkgver=0.06 -pkgrel=8 +pkgrel=9 pkgdesc="Perl version of Nilsimsa code" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') @@ -13,7 +14,7 @@ url="http://search.cpan.org/dist/${_realname}/" depends=('perl') replaces=('digest-nilsimsa') provides=('digest-nilsimsa') -options=(!emptydirs) +options=('!emptydirs') source=(http://www.cpan.org/authors/id/V/VI/VIPUL/${_realname}-${pkgver}.tar.gz) md5sums=('08e940bd7f5d1167ef3fd1aa7ce234d7') diff --git a/extra/perl-digest-sha1/PKGBUILD b/extra/perl-digest-sha1/PKGBUILD index 33ae605ee..558c61a5a 100644 --- a/extra/perl-digest-sha1/PKGBUILD +++ b/extra/perl-digest-sha1/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 160525 2012-06-02 10:27:28Z bluewind $ -# Maintainer: kevin <kevin@archlinux.org> +# $Id: PKGBUILD 186403 2013-05-26 09:25:09Z bluewind $ +# Maintainer: +# Contributor: kevin <kevin@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-digest-sha1 _realname=Digest-SHA1 pkgver=2.13 -pkgrel=3 +pkgrel=4 pkgdesc="Perl interface to the SHA-1 Algorithm" arch=(i686 x86_64 'mips64el') license=('PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" depends=('perl') -options=(!emptydirs) +options=('!emptydirs') source=(http://www.cpan.org/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) replaces=('digest-sha1') provides=('digest-sha1') diff --git a/extra/perl-ev/PKGBUILD b/extra/perl-ev/PKGBUILD index 920638e82..b92bc726c 100644 --- a/extra/perl-ev/PKGBUILD +++ b/extra/perl-ev/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 182901 2013-04-16 04:01:09Z eric $ +# $Id: PKGBUILD 186404 2013-05-26 09:25:10Z bluewind $ pkgname=perl-ev pkgver=4.15 -pkgrel=1 +pkgrel=2 pkgdesc='perl interface to libev, a high performance full-featured event loop' arch=(i686 x86_64 'mips64el') license=(PerlArtistic GPL) diff --git a/extra/perl-fcgi/PKGBUILD b/extra/perl-fcgi/PKGBUILD index 377ffc4c9..59b50fd0e 100644 --- a/extra/perl-fcgi/PKGBUILD +++ b/extra/perl-fcgi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160531 2012-06-02 10:27:39Z bluewind $ +# $Id: PKGBUILD 186405 2013-05-26 09:25:13Z bluewind $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-fcgi pkgver=0.74 -pkgrel=3 +pkgrel=4 pkgdesc="Fast CGI" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/FCGI" diff --git a/extra/perl-guard/PKGBUILD b/extra/perl-guard/PKGBUILD index 65a819282..2f37e901d 100644 --- a/extra/perl-guard/PKGBUILD +++ b/extra/perl-guard/PKGBUILD @@ -1,19 +1,17 @@ # Packager: Justin Davis <jrcd83@gmail.com> -# $Id: PKGBUILD 180339 2013-03-20 16:34:29Z eric $ +# $Id: PKGBUILD 186406 2013-05-26 09:25:16Z bluewind $ pkgname=perl-guard pkgver=1.022 -pkgrel=2 +pkgrel=3 pkgdesc="safe cleanup blocks" arch=(i686 x86_64 'mips64el') -license=(custom:unknown) -options=(!emptydirs) +url="https://metacpan.org/release/Guard" +license=('GPL' 'PerlArtistic') depends=('perl') -url=https://metacpan.org/release/Guard +options=('!emptydirs') source=("http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/Guard-${pkgver}.tar.gz") -md5sums=(8d1d8b942fd5d0240f47906a6d6fac8c) -sha512sums=(9eb1c4fa29f6190115fe11215ff5d27bb3e7f5ab60c7f40c4142ad9ff8aad91b0b169204e4d0f1b1638381c0c99e6a0b5627b8b6d60fad62f1392a9d1e49751e) -_distdir="${srcdir}/Guard-${pkgver}" +md5sums=('8d1d8b942fd5d0240f47906a6d6fac8c') build() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ @@ -22,7 +20,7 @@ build() { PERL_MB_OPT="--installdirs vendor" \ MODULEBUILDRC=/dev/null - cd "$_distdir" + cd "${srcdir}/Guard-${pkgver}" /usr/bin/perl Makefile.PL make ) @@ -30,13 +28,13 @@ build() { check() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" - cd "$_distdir" + cd "${srcdir}/Guard-${pkgver}" make test ) } package() { - cd "$_distdir" + cd "${srcdir}/Guard-${pkgver}" make DESTDIR="$pkgdir" install } diff --git a/extra/perl-html-parser/PKGBUILD b/extra/perl-html-parser/PKGBUILD index 4abb00e0e..5e27b6c91 100644 --- a/extra/perl-html-parser/PKGBUILD +++ b/extra/perl-html-parser/PKGBUILD @@ -1,35 +1,33 @@ -# $Id: PKGBUILD 182897 2013-04-16 03:24:08Z eric $ +# $Id: PKGBUILD 186407 2013-05-26 09:25:18Z bluewind $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Manolis Tzanidakis -# Contributor: Firmicus <francois.archlinux.org> +# Contributor: Firmicus <francois.archlinux.org> pkgname=perl-html-parser -_realname=HTML-Parser -pkgver=3.70 -pkgrel=1 +pkgver=3.71 +pkgrel=2 pkgdesc="Perl HTML parser class" arch=('i686' 'x86_64' 'mips64el') license=('PerlArtistic') -url="http://search.cpan.org/dist/${_realname}/" +url="http://search.cpan.org/dist/HTML-Parser/" depends=('perl-html-tagset' 'perl') checkdepends=('perl-test-pod') options=('!emptydirs') -source=(http://www.cpan.org/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) -md5sums=('efe7699f5ece3a230d730a3682359c08') +source=(http://www.cpan.org/authors/id/G/GA/GAAS/HTML-Parser-${pkgver}.tar.gz) +md5sums=('9128a45893097dfa3bf03301b19c5efe') build() { - cd "${srcdir}/${_realname}-${pkgver}" - # install module in vendor directories. + cd HTML-Parser-${pkgver} perl Makefile.PL INSTALLDIRS=vendor make } check() { - cd "${srcdir}/${_realname}-${pkgver}" + cd HTML-Parser-${pkgver} make test } package() { - cd "${srcdir}/${_realname}-${pkgver}" + cd HTML-Parser-${pkgver} make install DESTDIR="${pkgdir}" } diff --git a/extra/perl-libintl-perl/PKGBUILD b/extra/perl-libintl-perl/PKGBUILD index ac9570fc9..b70a97e93 100644 --- a/extra/perl-libintl-perl/PKGBUILD +++ b/extra/perl-libintl-perl/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 182899 2013-04-16 03:42:32Z eric $ -# Maintainer: kevin <kevin@archlinux.org> +# $Id: PKGBUILD 186408 2013-05-26 09:25:20Z bluewind $ +# Maintainer: +# Contributor: kevin <kevin@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=perl-libintl-perl _realname=libintl-perl pkgver=1.23 -pkgrel=1 +pkgrel=2 pkgdesc="Perl Module: Localization support" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') diff --git a/extra/perl-list-moreutils/PKGBUILD b/extra/perl-list-moreutils/PKGBUILD index 6e0eefa61..e905a45c0 100644 --- a/extra/perl-list-moreutils/PKGBUILD +++ b/extra/perl-list-moreutils/PKGBUILD @@ -1,20 +1,19 @@ -# $Id: PKGBUILD 180362 2013-03-20 17:38:22Z eric $ +# $Id: PKGBUILD 186409 2013-05-26 09:25:22Z bluewind $ # Maintainer : Justin "juster" Davis <jrcd83@gmail.com> # Generator : pbjam 0.01 pkgname=perl-list-moreutils pkgver=0.33 -pkgrel=3 +pkgrel=4 pkgdesc="Provide the stuff missing in List::Util" arch=(i686 x86_64 'mips64el') license=(PerlArtistic GPL) options=(!emptydirs) -depends=('perl>=5.5.30') +depends=('perl') url=http://search.cpan.org/dist/List-MoreUtils source=("http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/List-MoreUtils-${pkgver}.tar.gz") md5sums=(8a33c84028cc2ff3e92c92434b326c0f) sha512sums=(e758b995438c5c5322317aab3602e89b9f683c42d403a0ac97ccd8cc20d0db1a75caefc22f34ad088314867c0bdd9c2b8264e8f2f6a43eab1421aa8c482233b5) -_distdir="${srcdir}/List-MoreUtils-${pkgver}" build() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ @@ -23,7 +22,7 @@ build() { PERL_MB_OPT="--installdirs vendor" \ MODULEBUILDRC=/dev/null - cd "$_distdir" + cd "${srcdir}/List-MoreUtils-${pkgver}" /usr/bin/perl Makefile.PL make ) @@ -31,13 +30,13 @@ build() { check() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" - cd "$_distdir" + cd "${srcdir}/List-MoreUtils-${pkgver}" make test ) } package() { - cd "$_distdir" + cd "${srcdir}/List-MoreUtils-${pkgver}" make DESTDIR="$pkgdir" install } diff --git a/extra/perl-locale-gettext/PKGBUILD b/extra/perl-locale-gettext/PKGBUILD index e18856ef2..af9dcf2ac 100644 --- a/extra/perl-locale-gettext/PKGBUILD +++ b/extra/perl-locale-gettext/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160541 2012-06-02 10:27:56Z bluewind $ +# $Id: PKGBUILD 186410 2013-05-26 09:25:23Z bluewind $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Mark Rosenstand <mark@borkware.net> # Contributor: Paul Mattal <paul@archlinux.org> @@ -6,7 +6,7 @@ pkgname=perl-locale-gettext _realname=gettext pkgver=1.05 -pkgrel=9 +pkgrel=10 pkgdesc="Permits access from Perl to the gettext() family of functions" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'PerlArtistic') diff --git a/extra/perl-net-dns/PKGBUILD b/extra/perl-net-dns/PKGBUILD index a5ef861ff..acee27788 100644 --- a/extra/perl-net-dns/PKGBUILD +++ b/extra/perl-net-dns/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 175933 2013-01-25 04:57:21Z eric $ +# $Id: PKGBUILD 186412 2013-05-26 09:25:29Z bluewind $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-net-dns _realname=Net-DNS pkgver=0.72 -pkgrel=1 +pkgrel=2 pkgdesc="Perl Module: Interface to the DNS resolver." arch=('i686' 'x86_64' 'mips64el') license=('PerlArtistic') diff --git a/extra/perl-net-ssleay/PKGBUILD b/extra/perl-net-ssleay/PKGBUILD index f12fdac29..115fcee5f 100644 --- a/extra/perl-net-ssleay/PKGBUILD +++ b/extra/perl-net-ssleay/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 182685 2013-04-12 16:53:38Z giovanni $ +# $Id: PKGBUILD 186413 2013-05-26 09:25:31Z bluewind $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-net-ssleay _cpanname=Net-SSLeay pkgver=1.54 -pkgrel=1 +pkgrel=2 pkgdesc="Perl extension for using OpenSSL" arch=('i686' 'x86_64' 'mips64el') license=('custom:BSD') diff --git a/extra/perl-netaddr-ip/PKGBUILD b/extra/perl-netaddr-ip/PKGBUILD index 5b7c530b3..c69974650 100644 --- a/extra/perl-netaddr-ip/PKGBUILD +++ b/extra/perl-netaddr-ip/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 175931 2013-01-25 04:44:59Z eric $ +# $Id: PKGBUILD 186411 2013-05-26 09:25:25Z bluewind $ # Maintainer: # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Francois Charette <francois.archlinux.org> @@ -6,7 +6,7 @@ pkgname=perl-netaddr-ip _realname=NetAddr-IP pkgver=4.066 -pkgrel=1 +pkgrel=2 pkgdesc="Perl module to manage IP addresses and subnets" arch=(i686 x86_64 'mips64el') license=('PerlArtistic' 'GPL') diff --git a/extra/perl-sdl/PKGBUILD b/extra/perl-sdl/PKGBUILD index 4b54e3721..1e38d7bb1 100644 --- a/extra/perl-sdl/PKGBUILD +++ b/extra/perl-sdl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 168746 2012-10-15 12:11:10Z heftig $ +# $Id: PKGBUILD 186414 2013-05-26 09:25:36Z bluewind $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=perl-sdl pkgver=2.540 -pkgrel=3 +pkgrel=4 pkgdesc="Simple DirectMedia Layer for Perl" arch=(i686 x86_64 'mips64el') license=(LGPL) diff --git a/extra/perl-socket6/PKGBUILD b/extra/perl-socket6/PKGBUILD index d43eba51f..a852c7849 100644 --- a/extra/perl-socket6/PKGBUILD +++ b/extra/perl-socket6/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180365 2013-03-20 17:57:40Z eric $ +# $Id: PKGBUILD 186415 2013-05-26 09:25:40Z bluewind $ # Maintainer: Florian Pritz <bluewind@xinu.at> # Generator : CPANPLUS::Dist::Arch 1.18 pkgname='perl-socket6' pkgver='0.23' -pkgrel='2' +pkgrel='3' pkgdesc="getaddrinfo/getnameinfo support module" arch=('i686' 'x86_64' 'mips64el') license=('PerlArtistic' 'GPL') @@ -15,7 +15,6 @@ url='http://search.cpan.org/dist/Socket6' source=('http://search.cpan.org/CPAN/authors/id/U/UM/UMEMOTO/Socket6-0.23.tar.gz') md5sums=('2c02adb13c449d48d232bb704ddbd492') sha512sums=('39ced223ecdef89e6fa241031019bb5a73e63d2dfdaf3edb55bfea0cb81b91bea09f1cc26b2d15fa28d32227cc13cdb093c70f0ba346c9bdb523359de53d96f9') -_distdir="${srcdir}/Socket6-0.23" build() { ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ @@ -24,21 +23,21 @@ build() { PERL_MB_OPT="--installdirs vendor" \ MODULEBUILDRC=/dev/null - cd "$_distdir" + cd "${srcdir}/Socket6-0.23" /usr/bin/perl Makefile.PL make ) } check() { - cd "$_distdir" + cd "${srcdir}/Socket6-0.23" ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" make test ) } package() { - cd "$_distdir" + cd "${srcdir}/Socket6-0.23" make DESTDIR="$pkgdir" install } diff --git a/extra/perl-template-toolkit/PKGBUILD b/extra/perl-template-toolkit/PKGBUILD index 072f8604c..3dedbd70f 100644 --- a/extra/perl-template-toolkit/PKGBUILD +++ b/extra/perl-template-toolkit/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 165152 2012-08-11 20:28:19Z eric $ -# Maintainer: Firmicus <francois.archlinux.org> +# $Id: PKGBUILD 186416 2013-05-26 09:25:42Z bluewind $ +# Maintainer: +# Contributor: Firmicus <francois.archlinux.org> # Contributor: Tom Killian <tomk@runbox.com> # Contributor: FJ <joostef@gmail.com> pkgname=perl-template-toolkit _realname=Template-Toolkit pkgver=2.24 -pkgrel=1 +pkgrel=2 pkgdesc="Perl template processing system" arch=(i686 x86_64 'mips64el') license=('PerlArtistic') url="http://search.cpan.org/dist/${_realname}/" depends=('perl-appconfig' 'perl>=5.10.0') -options=(!emptydirs) +options=('!emptydirs') source=(http://search.cpan.org/CPAN/authors/id/A/AB/ABW/${_realname}-$pkgver.tar.gz) md5sums=('c25fdab1beebf8818c2e624bc9f9d212') @@ -25,7 +26,10 @@ build() { check() { cd "${srcdir}/${_realname}-${pkgver}" - make test + + # Failing test can be ignored as it doesn't indicate a problem in main code + # https://rt.cpan.org/Public/Bug/Display.html?id=84778 + make test || true } package() { diff --git a/extra/perl-term-readkey/PKGBUILD b/extra/perl-term-readkey/PKGBUILD index d80103978..1de6a2f95 100644 --- a/extra/perl-term-readkey/PKGBUILD +++ b/extra/perl-term-readkey/PKGBUILD @@ -1,12 +1,13 @@ -# $Id: PKGBUILD 160555 2012-06-02 10:28:20Z bluewind $ -# Maintainer: kevin <kevin@archlinux.org> +# $Id: PKGBUILD 186417 2013-05-26 09:25:44Z bluewind $ +# Maintainer: +# Contributor: kevin <kevin@archlinux.org> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> -# Contributor: Francois Charette <francois.archlinux.org> +# Contributor: Francois Charette <francois.archlinux.org> pkgname=perl-term-readkey _realname=TermReadKey pkgver=2.30.02 -pkgrel=2 +pkgrel=3 pkgdesc="Provides simple control over terminal driver modes" arch=('i686' 'x86_64' 'mips64el') license=('custom') diff --git a/extra/perl-text-iconv/PKGBUILD b/extra/perl-text-iconv/PKGBUILD index 733bdbfcb..02af30a9e 100644 --- a/extra/perl-text-iconv/PKGBUILD +++ b/extra/perl-text-iconv/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 160557 2012-06-02 10:28:23Z bluewind $ -# Maintainer: +# $Id: PKGBUILD 186418 2013-05-26 09:25:46Z bluewind $ +# Maintainer: # Contributor: Francois Charette <firmicus@gmx.net> pkgname=perl-text-iconv _realname=Text-Iconv pkgver=1.7 -pkgrel=7 +pkgrel=8 pkgdesc="Interface to iconv codeset conversion" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/${_realname}/" diff --git a/extra/perl-tk/0001-Fix-compilation-under-threaded-bleadperl.patch b/extra/perl-tk/0001-Fix-compilation-under-threaded-bleadperl.patch new file mode 100644 index 000000000..5b65557c1 --- /dev/null +++ b/extra/perl-tk/0001-Fix-compilation-under-threaded-bleadperl.patch @@ -0,0 +1,32 @@ +From 8eb3ec51a58dd02334118d8f0aa1bebb5704d15c Mon Sep 17 00:00:00 2001 +From: Father Chrysostomos via RT <bug-Tk@rt.cpan.org> +Date: Mon, 6 Aug 2012 17:42:14 -0400 +Subject: [PATCH] Fix compilation under threaded bleadperl + + Ticket <URL: https://rt.cpan.org/Ticket/Display.html?id=78824 > + +CopSTASHPV is no longer an lvalue under threads. (It never was under non-threaded builds.) +--- + tkGlue.c | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/tkGlue.c b/tkGlue.c +index 1b7c025..9079302 100644 +--- a/tkGlue.c ++++ b/tkGlue.c +@@ -4154,11 +4154,7 @@ int type; + SV *x = NULL; + int prefix = '?'; + name = SvPV(sv,na); +-#ifdef USE_ITHREADS +- CopSTASHPV(PL_curcop) = NULL; +-#else +- CopSTASH(PL_curcop) = NULL; +-#endif ++ CopSTASH_set(PL_curcop, NULL); + switch (type) + { + case TK_CONFIG_SCALARVAR: +-- +1.8.2.3 + diff --git a/extra/perl-tk/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch b/extra/perl-tk/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch new file mode 100644 index 000000000..95067501f --- /dev/null +++ b/extra/perl-tk/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch @@ -0,0 +1,47 @@ +From 2333fa35c99aae1db1cb8d3ebce31fc21bc66e0a Mon Sep 17 00:00:00 2001 +From: Slaven Rezic <slaven@rezic.de> +Date: Sat, 23 Mar 2013 14:00:58 +0100 +Subject: [PATCH] * fix for 5.17.7 and newer: SvUPGRADE() is no longer an + expression + +--- + IO/IO.xs | 6 +----- + tkGlue.c | 5 +---- + 2 files changed, 2 insertions(+), 9 deletions(-) + +diff --git a/IO/IO.xs b/IO/IO.xs +index 8ae2a57..42f7515 100644 +--- a/IO/IO.xs ++++ b/IO/IO.xs +@@ -207,11 +207,7 @@ int offset + info.count = 0; + info.error = 0; + info.eof = 0; +- if (!SvUPGRADE(buf, SVt_PV)) +- { +- RETVAL = &PL_sv_undef; +- return; +- } ++ (void)SvUPGRADE(buf, SVt_PV); + SvPOK_only(buf); /* validate pointer */ + Tcl_CreateFileHandler(fd, TCL_READABLE, read_handler, (ClientData) &info); + do +diff --git a/tkGlue.c b/tkGlue.c +index dd3d283..cdc53ad 100644 +--- a/tkGlue.c ++++ b/tkGlue.c +@@ -3830,10 +3830,7 @@ ClientData clientData; + return EXPIRE((interp, "Cannot trace readonly variable")); + } + } +- if (!SvUPGRADE(sv, SVt_PVMG)) +- { +- return EXPIRE((interp, "Trace SvUPGRADE failed")); +- } ++ (void)SvUPGRADE(sv, SVt_PVMG); + + if (SvTYPE(sv) == SVt_PVAV) + { +-- +1.8.2.3 + diff --git a/extra/perl-tk/PKGBUILD b/extra/perl-tk/PKGBUILD index 7fabe3a9c..41ac2a372 100644 --- a/extra/perl-tk/PKGBUILD +++ b/extra/perl-tk/PKGBUILD @@ -1,12 +1,13 @@ -# $Id: PKGBUILD 184418 2013-05-06 19:39:04Z foutrelis $ -# Maintainer: François Charette <francois ατ archlinux δοτ org> +# $Id: PKGBUILD 186419 2013-05-26 09:25:47Z bluewind $ +# Maintainer: +# Contributor: François Charette <francois ατ archlinux δοτ org> # Contributor: Jason Chu <jchu@xentac.net> # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=perl-tk _cpanname=Tk pkgver=804.030 -pkgrel=4 +pkgrel=5 pkgdesc="A graphical user interface toolkit for Perl" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/${_cpanname}" @@ -15,8 +16,22 @@ depends=('libpng' 'libjpeg' 'tk' 'perl') options=('!emptydirs') replaces=('perltk') provides=('perltk') -source=(http://www.cpan.org/authors/id/S/SR/SREZIC/${_cpanname}-${pkgver}.tar.gz) -md5sums=('13275e85f99ee467a86d9598a437abff') +source=(http://www.cpan.org/authors/id/S/SR/SREZIC/${_cpanname}-${pkgver}.tar.gz + 0001-Fix-compilation-under-threaded-bleadperl.patch + 0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch) +md5sums=('13275e85f99ee467a86d9598a437abff' + '361c34978746310e5c31b7a47c016b22' + '46448cdac9d7159f15f2d4b2719d171b') + +prepare() { + cd "$srcdir/${_cpanname}-$pkgver" + + # https://rt.cpan.org/Public/Bug/Display.html?id=78824 + patch -Np1 -i "$srcdir/0001-Fix-compilation-under-threaded-bleadperl.patch" + + # https://rt.cpan.org/Public/Bug/Display.html?id=82677 + patch -Np1 -i "$srcdir/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch" +} build() { cd "$srcdir/${_cpanname}-$pkgver" diff --git a/extra/perl-xml-parser/PKGBUILD b/extra/perl-xml-parser/PKGBUILD index 2fcc86d9f..6f55b09ef 100644 --- a/extra/perl-xml-parser/PKGBUILD +++ b/extra/perl-xml-parser/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 160565 2012-06-02 10:28:38Z bluewind $ +# $Id: PKGBUILD 186420 2013-05-26 09:25:49Z bluewind $ # Maintainer: # Contributor: firmicus <francois@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> @@ -7,7 +7,7 @@ pkgname=perl-xml-parser _realname=XML-Parser pkgver=2.41 -pkgrel=3 +pkgrel=4 pkgdesc="Expat-based XML parser module for perl" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'PerlArtistic') diff --git a/extra/perl-yaml-syck/PKGBUILD b/extra/perl-yaml-syck/PKGBUILD index 0b4acc826..14940a564 100644 --- a/extra/perl-yaml-syck/PKGBUILD +++ b/extra/perl-yaml-syck/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 182872 2013-04-15 21:25:04Z eric $ +# $Id: PKGBUILD 186421 2013-05-26 09:25:51Z bluewind $ # This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman # Maintainer: kevin <kevin@archlinux.org> pkgname=perl-yaml-syck _realname=YAML-Syck pkgver=1.25 -pkgrel=1 +pkgrel=2 pkgdesc="Fast, lightweight YAML loader and dumper" arch=('i686' 'x86_64' 'mips64el') license=('custom') diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 384229473..aa0950a3b 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184818 2013-05-09 07:44:41Z pierre $ +# $Id: PKGBUILD 185573 2013-05-15 08:05:33Z bpiotrowski $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -22,7 +22,7 @@ pkgname=('php' 'php-tidy' 'php-xsl') pkgver=5.4.15 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') license=('PHP') url='http://www.php.net' @@ -38,24 +38,21 @@ md5sums=('145ea5e845e910443ff1eddb3dbcf56a' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' '5c1f4c967b66ce3eaf819b46951dcbf5' 'e036c721e5ad927cd1613c7475a58b3a' - 'f8b206cb8fecb05cb1ded8bee45633ff' + '4af4d94f3db58437eef8db87d16a5fab' 'c60343df74f8e1afb13b084d5c0e47ed') prepare() { cd ${srcdir}/${pkgbase}-${pkgver} - # adjust paths patch -p0 -i ${srcdir}/php.ini.patch patch -p0 -i ${srcdir}/php-fpm.conf.in.patch - - # workaround for pkg-config 0.28 - sed 's/ && test -n "$OPENSSL_INCS"//g' -i configure } build() { local _phpconfig="--srcdir=../${pkgbase}-${pkgver} \ --config-cache \ --prefix=/usr \ + --sbindir=/usr/bin \ --sysconfdir=/etc/php \ --localstatedir=/var \ --with-layout=GNU \ @@ -243,7 +240,7 @@ package_php-fpm() { backup=('etc/php/php-fpm.conf') install='php-fpm.install' - install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/sbin/php-fpm + install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/bin/php-fpm install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.8 ${pkgdir}/usr/share/man/man8/php-fpm.8 install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf ${pkgdir}/etc/php/php-fpm.conf install -D -m644 ${srcdir}/logrotate.d.php-fpm ${pkgdir}/etc/logrotate.d/php-fpm diff --git a/extra/php/php-fpm.service b/extra/php/php-fpm.service index fc5ead6f3..1ae62051f 100644 --- a/extra/php/php-fpm.service +++ b/extra/php/php-fpm.service @@ -6,7 +6,7 @@ After=syslog.target network.target Type=forking PIDFile=/run/php-fpm/php-fpm.pid PrivateTmp=true -ExecStart=/usr/sbin/php-fpm --daemonize --pid /run/php-fpm/php-fpm.pid +ExecStart=/usr/bin/php-fpm --daemonize --pid /run/php-fpm/php-fpm.pid ExecReload=/bin/kill -USR2 $MAINPID [Install] diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD index 2e6cea0c8..9b34b6938 100644 --- a/extra/pidgin/PKGBUILD +++ b/extra/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178040 2013-02-14 01:37:10Z foutrelis $ +# $Id: PKGBUILD 186422 2013-05-26 09:25:53Z bluewind $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -7,7 +7,7 @@ pkgname=('pidgin' 'libpurple' 'finch') pkgver=2.10.7 -pkgrel=2 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') url="http://pidgin.im/" license=('GPL') diff --git a/extra/pigeonhole/PKGBUILD b/extra/pigeonhole/PKGBUILD index ae6e6d545..92622c22a 100644 --- a/extra/pigeonhole/PKGBUILD +++ b/extra/pigeonhole/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185125 2013-05-11 09:39:44Z andyrtr $ +# $Id: PKGBUILD 186354 2013-05-25 09:05:56Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributorr: Peter Lewis <plewis@aur.archlinux.org> @@ -7,13 +7,13 @@ # This must be built against the version of dovecot being used, # else mail delivery will fail. # Specify the version of dovecot to be used here: -_dcpkgver=2.2.1 +_dcpkgver=2.2.2 # Make sure to bump pkgrel if changing this. pkgname=pigeonhole pkgver=0.4.0 -pkgrel=1 -pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.1" +pkgrel=3 +pkgdesc="Sieve implementation for Dovecot" arch=('i686' 'x86_64' 'mips64el') url="http://pigeonhole.dovecot.org/" license=('LGPL') @@ -31,6 +31,7 @@ build() { ./configure --prefix=/usr \ --with-dovecot=/usr/lib/dovecot \ + --with-moduledir=/usr/lib/dovecot/modules \ --disable-static make } diff --git a/extra/pkgfile/PKGBUILD b/extra/pkgfile/PKGBUILD index 1e8d62fab..179b54d38 100644 --- a/extra/pkgfile/PKGBUILD +++ b/extra/pkgfile/PKGBUILD @@ -3,7 +3,7 @@ pkgname=pkgfile pkgver=8 -pkgrel=2 +pkgrel=2.1 pkgdesc="a pacman .files metadata explorer" arch=('i686' 'x86_64' 'mips64el') url="http://github.com/falconindy/pkgfile" diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index 378e331cb..9711c7064 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184422 2013-05-06 19:39:13Z foutrelis $ +# $Id: PKGBUILD 186342 2013-05-25 02:56:35Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.22.3 -pkgrel=3 +pkgver=0.22.4 +pkgrel=1 arch=(i686 x86_64 mips64el) license=('GPL') makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt4' 'pkgconfig' 'lcms2' 'gobject-introspection' 'icu') @@ -13,7 +13,7 @@ url="http://poppler.freedesktop.org/" _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2) -md5sums=('be915388eaad6865cee5a156c8119ec1' +md5sums=('49d55921ce795778c7231fe9f2fe923b' '9dc64c254a31e570507bdd4ad4ba629a') build() { diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD index e99b5b627..2b245e213 100644 --- a/extra/postfix/PKGBUILD +++ b/extra/postfix/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 180687 2013-03-25 19:15:38Z bpiotrowski $ +# $Id: PKGBUILD 185572 2013-05-15 08:05:31Z bpiotrowski $ # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net> # Contributor: Paul Mattal <paul@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=postfix pkgver=2.10.0 -pkgrel=4 +pkgrel=5 pkgdesc='Fast, easy to administer, secure mail server' url='http://www.postfix.org/' license=('custom') @@ -13,11 +13,11 @@ arch=('i686' 'x86_64' 'mips64el') depends=('pcre' 'libsasl' 'libldap' 'db' 'libmariadbclient' 'postgresql-libs' 'sqlite' 'tinycdb') backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual}) -source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" +source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz"{,.sig} 'aliases.patch' 'service' 'rc.d') -sha1sums=('dd9bfc7afee416aa9f2368d084a4b202718e42df' +sha1sums=('dd9bfc7afee416aa9f2368d084a4b202718e42df' 'SKIP' '5fc3de6c7df1e5851a0a379e825148868808318b' '3f385eca6d571a4ed8fb24781bdc003bec5d8ed6' '40c6be2eb55e6437a402f43775cdb3d22ea87a66') diff --git a/extra/postgresql-old-upgrade/PKGBUILD b/extra/postgresql-old-upgrade/PKGBUILD index 0b32a5ba3..07109de00 100644 --- a/extra/postgresql-old-upgrade/PKGBUILD +++ b/extra/postgresql-old-upgrade/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 181849 2013-04-04 14:34:55Z dan $ +# $Id: PKGBUILD 186424 2013-05-26 09:25:57Z bluewind $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=postgresql-old-upgrade pkgver=9.1.9 _majorver=${pkgver%.*} -pkgrel=1 +pkgrel=2 pkgdesc="PostgreSQL build for migrating between major versions with pg_upgrade" arch=('i686' 'x86_64' 'mips64el') url="http://www.postgresql.org/" diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD index 3a602a88d..d4e739b6c 100644 --- a/extra/postgresql/PKGBUILD +++ b/extra/postgresql/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 181847 2013-04-04 14:20:11Z dan $ +# $Id: PKGBUILD 186423 2013-05-26 09:25:56Z bluewind $ # Maintainer: Dan McGee <dan@archlinux.org> pkgbase=postgresql pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') pkgver=9.2.4 _majorver=${pkgver%.*} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://www.postgresql.org/" license=('custom:PostgreSQL') diff --git a/extra/ptlib/PKGBUILD b/extra/ptlib/PKGBUILD index 896725a0c..9c99a90ac 100644 --- a/extra/ptlib/PKGBUILD +++ b/extra/ptlib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178389 2013-02-21 05:32:58Z heftig $ +# $Id: PKGBUILD 185571 2013-05-15 08:05:30Z bpiotrowski $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=ptlib pkgver=2.10.10 -pkgrel=1 +pkgrel=2 pkgdesc="Portable Windows Library" arch=('i686' 'x86_64' 'mips64el') url="http://www.opalvoip.org" diff --git a/extra/pygobject/PKGBUILD b/extra/pygobject/PKGBUILD index 644b3b6ab..9e1f2fe63 100644 --- a/extra/pygobject/PKGBUILD +++ b/extra/pygobject/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183322 2013-04-21 22:06:41Z heftig $ +# $Id: PKGBUILD 185354 2013-05-13 17:22:22Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=pygobject pkgname=(python-gobject python2-gobject pygobject-devel) -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 arch=(i686 x86_64 mips64el) url="https://live.gnome.org/PyGObject" @@ -11,7 +11,7 @@ license=(LGPL) makedepends=(python python2 python-cairo python2-cairo gobject-introspection) source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz) options=('!libtool') -sha256sums=('e85c8ec64238ce88ec1e905497f5a2eaa947a7f4050e338d21ec510d8a50eacb') +sha256sums=('caa6507edb8cca56e781bf927d88ce99581e1df9978b59a3360cfb74bd9c15f5') prepare() { mkdir build-py2 build-py3 devel diff --git a/extra/python-geoip/PKGBUILD b/extra/python-geoip/PKGBUILD index a0d9d737b..e03fa8012 100644 --- a/extra/python-geoip/PKGBUILD +++ b/extra/python-geoip/PKGBUILD @@ -1,20 +1,28 @@ -# $Id: PKGBUILD 168340 2012-10-08 23:42:19Z eric $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 186477 2013-05-27 11:23:42Z foutrelis $ +# Maintainer: +# Contributor: Angel Velasquez <angvp@archlinux.org> +# Contributor: Jan de Groot <jgc@archlinux.org> -pkgbase=python-geoip pkgname=('python2-geoip') -pkgver=1.2.7 -pkgrel=2 +pkgbase=python-geoip +pkgver=1.2.8 +pkgrel=1 pkgdesc="Python bindings for the GeoIP IP-to-country resolver library" arch=('i686' 'x86_64' 'mips64el') -url="http://www.maxmind.com/app/python" +url="http://dev.maxmind.com/geoip/legacy/downloadable#Python-10" license=('LGPL') depends=('python2' 'geoip') -source=(http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-${pkgver}.tar.gz) -md5sums=('df71f5ae7a5c77bbdf726d512b7d67cf') +source=(http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-$pkgver.tar.gz) +sha256sums=('8b946307355b60cb0f2b0be8ac90c1231286e0e79917509763267fce01a50e73') + +build() { + cd "$srcdir/GeoIP-Python-$pkgver" + python2 setup.py build +} package_python2-geoip() { - cd "${srcdir}/GeoIP-Python-${pkgver}" - python2 setup.py build install --root="${pkgdir}" + cd "$srcdir/GeoIP-Python-$pkgver" + python2 setup.py install --root="$pkgdir" -O1 } + +# vim:set ts=2 sw=2 et: diff --git a/extra/python-m2crypto/PKGBUILD b/extra/python-m2crypto/PKGBUILD deleted file mode 100644 index 3d3243c01..000000000 --- a/extra/python-m2crypto/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 140196 2011-10-09 08:27:16Z angvp $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: Sergej Pupykin <sergej@aur.archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=python-m2crypto -pkgver=0.21.1 -pkgrel=1.1 -pkgdesc="A crypto and SSL toolkit for Python" -arch=('i686' 'x86_64' 'mips64el') -url="http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto" -license=('BSD') -depends=('python2' 'openssl') -makedepends=('swig') -source=("http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz") -md5sums=('f93d8462ff7646397a9f77a2fe602d17') - -build() { - cd "${srcdir}/M2Crypto-${pkgver}" - python2 setup.py build -} - -package() { - cd "${srcdir}/M2Crypto-${pkgver}" - python2 setup.py install --root="${pkgdir}/" --optimize=1 - - install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/extra/python-m2crypto/openssl1.patch b/extra/python-m2crypto/openssl1.patch deleted file mode 100644 index 59dba554d..000000000 --- a/extra/python-m2crypto/openssl1.patch +++ /dev/null @@ -1,531 +0,0 @@ -Index: tests/test_ssl.py -=================================================================== ---- tests/test_ssl.py (revision 698) -+++ tests/test_ssl.py (working copy) -@@ -405,8 +405,11 @@ - try: - ctx = SSL.Context('sslv23', weak_crypto=1) - s = SSL.Connection(ctx) -- s.connect(self.srv_addr) -- self.failUnlessEqual(s.get_version(), 'SSLv2') -+ if m2.OPENSSL_VERSION_NUMBER < 0x10000000: # SSLv2 ciphers disabled by default in newer OpenSSL -+ s.connect(self.srv_addr) -+ self.failUnlessEqual(s.get_version(), 'SSLv2') -+ else: -+ self.assertRaises(SSL.SSLError, s.connect, self.srv_addr) - s.close() - finally: - self.stop_server(pid) -Index: tests/test_x509.py -=================================================================== ---- tests/test_x509.py (revision 698) -+++ tests/test_x509.py (working copy) -@@ -142,7 +142,7 @@ - cn.set_data("Hello There!") - assert cn.get_data().as_text() == "Hello There!", cn.get_data().as_text() - -- assert n.as_hash() == 1697185131 -+ self.assertEquals(n.as_hash(), 1697185131) - - self.assertRaises(IndexError, lambda: n[100]) - self.assert_(n[10]) -Index: tests/test_smime.py -=================================================================== ---- tests/test_smime.py (revision 698) -+++ tests/test_smime.py (working copy) -@@ -6,7 +6,7 @@ - """ - - import unittest --from M2Crypto import SMIME, BIO, Rand, X509, EVP -+from M2Crypto import SMIME, BIO, Rand, X509, EVP, Err - - class SMIMETestCase(unittest.TestCase): - cleartext = 'some text to manipulate' -@@ -213,7 +213,7 @@ - - self.filenameSmime = 'tests/sig.p7s' - f = BIO.openfile(self.filenameSmime, 'wb') -- assert s.write(f, p7, BIO.MemoryBuffer('some text')) == 1 -+ assert s.write(f, p7, BIO.MemoryBuffer('some text')) == 1, Err.get_error() - f.close() - - def test_write_pkcs7_der(self): -Index: SWIG/_evp.i -=================================================================== ---- SWIG/_evp.i (revision 695) -+++ SWIG/_evp.i (working copy) -@@ -180,7 +180,7 @@ - - PKCS5_PBKDF2_HMAC_SHA1(passbuf, passlen, saltbuf, saltlen, iter, - keylen, key); -- ret = PyString_FromStringAndSize(key, keylen); -+ ret = PyString_FromStringAndSize((char*)key, keylen); - OPENSSL_cleanse(key, keylen); - return ret; - } -@@ -339,7 +339,7 @@ - klen = EVP_BytesToKey(cipher, md, (unsigned char *)sbuf, - (unsigned char *)dbuf, dlen, iter, - key, NULL); /* Since we are not returning IV no need to derive it */ -- ret = PyString_FromStringAndSize(key, klen); -+ ret = PyString_FromStringAndSize((char*)key, klen); - return ret; - } - -@@ -435,7 +435,7 @@ - PyErr_SetString(_evp_err, ERR_reason_error_string(ERR_get_error())); - return NULL; - } -- ret = PyString_FromStringAndSize(sigbuf, siglen); -+ ret = PyString_FromStringAndSize((char*)sigbuf, siglen); - OPENSSL_cleanse(sigbuf, siglen); - OPENSSL_free(sigbuf); - return ret; -@@ -513,7 +513,7 @@ - PyErr_SetString(PyExc_ValueError, "EVP_PKEY as DER failed"); - return NULL; - } -- der = PyString_FromStringAndSize(pp, len); -+ der = PyString_FromStringAndSize((char*)pp, len); - OPENSSL_free(pp); - return der; - } -Index: SWIG/_ssl.i -=================================================================== ---- SWIG/_ssl.i (revision 695) -+++ SWIG/_ssl.i (working copy) -@@ -17,13 +17,17 @@ - %apply Pointer NONNULL { SSL_CTX * }; - %apply Pointer NONNULL { SSL * }; - %apply Pointer NONNULL { SSL_CIPHER * }; --%apply Pointer NONNULL { STACK * }; -+%apply Pointer NONNULL { STACK_OF(SSL_CIPHER) * }; -+%apply Pointer NONNULL { STACK_OF(X509) * }; - %apply Pointer NONNULL { BIO * }; - %apply Pointer NONNULL { DH * }; - %apply Pointer NONNULL { RSA * }; - %apply Pointer NONNULL { EVP_PKEY *}; - %apply Pointer NONNULL { PyObject *pyfunc }; - -+%rename(ssl_get_ciphers) SSL_get_ciphers; -+extern STACK_OF(SSL_CIPHER) *SSL_get_ciphers(const SSL *ssl); -+ - %rename(ssl_get_version) SSL_get_version; - extern const char *SSL_get_version(CONST SSL *); - %rename(ssl_get_error) SSL_get_error; -@@ -668,29 +672,25 @@ - return SSL_CIPHER_get_bits(c, NULL); - } - --STACK *ssl_get_ciphers(SSL *ssl) { -- return (STACK *)SSL_get_ciphers(ssl); -+int sk_ssl_cipher_num(STACK_OF(SSL_CIPHER) *stack) { -+ return sk_SSL_CIPHER_num(stack); - } - --int sk_ssl_cipher_num(STACK *stack) { -- return sk_num(stack); -+SSL_CIPHER *sk_ssl_cipher_value(STACK_OF(SSL_CIPHER) *stack, int idx) { -+ return sk_SSL_CIPHER_value(stack, idx); - } - --SSL_CIPHER *sk_ssl_cipher_value(STACK *stack, int idx) { -- return (SSL_CIPHER *)sk_value(stack, idx); -+STACK_OF(X509) *ssl_get_peer_cert_chain(SSL *ssl) { -+ return SSL_get_peer_cert_chain(ssl); - } - --STACK *ssl_get_peer_cert_chain(SSL *ssl) { -- return (STACK *)SSL_get_peer_cert_chain(ssl); -+int sk_x509_num(STACK_OF(X509) *stack) { -+ return sk_X509_num(stack); - } - --int sk_x509_num(STACK *stack) { -- return sk_num(stack); -+X509 *sk_x509_value(STACK_OF(X509) *stack, int idx) { -+ return sk_X509_value(stack, idx); - } -- --X509 *sk_x509_value(STACK *stack, int idx) { -- return (X509 *)sk_value(stack, idx); --} - %} - - %threadallow i2d_ssl_session; -Index: SWIG/_x509.i -=================================================================== ---- SWIG/_x509.i (revision 695) -+++ SWIG/_x509.i (working copy) -@@ -148,8 +148,15 @@ - extern int X509_NAME_print_ex(BIO *, X509_NAME *, int, unsigned long); - %rename(x509_name_print_ex_fp) X509_NAME_print_ex_fp; - extern int X509_NAME_print_ex_fp(FILE *, X509_NAME *, int, unsigned long); -+ -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+%rename(x509_name_hash) X509_NAME_hash_old; -+extern unsigned long X509_NAME_hash_old(X509_NAME *); -+#else - %rename(x509_name_hash) X509_NAME_hash; - extern unsigned long X509_NAME_hash(X509_NAME *); -+#endif -+ - %rename(x509_name_get_index_by_nid) X509_NAME_get_index_by_NID; - extern int X509_NAME_get_index_by_NID(X509_NAME *, int, int); - -@@ -171,7 +178,7 @@ - if (PyString_Check($input)) { - Py_ssize_t len; - -- $1 = PyString_AsString($input); -+ $1 = (unsigned char *)PyString_AsString($input); - len = PyString_Size($input); - if (len > INT_MAX) { - PyErr_SetString(PyExc_ValueError, "object too large"); -@@ -184,7 +191,7 @@ - } - } - %rename(x509_name_entry_set_data) X509_NAME_ENTRY_set_data; --extern int X509_NAME_ENTRY_set_data( X509_NAME_ENTRY *, int, CONST unsigned char *, int); -+extern int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *, int, CONST unsigned char *, int); - %typemap(in) (CONST unsigned char *, int); - - %rename(x509_req_new) X509_REQ_new; -@@ -230,7 +237,7 @@ - %rename(x509_store_ctx_free) X509_STORE_CTX_free; - extern void X509_STORE_CTX_free(X509_STORE_CTX *); - %rename(x509_store_ctx_get1_chain) X509_STORE_CTX_get1_chain; --extern STACK *X509_STORE_CTX_get1_chain(X509_STORE_CTX *); -+extern STACK_OF(X509) *X509_STORE_CTX_get1_chain(X509_STORE_CTX *); - - %rename(x509_extension_get_critical) X509_EXTENSION_get_critical; - extern int X509_EXTENSION_get_critical(X509_EXTENSION *); -@@ -348,7 +355,7 @@ - PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error())); - } - else { -- ret = PyString_FromStringAndSize(buf, len); -+ ret = PyString_FromStringAndSize((char*)buf, len); - OPENSSL_free(buf); - } - return ret; -@@ -435,12 +442,12 @@ - } - - int x509_name_set_by_nid(X509_NAME *name, int nid, PyObject *obj) { -- return X509_NAME_add_entry_by_NID(name, nid, MBSTRING_ASC, PyString_AsString(obj), -1, -1, 0); -+ return X509_NAME_add_entry_by_NID(name, nid, MBSTRING_ASC, (unsigned char *)PyString_AsString(obj), -1, -1, 0); - } - - /* x509_name_add_entry_by_txt */ - int x509_name_add_entry_by_txt(X509_NAME *name, char *field, int type, char *bytes, int len, int loc, int set) { -- return X509_NAME_add_entry_by_txt(name, field, type, bytes, len, loc, set); -+ return X509_NAME_add_entry_by_txt(name, field, type, (unsigned char *)bytes, len, loc, set); - } - - PyObject *x509_name_get_der(X509_NAME *name) -@@ -450,23 +457,23 @@ - } - - /* sk_X509_new_null() is a macro returning "STACK_OF(X509) *". */ --STACK *sk_x509_new_null(void) { -- return (STACK *)sk_X509_new_null(); -+STACK_OF(X509) *sk_x509_new_null(void) { -+ return sk_X509_new_null(); - } - - /* sk_X509_free() is a macro. */ --void sk_x509_free(STACK *stack) { -- sk_X509_free((STACK_OF(X509) *)stack); -+void sk_x509_free(STACK_OF(X509) *stack) { -+ sk_X509_free(stack); - } - - /* sk_X509_push() is a macro. */ --int sk_x509_push(STACK *stack, X509 *x509) { -- return sk_X509_push((STACK_OF(X509) *)stack, x509); -+int sk_x509_push(STACK_OF(X509) *stack, X509 *x509) { -+ return sk_X509_push(stack, x509); - } - - /* sk_X509_pop() is a macro. */ --X509 *sk_x509_pop(STACK *stack) { -- return sk_X509_pop((STACK_OF(X509) *)stack); -+X509 *sk_x509_pop(STACK_OF(X509) *stack) { -+ return sk_X509_pop(stack); - } - - int x509_store_load_locations(X509_STORE *store, const char *file) { -@@ -493,21 +500,29 @@ - return X509_REQ_set_version(x, version); - } - --int x509_req_add_extensions(X509_REQ *req, STACK *exts) { -- return X509_REQ_add_extensions(req, (STACK_OF(X509_EXTENSION) *)exts); -+int x509_req_add_extensions(X509_REQ *req, STACK_OF(X509_EXTENSION) *exts) { -+ return X509_REQ_add_extensions(req, exts); - } - --X509_NAME_ENTRY *x509_name_entry_create_by_txt( X509_NAME_ENTRY **ne, char *field, int type, char *bytes, int len) { -- return X509_NAME_ENTRY_create_by_txt( ne, field, type, bytes, len); -+X509_NAME_ENTRY *x509_name_entry_create_by_txt(X509_NAME_ENTRY **ne, char *field, int type, char *bytes, int len) { -+ return X509_NAME_ENTRY_create_by_txt( ne, field, type, (unsigned char *)bytes, len); - } - --LHASH * --x509v3_lhash(){ -- return lh_new(NULL,NULL); -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+LHASH_OF(CONF_VALUE) -+#else -+LHASH -+#endif -+*x509v3_lhash() { -+ return lh_new(NULL, NULL); /* Should probably be lh_CONF_VALUE_new but won't compile. */ - } - - X509V3_CTX * --x509v3_set_conf_lhash(LHASH * lhash){ -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+x509v3_set_conf_lhash(LHASH_OF(CONF_VALUE) * lhash) { -+#else -+x509v3_set_conf_lhash(LHASH * lhash) { -+#endif - X509V3_CTX * ctx; - if (!(ctx=(X509V3_CTX *)PyMem_Malloc(sizeof(X509V3_CTX)))) { - PyErr_SetString(PyExc_MemoryError, "x509v3_set_conf_lhash"); -@@ -517,11 +532,20 @@ - return ctx; - } - --X509_EXTENSION *x509v3_ext_conf(LHASH *conf, X509V3_CTX *ctx, char *name, char *value) { -+X509_EXTENSION * -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+x509v3_ext_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx, char *name, char *value) { -+#else -+x509v3_ext_conf(LHASH *conf, X509V3_CTX *ctx, char *name, char *value) { -+#endif - X509_EXTENSION * ext = NULL; - ext = X509V3_EXT_conf(conf, ctx, name, value); - PyMem_Free(ctx); -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ lh_CONF_VALUE_free(conf); -+#else - lh_free(conf); -+#endif - return ext; - } - -@@ -543,33 +567,33 @@ - } - - /* sk_X509_EXTENSION_new_null is a macro. */ --STACK *sk_x509_extension_new_null(void) { -- return (STACK *)sk_X509_EXTENSION_new_null(); -+STACK_OF(X509_EXTENSION) *sk_x509_extension_new_null(void) { -+ return sk_X509_EXTENSION_new_null(); - } - - /* sk_X509_EXTENSION_free() is a macro. */ --void sk_x509_extension_free(STACK *stack) { -- sk_X509_EXTENSION_free((STACK_OF(X509_EXTENSION) *)stack); -+void sk_x509_extension_free(STACK_OF(X509_EXTENSION) *stack) { -+ sk_X509_EXTENSION_free(stack); - } - - /* sk_X509_EXTENSION_push() is a macro. */ --int sk_x509_extension_push(STACK *stack, X509_EXTENSION *x509_ext) { -- return sk_X509_EXTENSION_push((STACK_OF(X509_EXTENSION) *)stack, x509_ext); -+int sk_x509_extension_push(STACK_OF(X509_EXTENSION) *stack, X509_EXTENSION *x509_ext) { -+ return sk_X509_EXTENSION_push(stack, x509_ext); - } - - /* sk_X509_EXTENSION_pop() is a macro. */ --X509_EXTENSION *sk_x509_extension_pop(STACK *stack) { -- return sk_X509_EXTENSION_pop((STACK_OF(X509_EXTENSION) *)stack); -+X509_EXTENSION *sk_x509_extension_pop(STACK_OF(X509_EXTENSION) *stack) { -+ return sk_X509_EXTENSION_pop(stack); - } - - /* sk_X509_EXTENSION_num() is a macro. */ --int sk_x509_extension_num(STACK *stack) { -- return sk_X509_EXTENSION_num((STACK_OF(X509_EXTENSION) *)stack); -+int sk_x509_extension_num(STACK_OF(X509_EXTENSION) *stack) { -+ return sk_X509_EXTENSION_num(stack); - } - - /* sk_X509_EXTENSION_value() is a macro. */ --X509_EXTENSION *sk_x509_extension_value(STACK *stack, int i) { -- return sk_X509_EXTENSION_value((STACK_OF(X509_EXTENSION) *)stack, i); -+X509_EXTENSION *sk_x509_extension_value(STACK_OF(X509_EXTENSION) *stack, int i) { -+ return sk_X509_EXTENSION_value(stack, i); - } - - /* X509_STORE_CTX_get_app_data is a macro. */ -@@ -590,7 +614,7 @@ - #define I2DTYPE int (*)() - #endif - --STACK * -+STACK_OF(X509) * - make_stack_from_der_sequence(PyObject * pyEncodedString){ - STACK_OF(X509) *certs; - Py_ssize_t encoded_string_len; -@@ -606,7 +630,7 @@ - return NULL; - } - -- certs = ASN1_seq_unpack((unsigned char *)encoded_string, encoded_string_len, (D2ITYPE)d2i_X509, (void(*)())X509_free ); -+ certs = ASN1_seq_unpack_X509((unsigned char *)encoded_string, encoded_string_len, d2i_X509, X509_free ); - if (!certs) { - PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error())); - return NULL; -@@ -616,13 +640,13 @@ - } - - PyObject * --get_der_encoding_stack(STACK * stack){ -+get_der_encoding_stack(STACK_OF(X509) *stack){ - PyObject * encodedString; - - unsigned char * encoding; - int len; - -- encoding = ASN1_seq_pack((STACK_OF(X509)*) stack, (I2DTYPE)i2d_X509, NULL, &len); -+ encoding = ASN1_seq_pack_X509(stack, i2d_X509, NULL, &len); - if (!encoding) { - PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error())); - return NULL; -Index: SWIG/_aes.i -=================================================================== ---- SWIG/_aes.i (revision 695) -+++ SWIG/_aes.i (working copy) -@@ -76,7 +76,7 @@ - AES_encrypt((const unsigned char *)in, out, key); - else - AES_decrypt((const unsigned char *)in, out, key); -- return PyString_FromStringAndSize(out, outlen); -+ return PyString_FromStringAndSize((char*)out, outlen); - } - - int AES_type_check(AES_KEY *key) { -Index: SWIG/_util.i -=================================================================== ---- SWIG/_util.i (revision 695) -+++ SWIG/_util.i (working copy) -@@ -48,7 +48,7 @@ - PyErr_SetString(_util_err, ERR_reason_error_string(ERR_get_error())); - return NULL; - } -- obj = PyString_FromStringAndSize(ret, len); -+ obj = PyString_FromStringAndSize((char*)ret, len); - OPENSSL_free(ret); - return obj; - } -Index: SWIG/_m2crypto.i -=================================================================== ---- SWIG/_m2crypto.i (revision 695) -+++ SWIG/_m2crypto.i (working copy) -@@ -38,6 +38,19 @@ - #define CONST098 - #endif - -+/* Bring in STACK_OF macro definition */ -+%include <openssl/safestack.h> -+ -+/* Bring in LHASH_OF macro definition */ -+/* XXX Can't include lhash.h where LHASH_OF is defined, because it includes -+ XXX stdio.h etc. which we fail to include. So we have to (re)define -+ XXX LHASH_OF here instead. -+%include <openssl/lhash.h> -+*/ -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+#define LHASH_OF(type) struct lhash_st_##type -+#endif -+ - %include constraints.i - %include _threads.i - %include _lib.i -Index: SWIG/_rand.i -=================================================================== ---- SWIG/_rand.i (revision 695) -+++ SWIG/_rand.i (working copy) -@@ -87,7 +87,7 @@ - Py_INCREF(Py_None); - return Py_None; - } else { -- PyTuple_SET_ITEM(tuple, 0, PyString_FromStringAndSize(blob, n)); -+ PyTuple_SET_ITEM(tuple, 0, PyString_FromStringAndSize((char*)blob, n)); - PyMem_Free(blob); - PyTuple_SET_ITEM(tuple, 1, PyInt_FromLong((long)ret)); - return tuple; -Index: SWIG/_pkcs7.i -=================================================================== ---- SWIG/_pkcs7.i (revision 695) -+++ SWIG/_pkcs7.i (working copy) -@@ -12,7 +12,7 @@ - %apply Pointer NONNULL { EVP_CIPHER * }; - %apply Pointer NONNULL { EVP_PKEY * }; - %apply Pointer NONNULL { PKCS7 * }; --%apply Pointer NONNULL { STACK * }; -+%apply Pointer NONNULL { STACK_OF(X509) * }; - %apply Pointer NONNULL { X509 * }; - - %rename(pkcs7_new) PKCS7_new; -@@ -54,8 +54,8 @@ - - %threadallow pkcs7_encrypt; - %inline %{ --PKCS7 *pkcs7_encrypt(STACK *stack, BIO *bio, EVP_CIPHER *cipher, int flags) { -- return PKCS7_encrypt((STACK_OF(X509) *)stack, bio, cipher, flags); -+PKCS7 *pkcs7_encrypt(STACK_OF(X509) *stack, BIO *bio, EVP_CIPHER *cipher, int flags) { -+ return PKCS7_encrypt(stack, bio, cipher, flags); - } - - PyObject *pkcs7_decrypt(PKCS7 *pkcs7, EVP_PKEY *pkey, X509 *cert, int flags) { -@@ -96,14 +96,14 @@ - - %threadallow pkcs7_sign1; - %inline %{ --PKCS7 *pkcs7_sign1(X509 *x509, EVP_PKEY *pkey, STACK *stack, BIO *bio, int flags) { -- return PKCS7_sign(x509, pkey, (STACK_OF(X509) *)stack, bio, flags); -+PKCS7 *pkcs7_sign1(X509 *x509, EVP_PKEY *pkey, STACK_OF(X509) *stack, BIO *bio, int flags) { -+ return PKCS7_sign(x509, pkey, stack, bio, flags); - } - %} - - %threadallow pkcs7_verify1; - %inline %{ --PyObject *pkcs7_verify1(PKCS7 *pkcs7, STACK *stack, X509_STORE *store, BIO *data, int flags) { -+PyObject *pkcs7_verify1(PKCS7 *pkcs7, STACK_OF(X509) *stack, X509_STORE *store, BIO *data, int flags) { - int outlen; - char *outbuf; - BIO *bio; -@@ -113,7 +113,7 @@ - PyErr_SetString(PyExc_MemoryError, "pkcs7_verify1"); - return NULL; - } -- if (!PKCS7_verify(pkcs7, (STACK_OF(X509) *)stack, store, data, bio, flags)) { -+ if (!PKCS7_verify(pkcs7, stack, store, data, bio, flags)) { - PyErr_SetString(_pkcs7_err, ERR_reason_error_string(ERR_get_error())); - BIO_free(bio); - return NULL; -@@ -131,7 +131,7 @@ - return ret; - } - --PyObject *pkcs7_verify0(PKCS7 *pkcs7, STACK *stack, X509_STORE *store, int flags) { -+PyObject *pkcs7_verify0(PKCS7 *pkcs7, STACK_OF(X509) *stack, X509_STORE *store, int flags) { - return pkcs7_verify1(pkcs7, stack, store, NULL, flags); - } - %} -@@ -229,7 +229,7 @@ - } - - /* return STACK_OF(X509)* */ --STACK *pkcs7_get0_signers(PKCS7 *p7, STACK *certs, int flags) { -+STACK_OF(X509) *pkcs7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs, int flags) { - return PKCS7_get0_signers(p7, certs, flags); - } - diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD index 5ebc686fd..d991489df 100644 --- a/extra/python/PKGBUILD +++ b/extra/python/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 182150 2013-04-08 10:27:25Z stephane $ +# $Id: PKGBUILD 186286 2013-05-23 20:40:14Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=python -pkgver=3.3.1 +pkgver=3.3.2 pkgrel=1 _pybasever=3.3 pkgdesc="Next generation of the python high-level scripting language" @@ -18,8 +18,10 @@ optdepends=('tk: for tkinter' 'sqlite') provides=('python3') replaces=('python3') options=('!makeflags') -source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz) -sha1sums=('393d7302c48bc911cd7faa7fa9b5fbcb9919bddc') +source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz + python-3.3.2-CVE-2013-2099.patch) +sha1sums=('87009d0c156c6e1354dfec5c98c328cae93950ad' + 'b7a386b2e2f0811b344898500860ec31ba81ed4d') build() { cd "${srcdir}/Python-${pkgver}" @@ -33,12 +35,14 @@ build() { rm -r Modules/zlib rm -r Modules/_ctypes/{darwin,libffi}* - if [ "$CARCH" != "mips64el" ]; then extraconf=--with-valgrind else extraconf="" fi + + patch -Np1 -i ../python-3.3.2-CVE-2013-2099.patch + ./configure --prefix=/usr \ --enable-shared \ --with-threads \ @@ -55,8 +59,7 @@ build() { check() { cd "${srcdir}/Python-${pkgver}" LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \ - "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_distutils test_site \ - test_urllib test_uuid test_pydoc test_logging + "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_posixpath test_logging } package() { diff --git a/extra/python/python-3.3.2-CVE-2013-2099.patch b/extra/python/python-3.3.2-CVE-2013-2099.patch new file mode 100644 index 000000000..8162d8e54 --- /dev/null +++ b/extra/python/python-3.3.2-CVE-2013-2099.patch @@ -0,0 +1,50 @@ + +# HG changeset patch +# User Antoine Pitrou <solipsis@pitrou.net> +# Date 1368892602 -7200 +# Node ID c627638753e2d25a98950585b259104a025937a9 +# Parent 9682241dc8fcb4b1aef083bd30860efa070c3d6d +Issue #17980: Fix possible abuse of ssl.match_hostname() for denial of service using certificates with many wildcards (CVE-2013-2099). + +diff --git a/Lib/ssl.py b/Lib/ssl.py +--- a/Lib/ssl.py ++++ b/Lib/ssl.py +@@ -129,9 +129,16 @@ class CertificateError(ValueError): + pass + + +-def _dnsname_to_pat(dn): ++def _dnsname_to_pat(dn, max_wildcards=1): + pats = [] + for frag in dn.split(r'.'): ++ if frag.count('*') > max_wildcards: ++ # Issue #17980: avoid denials of service by refusing more ++ # than one wildcard per fragment. A survery of established ++ # policy among SSL implementations showed it to be a ++ # reasonable choice. ++ raise CertificateError( ++ "too many wildcards in certificate DNS name: " + repr(dn)) + if frag == '*': + # When '*' is a fragment by itself, it matches a non-empty dotless + # fragment. +diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py +--- a/Lib/test/test_ssl.py ++++ b/Lib/test/test_ssl.py +@@ -349,6 +349,17 @@ class BasicSocketTests(unittest.TestCase + self.assertRaises(ValueError, ssl.match_hostname, None, 'example.com') + self.assertRaises(ValueError, ssl.match_hostname, {}, 'example.com') + ++ # Issue #17980: avoid denials of service by refusing more than one ++ # wildcard per fragment. ++ cert = {'subject': ((('commonName', 'a*b.com'),),)} ++ ok(cert, 'axxb.com') ++ cert = {'subject': ((('commonName', 'a*b.co*'),),)} ++ ok(cert, 'axxb.com') ++ cert = {'subject': ((('commonName', 'a*b*.com'),),)} ++ with self.assertRaises(ssl.CertificateError) as cm: ++ ssl.match_hostname(cert, 'axxbxxc.com') ++ self.assertIn("too many wildcards", str(cm.exception)) ++ + def test_server_side(self): + # server_hostname doesn't work for server sockets + ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23) diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD index 11562e06f..440e51d2f 100644 --- a/extra/python2/PKGBUILD +++ b/extra/python2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 182151 2013-04-08 10:27:26Z stephane $ +# $Id: PKGBUILD 185697 2013-05-17 11:13:51Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributer: Allan McRae <allan@archlinux.org> # Contributer: Jason Chu <jason@archlinux.org> pkgname=python2 -pkgver=2.7.4 +pkgver=2.7.5 pkgrel=1 _pybasever=2.7 pkgdesc="A high-level scripting language" @@ -17,7 +17,7 @@ optdepends=('tk: for IDLE') conflicts=('python<3') options=('!makeflags') source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz) -sha1sums=('08e78ebeb6d9c799644f6d787ca424291c0fe03e') +sha1sums=('b7389791f789625c2ba9d897aa324008ff482daf') build() { cd "${srcdir}/Python-${pkgver}" diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index 4c039e8f4..2c9cdb73d 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184424 2013-05-06 19:39:18Z foutrelis $ +# $Id: PKGBUILD 185570 2013-05-15 08:05:29Z bpiotrowski $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu pkgver=1.4.1 -pkgrel=2 +pkgrel=3 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=('i686' 'x86_64' 'mips64el') license=('GPL2' 'LGPL2.1') diff --git a/extra/qtchooser/PKGBUILD b/extra/qtchooser/PKGBUILD index c402efc78..47e3f011c 100644 --- a/extra/qtchooser/PKGBUILD +++ b/extra/qtchooser/PKGBUILD @@ -1,20 +1,28 @@ -# $Id: PKGBUILD 182622 2013-04-11 12:14:29Z andrea $ +# $Id: PKGBUILD 185512 2013-05-14 12:30:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=qtchooser pkgver=26 -pkgrel=3 +pkgrel=4 pkgdesc='Wrap the other Qt tools by searching for different instances of Qt on the system' arch=('i686' 'x86_64' 'mips64el') url='http://qt.gitorious.org/qt/qtchooser' license=('GPL') depends=('gcc-libs') source=("http://macieira.org/${pkgname}/${pkgname}-${pkgver}-g97962d2.tar.gz" - {3,4,5}.conf) + {3,4,5}.conf + 'give-home-configs-precedence.patch') md5sums=('a188a5cb63113130e0d05fe4d5bf4e95' '7c5da2b7911d1c4fabc63d6ef00f0020' 'aa4d49b269e1b806f5eea170801f0aa6' - 'cf83f09a9a5a44d898b93f624d74dd11') + 'cf83f09a9a5a44d898b93f624d74dd11' + '13478e4685804c9f79e824b4220bbc2c') + +prepare() { + cd ${pkgname}-${pkgver}-g97962d2 + + patch -p1 -i "${srcdir}"/give-home-configs-precedence.patch +} build() { cd ${pkgname}-${pkgver}-g97962d2 diff --git a/extra/qtchooser/give-home-configs-precedence.patch b/extra/qtchooser/give-home-configs-precedence.patch new file mode 100644 index 000000000..d9575e937 --- /dev/null +++ b/extra/qtchooser/give-home-configs-precedence.patch @@ -0,0 +1,35 @@ +From 50373acdaf8ecd56d9fc0b31ee2f8f06f448c1a3 Mon Sep 17 00:00:00 2001 +From: Andrea Scarpino <andrea@archlinux.org> +Date: Mon, 15 Apr 2013 23:19:39 +0200 +Subject: [PATCH] Give home configurations precedence over system ones + +Change-Id: Ib0c4cf47c0ff5f716949cc5653ba27dad3558489 +Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> +--- + src/qtchooser/main.cpp | 7 ++++--- + 1 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/qtchooser/main.cpp b/src/qtchooser/main.cpp +index da54b16..514503d 100644 +--- a/src/qtchooser/main.cpp ++++ b/src/qtchooser/main.cpp +@@ -272,12 +272,13 @@ vector<string> ToolWrapper::searchPaths() const + { + vector<string> paths; + +- // search the XDG config location directories +- paths = stringSplit(qgetenv("XDG_CONFIG_DIRS", "/etc/xdg").c_str()); +- + string localDir = qgetenv("XDG_CONFIG_HOME", userHome() + PATH_SEP ".config"); + paths.push_back(localDir); + ++ // search the XDG config location directories ++ vector<string> xdgPaths = stringSplit(qgetenv("XDG_CONFIG_DIRS", "/etc/xdg").c_str()); ++ paths.insert(paths.end(), xdgPaths.begin(), xdgPaths.end()); ++ + for (vector<string>::iterator it = paths.begin(); it != paths.end(); ++it) + *it += "/qtchooser/"; + +-- +1.7.1 + diff --git a/extra/racket/PKGBUILD b/extra/racket/PKGBUILD index fb728058e..7925e4a87 100644 --- a/extra/racket/PKGBUILD +++ b/extra/racket/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 178310 2013-02-19 23:15:41Z eric $ +# $Id: PKGBUILD 185732 2013-05-18 02:31:12Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=racket -pkgver=5.3.3 +pkgver=5.3.4 pkgrel=1 pkgdesc="A programming language environment (formerly known as PLT Scheme) suitable for tasks ranging from scripting to application development" arch=('i686' 'x86_64' 'mips64el') @@ -13,19 +13,25 @@ makedepends=('gsfonts' 'sqlite') options=('!libtool' '!strip') install=racket.install source=(http://download.racket-lang.org/installers/${pkgver}/racket/${pkgname}-${pkgver}-src-unix.tgz \ - drracket.desktop) -sha1sums=('96995fe20b332c4644dd51668851193b16976071' - 'a20808f6b250225704856f82a544681a962a299d') + drracket.desktop racket-libpng16.patch) +sha1sums=('7e37738e34c73a25bc7d51aeb53cf3dc5b0d533d' + 'a20808f6b250225704856f82a544681a962a299d' + '5b0260f92fc1ec4dc09d90a5264683bd3b5eed5e') + +prepare() { + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}/racket-libpng16.patch" +} build() { - cd "${srcdir}/${pkgname}-${pkgver}/src" - [ "$CARCH" == "x86_64" ] && export CFLAGS+="-fPIC" + cd ${pkgname}-${pkgver}/src + [ "$CARCH" == "x86_64" ] && export CFLAGS+=" -fPIC" ./configure --prefix=/usr --enable-shared make } package() { - cd "${srcdir}/${pkgname}-${pkgver}/src" + cd ${pkgname}-${pkgver}/src make DESTDIR="${pkgdir}" install install -D -m644 ../collects/icons/plt.xpm "${pkgdir}/usr/share/pixmaps/drracket.xpm" diff --git a/extra/racket/racket-libpng16.patch b/extra/racket/racket-libpng16.patch new file mode 100644 index 000000000..8e4b605f2 --- /dev/null +++ b/extra/racket/racket-libpng16.patch @@ -0,0 +1,52 @@ +From 5629a6156a5720e51a277849f75b3135cb93664f Mon Sep 17 00:00:00 2001 +From: Matthew Flatt <mflatt@racket-lang.org> +Date: Wed, 15 May 2013 20:28:05 -0600 +Subject: [PATCH] support libpng16 + +--- + collects/racket/draw/unsafe/png.rkt | 21 ++++++++++++++------- + 1 file changed, 14 insertions(+), 7 deletions(-) + +diff --git a/collects/racket/draw/unsafe/png.rkt b/collects/racket/draw/unsafe/png.rkt +index 596fcb4..a6b028d 100644 +--- a/collects/racket/draw/unsafe/png.rkt ++++ b/collects/racket/draw/unsafe/png.rkt +@@ -10,11 +10,15 @@ + [(unix) + ;; Most Linux distros supply "libpng12", while other Unix + ;; variants often have just "libpng", etc. +- (ffi-lib "libpng15" '("15" "") +- #:fail (lambda () +- (ffi-lib "libpng12" '("0" "") +- #:fail (lambda () +- (ffi-lib "libpng")))))] ++ (let loop ([alts '(("libpng16" ("16" "")) ++ ("libpng15" ("15" "")) ++ ("libpng12" ("0" "")) ++ ("libpng"))]) ++ (cond ++ [(null? alts) #f] ++ [else (apply ffi-lib (car alts) ++ #:fail (lambda () ++ (loop (cdr alts))))]))] + [(macosx) (ffi-lib "libpng15.15.dylib")] + [(windows) + (ffi-lib "zlib1.dll") +@@ -29,9 +33,12 @@ + ;; assume that other versions are also ok + (define PNG_LIBPNG_VER_STRING (string->bytes/latin-1 + (let ([v (png_access_version_number)]) +- (format "~s.~s" ++ (format "~s.~s~a" + (quotient v 10000) +- (quotient (remainder v 10000) 100))))) ++ (quotient (remainder v 10000) 100) ++ (if (zero? (remainder v 100)) ++ "" ++ (format ".~a" (remainder v 100))))))) + + (define _png_structp (_cpointer 'png_structp)) + (define _png_infop (_cpointer 'png_infop)) +-- +1.8.1.6 + diff --git a/extra/razor/PKGBUILD b/extra/razor/PKGBUILD index f8c9c8f52..13e2dc00b 100644 --- a/extra/razor/PKGBUILD +++ b/extra/razor/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 183164 2013-04-18 06:55:29Z eric $ +# $Id: PKGBUILD 186425 2013-05-26 09:26:01Z bluewind $ # Maintainer: # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=razor pkgver=2.85 -pkgrel=1 +pkgrel=2 pkgdesc="A distributed, collaborative, spam detection and filtering network" arch=('i686' 'x86_64' 'mips64el') url="http://razor.sourceforge.net" diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD index b28e1b2ed..1f8a9b70a 100644 --- a/extra/rrdtool/PKGBUILD +++ b/extra/rrdtool/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184432 2013-05-06 19:39:40Z foutrelis $ +# $Id: PKGBUILD 186426 2013-05-26 09:26:05Z bluewind $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=rrdtool pkgver=1.4.7 -pkgrel=6 +pkgrel=7 pkgdesc="Data logging and graphing application" arch=('i686' 'x86_64' 'mips64el') url="http://www.rrdtool.org" diff --git a/extra/rtkit/PKGBUILD b/extra/rtkit/PKGBUILD index debe6ffc0..b0aeb467b 100644 --- a/extra/rtkit/PKGBUILD +++ b/extra/rtkit/PKGBUILD @@ -1,41 +1,47 @@ -# $Id: PKGBUILD 165071 2012-08-09 23:24:40Z heftig $ +# $Id: PKGBUILD 185307 2013-05-13 06:17:53Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> pkgname=rtkit pkgver=0.11 -pkgrel=1 +pkgrel=2 pkgdesc="Realtime Policy and Watchdog Daemon" arch=('i686' 'x86_64' 'mips64el') url="http://git.0pointer.de/?p=rtkit.git" license=(GPL 'custom:BSD') -depends=(dbus polkit) +depends=(dbus polkit systemd) install=rtkit.install -source=(http://0pointer.de/public/$pkgname-$pkgver.tar.xz) -md5sums=('a96c33b9827de66033d2311f82d79a5d') +source=(http://0pointer.de/public/$pkgname-$pkgver.tar.xz + libsystemd.patch) +md5sums=('a96c33b9827de66033d2311f82d79a5d' + '35089c0a284005f4abcf45168415857e') -build() { +prepare() { cd $pkgname-$pkgver + patch -Np1 -i ../libsystemd.patch + autoreconf -fi +} +build() { + cd $pkgname-$pkgver ./configure \ --prefix=/usr \ + --sbindir=/usr/bin \ --sysconfdir=/etc \ --libexecdir=/usr/lib/$pkgname \ --with-systemdsystemunitdir=/usr/lib/systemd/system - make + + ./rtkit-daemon --introspect > org.freedesktop.RealtimeKit1.xml } package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install - # DBus configuration - mkdir -p "$pkgdir/usr/share/dbus-1/interfaces" - ./rtkit-daemon --introspect \ - > "$pkgdir/usr/share/dbus-1/interfaces/org.freedesktop.RealtimeKit1.xml" + install -Dm644 org.freedesktop.RealtimeKit1.xml \ + "$pkgdir/usr/share/dbus-1/interfaces/org.freedesktop.RealtimeKit1.xml" - # Client license install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" sed -ne '4,25p' rtkit.c >"$pkgdir/usr/share/licenses/$pkgname/COPYING" } diff --git a/extra/rtkit/libsystemd.patch b/extra/rtkit/libsystemd.patch new file mode 100644 index 000000000..51398a76a --- /dev/null +++ b/extra/rtkit/libsystemd.patch @@ -0,0 +1,57 @@ +diff -u -r rtkit-0.11/configure.ac rtkit-0.11-sd/configure.ac +--- rtkit-0.11/configure.ac 2012-05-15 15:25:40.000000000 +0200 ++++ rtkit-0.11-sd/configure.ac 2013-05-13 08:12:17.616825455 +0200 +@@ -115,6 +115,7 @@ + AC_SEARCH_LIBS([cap_init], [cap]) + + PKG_CHECK_MODULES(DBUS, dbus-1) ++PKG_CHECK_MODULES(LIBSYSTEMD_DAEMON, libsystemd-daemon) + + AC_ARG_WITH([systemdsystemunitdir], + AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), +diff -u -r rtkit-0.11/Makefile.am rtkit-0.11-sd/Makefile.am +--- rtkit-0.11/Makefile.am 2012-05-15 15:38:05.000000000 +0200 ++++ rtkit-0.11-sd/Makefile.am 2013-05-13 08:12:18.086822253 +0200 +@@ -56,13 +56,14 @@ + endif + + rtkit_daemon_SOURCES = \ +- rtkit-daemon.c rtkit.h \ +- sd-daemon.c sd-daemon.h ++ rtkit-daemon.c rtkit.h + rtkit_daemon_LDADD = \ +- $(DBUS_LIBS) ++ $(DBUS_LIBS) \ ++ $(LIBSYSTEMD_DAEMON_LIBS) + rtkit_daemon_CFLAGS = \ + $(AM_CFLAGS) \ +- $(DBUS_CFLAGS) ++ $(DBUS_CFLAGS) \ ++ $(LIBSYSTEMD_DAEMON_CFLAGS) + + rtkitctl_SOURCES = \ + rtkitctl.c rtkit.h +@@ -93,7 +94,3 @@ + + DISTCHECK_CONFIGURE_FLAGS = \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) +- +-update-systemd: +- curl http://cgit.freedesktop.org/systemd/systemd/plain/src/libsystemd-daemon/sd-daemon.c > sd-daemon.c +- curl http://cgit.freedesktop.org/systemd/systemd/plain/src/systemd/sd-daemon.h > sd-daemon.h +diff -u -r rtkit-0.11/rtkit-daemon.c rtkit-0.11-sd/rtkit-daemon.c +--- rtkit-0.11/rtkit-daemon.c 2012-05-15 15:25:40.000000000 +0200 ++++ rtkit-0.11-sd/rtkit-daemon.c 2013-05-13 08:13:07.933149359 +0200 +@@ -50,9 +50,9 @@ + #include <dirent.h> + #include <syslog.h> + #include <grp.h> ++#include <systemd/sd-daemon.h> + + #include "rtkit.h" +-#include "sd-daemon.h" + + #ifndef __linux__ + #error "This stuff only works on Linux!" +Only in rtkit-0.11: sd-daemon.c +Only in rtkit-0.11: sd-daemon.h diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD index 870f3733d..048fa5b79 100644 --- a/extra/ruby/PKGBUILD +++ b/extra/ruby/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Jeramy Rutley <jrutley@gmail.com> pkgname=('ruby' 'ruby-docs') -pkgver=2.0.0_p0 +pkgver=2.0.0_p195 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.ruby-lang.org/en/' @@ -13,7 +13,7 @@ makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml') options=('!emptydirs' '!makeflags') source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2" 'gemrc') -md5sums=('895c1c581f8d28e8b3bb02472b2ccf6a' +md5sums=('2f54faea6ee1ca500632ec3c0cb59cb6' '6fb8e7a09955e0f64be3158fb4a27e7a') build() { diff --git a/extra/rygel/PKGBUILD b/extra/rygel/PKGBUILD index cfcdf94b6..4e3f4dccc 100644 --- a/extra/rygel/PKGBUILD +++ b/extra/rygel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183456 2013-04-21 22:12:05Z heftig $ +# $Id: PKGBUILD 185316 2013-05-13 09:39:29Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Balló György <ballogyor+arch at gmail dot com> pkgname=rygel -pkgver=0.18.1 +pkgver=0.18.2 pkgrel=1 pkgdesc="UPnP AV MediaServer and MediaRenderer that allows you to easily share audio, video and pictures, and control of media player on your home network" arch=('i686' 'x86_64' 'mips64el') @@ -22,7 +22,7 @@ options=('!libtool') install=rygel.install groups=('gnome-extra') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('3f71bec31be373707dd0edd88aeea49c74429f258fc5a7e01bb979563349c64d') +sha256sums=('26dea444e69f68cec822e58080162d056528a518b9b155503016a19dda0b48a4') build() { cd $pkgname-$pkgver diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index 82d460c35..f45b52785 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -10,18 +10,18 @@ pkgbase=samba pkgname=('libwbclient' 'smbclient' 'samba') -pkgver=4.0.5 +pkgver=4.0.6 # We use the 'A' to fake out pacman's version comparators. Samba chooses # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! -_realver=4.0.5 -pkgrel=2 +_realver=4.0.6 +pkgrel=1 arch=(i686 x86_64 mips64el) url="http://www.samba.org" license=('GPL3') makedepends=('python2' 'docbook-xsl' 'pkg-config' 'libbsd' 'db' 'popt' 'libcups' 'readline' 'tevent' 'acl' 'libldap' 'libcap' 'ldb>=1.1.15' 'krb5' 'pam' - 'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb') + 'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb' 'dbus') source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz samba.logrotate swat.xinetd @@ -67,6 +67,7 @@ _samba4_auth_modules=auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,a cd ${srcdir}/samba-${_realver} ./configure --enable-fhs \ --prefix=/usr \ + --sbindir=/usr/bin \ --libdir=/usr/lib \ --localstatedir=/var \ --with-configdir=/etc/samba \ @@ -196,12 +197,12 @@ install=samba.install find ${pkgdir}/usr/lib/python${_pyver}/site-packages/ -name '*.py' | \ xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" - find ${pkgdir}/usr/bin ${pkgdir}/usr/sbin -type f -executable | \ + find ${pkgdir}/usr/bin ${pkgdir}/usr/bin -type f -executable | \ xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" # Make admin scripts look in the right place for the samba python module - for script in sbin/samba_dnsupdate sbin/samba_kcc sbin/samba_spnupdate \ - sbin/samba_upgradedns bin/samba-tool + for script in bin/samba_dnsupdate bin/samba_kcc bin/samba_spnupdate \ + bin/samba_upgradedns bin/samba-tool do sed -i "/^sys\.path\.insert/ a\ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \ @@ -244,18 +245,17 @@ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \ # copy ldap example install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema } - -md5sums=('58ec2fec08872b72f8fd526f2da20a9e' +md5sums=('db9dc684f167a602c18acc19d3e7e401' '5697da77590ec092cc8a883bae06093c' - 'a4bbfa39fee95bba2e7ad6b535fae7e6' + 'ee8507839745cf17d2fb5401be7da6a8' '96f82c38f3f540b53f3e5144900acf17' - '5602ba59bc60502c99e6d5a5ae16aecf' + 'ee4763a656cf00d92bfda31b6bb2c5cb' '6c447748a064d631435dbef0a3dcf32f' - 'd0b18dd7f5fafc8d25cb3a7c37c6d920' + 'c0c561c47de24d33dd48aae79823810b' 'a78b9aa93eb14b0ac445897395693225' - '90845b89f2321cb19c0b13f385f1782a' - '70186fa43510bf99e3afd5951e814fbf' + 'e8ebc966b5684a557284dd435daaab7f' + '70afd2db60a2e8eff7615dbdecd887ac' '6db11f3dd2112a4b7a73007b189bef3f' - 'b0de262f9c62acd162e873658f33d063' - '64a52bc798033aeabfae3410bd559aa4' + 'fd6be0cf1e5b3f0c3599fdb95455d19f' + '081c20b9d994d69ce5c37dcf96f10572' '49abd7b719e3713a3f75a8a50958e381') diff --git a/extra/samba/nmbd.service b/extra/samba/nmbd.service index 4f86c4db9..34c66d5d6 100644 --- a/extra/samba/nmbd.service +++ b/extra/samba/nmbd.service @@ -5,7 +5,7 @@ After=network.target [Service] Type=forking PIDFile=/var/run/nmbd.pid -ExecStart=/usr/sbin/nmbd -D +ExecStart=/usr/bin/nmbd -D ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/extra/samba/samba b/extra/samba/samba deleted file mode 100755 index 6098ee0cb..000000000 --- a/extra/samba/samba +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -[ -f /etc/conf.d/samba ] && . /etc/conf.d/samba - -[ -z "$SAMBA_DAEMONS" ] && SAMBA_DAEMONS=(smbd nmbd) - -case "$1" in - start) - rc=0 - stat_busy "Starting Samba Server" - if [ ! -x /var/log/samba ] ; then - install -m755 -d /var/log/samba - fi - for d in ${SAMBA_DAEMONS[@]}; do - PID=`pidof -o %PPID /usr/sbin/$d` - [ -z "$PID" ] && /usr/sbin/$d -D - rc=$(($rc+$?)) - done - if [ $rc -gt 0 ]; then - stat_fail - else - add_daemon samba - stat_done - fi - ;; - stop) - rc=0 - stat_busy "Stopping Samba Server" - for d in ${SAMBA_DAEMONS[@]}; do - PID=`pidof -o %PPID /usr/sbin/$d` - [ -z "$PID" ] || kill $PID &> /dev/null - rc=$(($rc+$?)) - done - if [ $rc -gt 0 ]; then - stat_fail - else - rm /run/samba/smbd.pid &>/dev/null - rm /run/samba/nmbd.pid &>/dev/null - rm /run/samba/winbindd.pid &>/dev/null - rm_daemon samba - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/samba/samba.service b/extra/samba/samba.service index e423a7d2d..562d42562 100644 --- a/extra/samba/samba.service +++ b/extra/samba/samba.service @@ -7,7 +7,7 @@ Type=forking PIDFile=/var/run/samba.pid LimitNOFILE=16384 EnvironmentFile=-/etc/conf.d/samba -ExecStart=/usr/sbin/samba $SAMBAOPTIONS +ExecStart=/usr/bin/samba $SAMBAOPTIONS ExecReload=/usr/bin/kill -HUP $MAINPID [Install] diff --git a/extra/samba/smbd.service b/extra/samba/smbd.service index 12c08474a..de34c2a5f 100644 --- a/extra/samba/smbd.service +++ b/extra/samba/smbd.service @@ -5,7 +5,7 @@ After=network.target nmbd.service winbindd.service [Service] Type=forking PIDFile=/var/run/smbd.pid -ExecStart=/usr/sbin/smbd -D +ExecStart=/usr/bin/smbd -D ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/extra/samba/smbd@.service b/extra/samba/smbd@.service index e1f71be3f..071eb5788 100644 --- a/extra/samba/smbd@.service +++ b/extra/samba/smbd@.service @@ -2,6 +2,6 @@ Description=Samba SMB/CIFS server instance [Service] -ExecStart=/usr/sbin/smbd -F +ExecStart=/usr/bin/smbd -F ExecReload=/bin/kill -HUP $MAINPID StandardInput=socket diff --git a/extra/samba/swat.xinetd b/extra/samba/swat.xinetd index 2e62a82b2..b083ad860 100644 --- a/extra/samba/swat.xinetd +++ b/extra/samba/swat.xinetd @@ -3,7 +3,7 @@ service swat socket_type = stream wait = no user = root - server = /usr/sbin/swat + server = /usr/bin/swat log_on_success += HOST DURATION log_on_failure += HOST disable = yes diff --git a/extra/samba/swat@.service b/extra/samba/swat@.service index a036b2c03..ebbc31c47 100644 --- a/extra/samba/swat@.service +++ b/extra/samba/swat@.service @@ -3,5 +3,5 @@ Description=SWAT Samba Web Admin Tool After=local-fs.target [Service] -ExecStart=/usr/sbin/swat +ExecStart=/usr/bin/swat StandardInput=socket diff --git a/extra/samba/winbindd.service b/extra/samba/winbindd.service index 02e3014b1..20bac9a83 100644 --- a/extra/samba/winbindd.service +++ b/extra/samba/winbindd.service @@ -5,7 +5,7 @@ After=network.target nmbd.service [Service] Type=forking PIDFile=/var/run/winbindd.pid -ExecStart=/usr/sbin/winbindd -D +ExecStart=/usr/bin/winbindd -D ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD index a8fc7e654..494ff622e 100644 --- a/extra/sane/PKGBUILD +++ b/extra/sane/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182410 2013-04-10 07:43:35Z tpowa $ +# $Id: PKGBUILD 186914 2013-05-31 19:37:31Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Simo L. <neotuli@yahoo.com> @@ -6,12 +6,12 @@ pkgname=sane pkgver=1.0.23 -pkgrel=4 +pkgrel=6 pkgdesc="Scanner Access Now Easy" url="http://www.sane-project.org/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('libtiff>=4.0.0' 'libgphoto2' 'libjpeg>=8' 'libusb-compat' 'libcups' 'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp') +depends=('libtiff>=4.0.0' 'libgphoto2' 'libjpeg>=8' 'libusbx' 'libcups' 'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp') makedepends=('texlive-latexextra') backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,kodakaio.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf} etc/xinetd.d/sane) source=(ftp://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz @@ -34,13 +34,14 @@ prepare() { build() { cd "${srcdir}/${pkgname}-backends-${pkgver}" - ./configure --prefix=/usr \ + ./configure --prefix=/usr --sbindir=/usr/bin \ --sysconfdir=/etc \ --localstatedir=/var \ --with-docdir=/usr/share/doc/sane \ --enable-avahi \ --enable-pthread \ --disable-rpath \ + --enable-libusb_1_0 \ --disable-locking make } @@ -69,8 +70,8 @@ package () { "${pkgdir}/usr/lib/systemd/system/saned@.service" } md5sums=('e226a89c54173efea80e91e9a5eb6573' - '5f519030392d599e2ad348159ec4c96f' + 'bc2c8b4f7b3012c8936c7da21f60e2ac' 'e57e9e15528f47f5f1b3f1411135ed5d' - 'e44bd4c994a52d6f472463d1eb0a03be' + '3f9fe36b0c4ff0b01b53b1cffa5d9700' 'e65dbefb7c3d69955fb6eb3ace14aa12' '44e77692c52db15b0f530a1d9a8e1296') diff --git a/extra/sane/sane.xinetd b/extra/sane/sane.xinetd index 67f08a656..311ca6202 100644 --- a/extra/sane/sane.xinetd +++ b/extra/sane/sane.xinetd @@ -5,7 +5,7 @@ service sane-port wait = no user = nobody group = scanner - server = /usr/sbin/saned + server = /usr/bin/saned # disabled by default! disable = yes } diff --git a/extra/sane/saned.service b/extra/sane/saned.service index 69e833e7e..6b2a3f7a7 100644 --- a/extra/sane/saned.service +++ b/extra/sane/saned.service @@ -3,6 +3,6 @@ Description=Scanner Service [Service] Group=scanner -ExecStart=/usr/sbin/saned +ExecStart=/usr/bin/saned StandardInput=socket StandardError=syslog diff --git a/extra/scim/PKGBUILD b/extra/scim/PKGBUILD index d232dfb91..78426f80f 100644 --- a/extra/scim/PKGBUILD +++ b/extra/scim/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184249 2013-05-05 00:06:28Z bisson $ +# $Id: PKGBUILD 185781 2013-05-18 17:19:08Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Gan Lu <rhythm.gan@gmail.com> pkgname=scim pkgver=1.4.14 -pkgrel=2 +pkgrel=3 pkgdesc='Input method user interface and development platform' url='http://www.scim-im.org/projects/scim' license=('LGPL') @@ -19,6 +19,10 @@ sha1sums=('73391be371dd7ef9f9af8b3a211e2bedec0cf71b') install=install +prepare() { + find -name '*.png' -exec optipng -quiet -force -fix {} + +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ @@ -32,5 +36,4 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - find "${pkgdir}" -name *.png -exec optipng {} \; # libpng-1.6 has higher standards } diff --git a/extra/seahorse/PKGBUILD b/extra/seahorse/PKGBUILD index 79e2e11ef..bcc7c7431 100644 --- a/extra/seahorse/PKGBUILD +++ b/extra/seahorse/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183457 2013-04-21 22:12:07Z heftig $ +# $Id: PKGBUILD 185473 2013-05-14 11:01:28Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Michel Brabants <michel.linux@tiscali.be> pkgname=seahorse -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="GNOME application for managing PGP keys." arch=(i686 x86_64 'mips64el') @@ -19,7 +19,7 @@ groups=(gnome-extra) install=seahorse.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz seahorse-ssh-askpass.sh) -sha256sums=('c1a1d97618a37a79e19902e00f3a0de7cfb947b52eb9282ea09e5f9f73151e7a' +sha256sums=('b3837d088b7e3f7ebc41cb3f11c5c85e2df7e06bdc538a3e85bb1a13c34c9a12' '400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c') build() { diff --git a/extra/smartmontools/PKGBUILD b/extra/smartmontools/PKGBUILD index 261ca4b05..676484541 100644 --- a/extra/smartmontools/PKGBUILD +++ b/extra/smartmontools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183306 2013-04-21 10:49:31Z giovanni $ +# $Id: PKGBUILD 185826 2013-05-19 13:29:06Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: Jani Talikka <jani.talikka@gmail.com> @@ -6,7 +6,7 @@ pkgname=smartmontools pkgver=6.1 -pkgrel=2 +pkgrel=3 pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives" url="http://smartmontools.sourceforge.net" license=('GPL') @@ -24,6 +24,7 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --sysconfdir=/etc \ --enable-drivedb \ --with-libcap-ng=yes \ diff --git a/extra/smb4k/PKGBUILD b/extra/smb4k/PKGBUILD index 32516b6d8..e81a10f01 100644 --- a/extra/smb4k/PKGBUILD +++ b/extra/smb4k/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179497 2013-03-05 17:07:36Z giovanni $ +# $Id: PKGBUILD 186369 2013-05-26 07:53:25Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Emanuele Rampichini <emanuele.rampichini@gmail.com> pkgname=smb4k -pkgver=1.0.6 +pkgver=1.0.7 pkgrel=1 pkgdesc="A KDE program that browses samba shares" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=smb4k.install source=("http://downloads.sourceforge.net/project/${pkgname}/Smb4K%20%28stable%20releases%29/${pkgver}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('438ea64ed1296de6618677758257445b') +md5sums=('1b15d7f0f4ad89b0fe730629ec53c2ae') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/snd/PKGBUILD b/extra/snd/PKGBUILD index 53c93d271..894ad7771 100644 --- a/extra/snd/PKGBUILD +++ b/extra/snd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180122 2013-03-17 18:38:44Z schiv $ +# $Id: PKGBUILD 186867 2013-05-31 11:57:47Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: see .contrib pkgname=snd -pkgver=13.5 +pkgver=13.7 pkgrel=1 pkgdesc="An advanced sound editor" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ optdepends=('wavpack' 'flac' 'speex' 'mpg123' 'timidity++' 'vorbis-tools') install=$pkgname.install source=("ftp://ccrma-ftp.stanford.edu/pub/Lisp/$pkgname-$pkgver.tar.gz") -md5sums=('bc8915f28110744237330e8b93638bd3') +md5sums=('220b0155bace73d4442374a837c2f5fd') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/socat/PKGBUILD b/extra/socat/PKGBUILD index b15e23f42..fd25d6b87 100644 --- a/extra/socat/PKGBUILD +++ b/extra/socat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 159299 2012-05-21 08:16:43Z bisson $ +# $Id: PKGBUILD 186472 2013-05-27 06:47:24Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=socat -pkgver=1.7.2.1 +pkgver=1.7.2.2 pkgrel=1 pkgdesc='Multipurpose relay' url='http://www.dest-unreach.org/socat/' @@ -12,11 +12,10 @@ license=('GPL2') arch=('i686' 'x86_64' 'mips64el') depends=('readline' 'openssl') source=("http://www.dest-unreach.org/socat/download/${pkgname}-${pkgver}.tar.gz") -sha1sums=('6e3328cc409550b2367efa8028fe4436e84eb490') +sha1sums=('588294c17373d52a8ac877dcd599ef26f14b110b') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure \ --prefix=/usr \ --mandir=/usr/share/man \ @@ -26,6 +25,5 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install } diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD index ca5e880db..8a2413b2f 100644 --- a/extra/sqlite/PKGBUILD +++ b/extra/sqlite/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 182667 2013-04-12 14:07:12Z andyrtr $ +# $Id: PKGBUILD 186040 2013-05-20 18:16:41Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase="sqlite" pkgname=('sqlite' 'sqlite-tcl') -_amalgamationver=3071602 +_amalgamationver=3071700 _docver=${_amalgamationver} #_docver=3071601 -pkgver=3.7.16.2 +pkgver=3.7.17 pkgrel=1 pkgdesc="A C library that implements an SQL database engine" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with http://www.sqlite.org/2013/sqlite-autoconf-$_amalgamationver.tar.gz license.txt) options=('!libtool' '!emptydirs') -sha1sums=('85bf857cf86f34831d55d7ba97606dba581b8d62' +sha1sums=('e31958e56b1d7bef9433b1ff2e875c8c290d37f4' 'f34f6daa4ab3073d74e774aad21d66878cf26853') build() { diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD index c7eb2b598..a5a36561f 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 182098 2013-04-06 21:41:54Z stephane $ +# $Id: PKGBUILD 186427 2013-05-26 09:26:08Z bluewind $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=subversion pkgver=1.7.9 -pkgrel=1 +pkgrel=6 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64' 'mips64el') license=('APACHE') -depends=('neon' 'apr-util' 'sqlite' 'file' 'serf') +depends=('neon' 'apr-util' 'sqlite' 'file' 'serf' 'systemd') optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \ 'python2: for some hook scripts' 'java-environment') #'ruby: for some hook scripts') -makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment' +makedepends=('krb5' 'apache' 'python2' 'perl>=5.18' 'swig' 'java-runtime' 'java-environment' 'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') [ "$CARCH" = "mips64el" ] && \ makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' @@ -22,22 +22,18 @@ url="http://subversion.apache.org/" provides=('svn') options=('!makeflags' '!libtool' '!emptydirs') install=${pkgname}.install -source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc} - svnserve +source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2 #{,.asc} svn svnserve.conf svnserve.tmpfiles svnserve.service subversion.rpath.fix.patch) -sha1sums=('453757bae78a800997559f2232483ab99238ec1e' - '5ce5adc5f5cae5a2d569a89b5e4498623feae84a' - '64ba3e6ebafc08ac62f59d788f7a825fdce69573' - '73b36c046c09cec2093354911c89e3ba8056af6c' - 'ad117bf3b2a838a9a678a93fd8db1a066ad46c41' - '00cc36e69077a8c45674ead6dd62a7647b3a3b6d' - '9f6790d842cf3e0228b007483a43e39a42724068' - '3d1e28408a9abb42af2e531adc0d01ce21acfad6') - +md5sums=('8d532025771a67c06c23f299699f056f' + 'a0db6dd43af33952739b6ec089852630' + 'c459e299192552f61578f3438abf0664' + 'bb2857eceafcfac35dde39dcffad2314' + 'e8020c7a1d1a0c47091b5fdd034f81c5' + '6b4340ba9d8845cd8497e013ae01be3f') build() { cd "${srcdir}/${pkgname}-${pkgver}" export PYTHON=/usr/bin/python2 @@ -93,8 +89,7 @@ package() { ## svnserve ... - # ... iniscript/xinetd - install -D -m 755 "${srcdir}"/svnserve "${pkgdir}"/etc/rc.d/svnserve + # xinetd install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn # ... systemd diff --git a/extra/subversion/svnserve b/extra/subversion/svnserve deleted file mode 100755 index 670fee742..000000000 --- a/extra/subversion/svnserve +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/svnserve - -PID=`pidof -o %PPID /usr/bin/svnserve` -case "$1" in - start) - stat_busy "Starting svnserve" - if [ -z "$PID" ]; then - if [ -n "$SVNSERVE_USER" ]; then - su -s '/bin/sh' $SVNSERVE_USER -c "/usr/bin/svnserve -d $SVNSERVE_ARGS" & - else - /usr/bin/svnserve -d $SVNSERVE_ARGS & - fi - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon svnserve - stat_done - fi - ;; - stop) - stat_busy "Stopping svnserve" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon svnserve - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/extra/syslog-ng/PKGBUILD b/extra/syslog-ng/PKGBUILD index 2a4cc6fce..3c54082b4 100644 --- a/extra/syslog-ng/PKGBUILD +++ b/extra/syslog-ng/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 179615 2013-03-08 18:57:03Z dreisner $ +# $Id: PKGBUILD 185556 2013-05-15 00:48:48Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Eric Bélanger <eric@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=syslog-ng pkgver=3.4.1 -pkgrel=2 +pkgrel=3 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities" arch=('i686' 'x86_64') license=('GPL2') @@ -14,8 +14,7 @@ depends=('awk' 'eventlog' 'glib2' 'libcap' 'openssl' 'systemd') makedepends=('flex' 'pkg-config' 'python2') optdepends=('logrotate: for rotating log files') options=('!libtool') -backup=('etc/syslog-ng/modules.conf' - 'etc/syslog-ng/scl.conf' +backup=('etc/syslog-ng/scl.conf' 'etc/syslog-ng/syslog-ng.conf' 'etc/logrotate.d/syslog-ng') install=$pkgname.install @@ -33,6 +32,7 @@ build() { --prefix=/usr \ --sysconfdir=/etc/syslog-ng \ --libexecdir=/usr/lib \ + --sbindir=/usr/bin \ --localstatedir=/var/lib/syslog-ng \ --datadir=/usr/share/syslog-ng \ --with-pidfile-dir=/run \ @@ -50,4 +50,6 @@ package() { install -dm755 "$pkgdir/var/lib/syslog-ng" "$pkgdir/etc/syslog-ng/patterndb.d" install -Dm644 "$srcdir/syslog-ng.conf" "$pkgdir/etc/syslog-ng/syslog-ng.conf" install -Dm644 "$srcdir/syslog-ng.logrotate" "$pkgdir/etc/logrotate.d/syslog-ng" + + sed -i 's,/sbin/,/bin/,' "$pkgdir/usr/lib/systemd/system/syslog-ng.service" } diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD index b16987670..8cfeadcbc 100644 --- a/extra/system-config-printer/PKGBUILD +++ b/extra/system-config-printer/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 185094 2013-05-11 04:02:37Z eric $ +# $Id: PKGBUILD 186929 2013-06-01 08:46:45Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=system-config-printer pkgver=1.4.1 -pkgrel=1 +pkgrel=3 pkgdesc="A CUPS printer configuration tool and status applet" url="http://cyberelk.net/tim/software/system-config-printer/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('systemd' 'pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'libusb-compat' - 'gnome-icon-theme' 'python2-notify' 'python2-gobject' 'dbus-glib' 'gtk3') +depends=('pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'dbus-glib' + 'gnome-icon-theme' 'python2-notify' 'python2-gobject' 'gtk3') makedepends=('intltool' 'xmlto' 'docbook-xsl' 'desktop-file-utils') optdepends=('gnome-keyring: password management') replaces=('system-config-printer-common' 'system-config-printer-gnome') @@ -34,10 +34,11 @@ build() { --sysconfdir=/etc \ --with-udev-rules - make + make udevhelperdir=/usr/lib/udev } package() { cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" udevhelperdir=/usr/lib/udev \ + udevrulesdir=/usr/lib/udev/rules.d install } diff --git a/extra/tcpdump/PKGBUILD b/extra/tcpdump/PKGBUILD index 171c06763..c7a65c864 100644 --- a/extra/tcpdump/PKGBUILD +++ b/extra/tcpdump/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184005 2013-04-30 18:42:55Z giovanni $ +# $Id: PKGBUILD 185812 2013-05-19 11:54:46Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=tcpdump pkgver=4.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="A tool for network monitoring and data acquisition" arch=('i686' 'x86_64' 'mips64el') url="http://www.tcpdump.org" @@ -13,7 +13,7 @@ depends=('libpcap' 'openssl') source=("http://www.tcpdump.org/release/${pkgname}-${pkgver}.tar.gz" 'tcpdump_duplicate_executable.patch') md5sums=('6f75aabcffd012f73bd7c331bb5d8232' - '96c116e5ed51759a029bb6c236d63178') + '01379e4a12a208ce951c6c2abe80300f') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -22,6 +22,7 @@ build() { patch -Np1 -i "${srcdir}/tcpdump_duplicate_executable.patch" ./configure --prefix=/usr \ + --sbindir=/usr/bin \ --enable-ipv6 make } diff --git a/extra/tcpdump/tcpdump_duplicate_executable.patch b/extra/tcpdump/tcpdump_duplicate_executable.patch index bb3e60f1a..f3efb6d40 100644 --- a/extra/tcpdump/tcpdump_duplicate_executable.patch +++ b/extra/tcpdump/tcpdump_duplicate_executable.patch @@ -1,6 +1,6 @@ ---- a/Makefile.in 2012-06-12 18:56:20.000000000 +0200 -+++ b/Makefile.in 2012-06-13 08:41:09.000000000 +0200 -@@ -409,7 +409,6 @@ +--- a/Makefile.in 2013-03-24 22:49:18.000000000 +0100 ++++ b/Makefile.in 2013-05-19 13:44:29.000000000 +0200 +@@ -326,7 +326,6 @@ [ -d $(DESTDIR)$(sbindir) ] || \ (mkdir -p $(DESTDIR)$(sbindir); chmod 755 $(DESTDIR)$(sbindir)) $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG) diff --git a/extra/telepathy-idle/PKGBUILD b/extra/telepathy-idle/PKGBUILD index 93507bbfc..8a726cd20 100644 --- a/extra/telepathy-idle/PKGBUILD +++ b/extra/telepathy-idle/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183634 2013-04-25 18:08:44Z ioni $ +# $Id: PKGBUILD 186515 2013-05-28 09:58:49Z ioni $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> # Contributor: Samuel Mendes <heka.lok@gmail.com> pkgname=telepathy-idle -pkgver=0.1.15 +pkgver=0.1.16 pkgrel=1 pkgdesc="An IRC connection manager for Telepathy" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ depends=('telepathy-glib') makedepends=('libxslt' 'python2') install=telepathy-idle.install source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('56f960ed1d9ed0c01e0b9f7eb68dbebe') +md5sums=('afabda908a798aac3a427f4564af113a') build() { cd $pkgname-$pkgver diff --git a/extra/telepathy-kde-accounts-kcm/PKGBUILD b/extra/telepathy-kde-accounts-kcm/PKGBUILD index fd9e78d72..614224917 100644 --- a/extra/telepathy-kde-accounts-kcm/PKGBUILD +++ b/extra/telepathy-kde-accounts-kcm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183062 2013-04-17 06:09:00Z andrea $ +# $Id: PKGBUILD 186175 2013-05-21 22:00:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-accounts-kcm _pkgname=ktp-accounts-kcm -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="KCM Module for configuring Telepathy Instant Messaging Accounts" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ groups=('kde-telepathy') conflicts=('telepathy-kde-accounts-kcm-plugins') replaces=('telepathy-kde-accounts-kcm-plugins') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('a6ba149da9a52423a41fe99704e57344d384b1cc') +sha1sums=('fc71170f6f7f417b9cd0f4da3cb54ff70e66406e') build() { mkdir build diff --git a/extra/telepathy-kde-approver/PKGBUILD b/extra/telepathy-kde-approver/PKGBUILD index dc8ab8ad2..63c7defc4 100644 --- a/extra/telepathy-kde-approver/PKGBUILD +++ b/extra/telepathy-kde-approver/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183131 2013-04-17 17:57:15Z eric $ +# $Id: PKGBUILD 186177 2013-05-21 22:01:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-approver _pkgname=ktp-approver -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="KDE Channel Approver for Telepathy" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('1ccb773a14fa480e7e4c14611bc6d8a95e970e8e') +sha1sums=('996fabdc858bb48be7b5c277f0a88c0fb357ee8c') build() { mkdir build diff --git a/extra/telepathy-kde-auth-handler/PKGBUILD b/extra/telepathy-kde-auth-handler/PKGBUILD index 6acf90197..b23052552 100644 --- a/extra/telepathy-kde-auth-handler/PKGBUILD +++ b/extra/telepathy-kde-auth-handler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183133 2013-04-17 18:23:20Z eric $ +# $Id: PKGBUILD 186179 2013-05-21 22:01:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-auth-handler _pkgname=ktp-auth-handler -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="Provide UI/KWallet Integration For Passwords and SSL Errors on Account Connect" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals' 'qjson') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('c3cc980dced0a7d63b287c382cec05fb9ef0348a') +sha1sums=('a27fb07682fb2ce7dde15a40688c12b3d8f2299d') build() { mkdir build diff --git a/extra/telepathy-kde-common-internals/PKGBUILD b/extra/telepathy-kde-common-internals/PKGBUILD index 540a69f78..d07c8f6ba 100644 --- a/extra/telepathy-kde-common-internals/PKGBUILD +++ b/extra/telepathy-kde-common-internals/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183068 2013-04-17 06:14:39Z andrea $ +# $Id: PKGBUILD 186195 2013-05-21 22:02:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-common-internals _pkgname=ktp-common-internals -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="Common components for KDE-Telepathy" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('kdelibs' 'telepathy-logger-qt' 'telepathy-mission-control') makedepends=('cmake' 'automoc4' 'boost' 'doxygen') install=${pkgname}.install source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('47f99b56e2faa6ef7c760f2112a7b10445f9c709') +sha1sums=('06fb5a5353f973e254c894be33de79b28089cbc5') build() { mkdir build diff --git a/extra/telepathy-kde-contact-list/PKGBUILD b/extra/telepathy-kde-contact-list/PKGBUILD index a47e7f087..adcb867d8 100644 --- a/extra/telepathy-kde-contact-list/PKGBUILD +++ b/extra/telepathy-kde-contact-list/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183065 2013-04-17 06:12:27Z andrea $ +# $Id: PKGBUILD 186182 2013-05-21 22:01:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-contact-list _pkgname=ktp-contact-list -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="Telepathy contact list application" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4' 'boost') groups=('kde-telepathy') install=${pkgname}.install source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('0fb7888effd4e9a8f584dfbdcce31e088fbe71de') +sha1sums=('fe971a74ab966faea0680b6231c545754b9e00cf') build() { mkdir build diff --git a/extra/telepathy-kde-contact-runner/PKGBUILD b/extra/telepathy-kde-contact-runner/PKGBUILD index 391ed90b7..2c4a547d6 100644 --- a/extra/telepathy-kde-contact-runner/PKGBUILD +++ b/extra/telepathy-kde-contact-runner/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183135 2013-04-17 18:25:34Z eric $ +# $Id: PKGBUILD 186184 2013-05-21 22:01:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-contact-runner _pkgname=ktp-contact-runner -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="KRunner plugin for KDE Telepathy" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('1acb3f1371008040abf3a75d39a61fbe9f580821') +sha1sums=('98c21256a81b18955628b3c645e36391c1ffca4a') build() { mkdir build diff --git a/extra/telepathy-kde-desktop-applets/PKGBUILD b/extra/telepathy-kde-desktop-applets/PKGBUILD index 1d228d835..88b275e56 100644 --- a/extra/telepathy-kde-desktop-applets/PKGBUILD +++ b/extra/telepathy-kde-desktop-applets/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183137 2013-04-17 18:33:27Z eric $ +# $Id: PKGBUILD 186186 2013-05-21 22:01:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-desktop-applets _pkgname=ktp-desktop-applets -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="The KDE-Telepathy Plasma desktop applets" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ groups=('kde-telepathy') conflicts=('telepathy-kde-contact-applet' 'telepathy-kde-presence-applet') replaces=('telepathy-kde-contact-applet' 'telepathy-kde-presence-applet') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('78cf1e37fbaf2af2b3c14df81dde7417a5bd7c07') +sha1sums=('b0273d52657a31ba56168a4e4db2f56f6c81e2fd') build() { mkdir build diff --git a/extra/telepathy-kde-filetransfer-handler/PKGBUILD b/extra/telepathy-kde-filetransfer-handler/PKGBUILD index 431f0701d..67901433b 100644 --- a/extra/telepathy-kde-filetransfer-handler/PKGBUILD +++ b/extra/telepathy-kde-filetransfer-handler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183140 2013-04-17 18:34:04Z eric $ +# $Id: PKGBUILD 186188 2013-05-21 22:02:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-filetransfer-handler _pkgname=ktp-filetransfer-handler -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="Telepathy file transfer handler" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('66e365cf5ec60233d04869570cc89ad70eacb214') +sha1sums=('79bb46d90a3a981cadb2cc2f84832ef91e11deeb') build() { mkdir build diff --git a/extra/telepathy-kde-integration-module/PKGBUILD b/extra/telepathy-kde-integration-module/PKGBUILD index 02605f9dc..b1664d516 100644 --- a/extra/telepathy-kde-integration-module/PKGBUILD +++ b/extra/telepathy-kde-integration-module/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183141 2013-04-17 18:34:18Z eric $ +# $Id: PKGBUILD 186190 2013-05-21 22:02:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-integration-module _pkgname=ktp-kded-integration-module -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="Sits in KDED and takes care of various bits of system integration like setting user to auto-away or handling connection errors" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('c5121ed5ba4f7ea0e7885b0aa7a42008c3ec6930') +sha1sums=('1aa1b8597acff39f0549ed9f716d733de4d77b63') build() { mkdir build diff --git a/extra/telepathy-kde-send-file/PKGBUILD b/extra/telepathy-kde-send-file/PKGBUILD index 888539576..d7cd51288 100644 --- a/extra/telepathy-kde-send-file/PKGBUILD +++ b/extra/telepathy-kde-send-file/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183143 2013-04-17 18:35:12Z eric $ +# $Id: PKGBUILD 186192 2013-05-21 22:02:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-send-file _pkgname=ktp-send-file -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="A File manager plugin to launch a file transfer job with a specified contact" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') groups=('kde-telepathy') install=${pkgname}.install source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('48ece90d7f2614aa133b8304d4891e0151d26f00') +sha1sums=('51734ea448b6a3338a28fc9e9fc7d371453ed9a6') build() { mkdir build diff --git a/extra/telepathy-kde-text-ui/PKGBUILD b/extra/telepathy-kde-text-ui/PKGBUILD index bce31e164..0c73a3158 100644 --- a/extra/telepathy-kde-text-ui/PKGBUILD +++ b/extra/telepathy-kde-text-ui/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183145 2013-04-17 18:35:36Z eric $ +# $Id: PKGBUILD 186213 2013-05-22 06:19:49Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-text-ui _pkgname=ktp-text-ui -pkgver=0.6.1 +pkgver=0.6.2.1 pkgrel=1 pkgdesc="Telepathy handler for Text Chats" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ license=('GPL') depends=('telepathy-kde-contact-list' 'telepathy-logger-qt') makedepends=('cmake' 'automoc4' 'boost') groups=('kde-telepathy') -source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('6dd32df14da326bcaeed8b68a25634b2731f0b6b') +source=("http://download.kde.org/stable/kde-telepathy/0.6.2/src/${_pkgname}-${pkgver}.tar.bz2") +sha1sums=('71951b929ad3caa6a0f46e338bd669c7e542ac15') build() { mkdir build diff --git a/extra/telepathy-logger-qt/PKGBUILD b/extra/telepathy-logger-qt/PKGBUILD index 85c4cc481..031a5f0fd 100644 --- a/extra/telepathy-logger-qt/PKGBUILD +++ b/extra/telepathy-logger-qt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182024 2013-04-05 09:11:10Z andrea $ +# $Id: PKGBUILD 186224 2013-05-22 07:20:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: George Brooke <george+arch.aur@george-brooke.co.uk> pkgname=telepathy-logger-qt -pkgver=0.6.0 +pkgver=0.8.0 pkgrel=1 pkgdesc="Qt bindings for telepathy logger" arch=('i686' 'x86_64' 'mips64el') @@ -11,8 +11,8 @@ url='https://projects.kde.org/projects/extragear/network/telepathy/telepathy-log license=('GPL') depends=('telepathy-qt' 'telepathy-logger' 'qt-gstreamer') makedepends=('automoc4' 'cmake' 'python2' 'doxygen' 'boost') -source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('3e58f7a25ad192d9a62b52784492b317b77a5ffa') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('a61650a06e5b8f6d452d6120ee402567439ef687') build() { mkdir build diff --git a/extra/telepathy-mission-control/PKGBUILD b/extra/telepathy-mission-control/PKGBUILD index ccf3a5f7f..578888af4 100644 --- a/extra/telepathy-mission-control/PKGBUILD +++ b/extra/telepathy-mission-control/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 169980 2012-10-30 23:00:04Z heftig $ +# $Id: PKGBUILD 186517 2013-05-28 10:02:46Z ioni $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Ju Liu <liuju86 at gmail dot com> # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> # Contributor: Andreas Zwinkau <beza1e1@web.de> pkgname=telepathy-mission-control -pkgver=5.14.0 +pkgver=5.14.1 pkgrel=1 pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers." arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ makedepends=('libxslt' 'python2') install=telepathy-mission-control.install options=('!libtool') source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('483fa8860891815a540ecf1bb9155122') +md5sums=('e06fb0399ec435e59c74d79a2ace8a2d') build() { cd "$pkgname-$pkgver" diff --git a/extra/tftp-hpa/PKGBUILD b/extra/tftp-hpa/PKGBUILD index 439ac4a14..ca202c1bc 100644 --- a/extra/tftp-hpa/PKGBUILD +++ b/extra/tftp-hpa/PKGBUILD @@ -1,46 +1,42 @@ -# $Id: PKGBUILD 166932 2012-09-22 13:11:31Z thomas $ +# $Id: PKGBUILD 186770 2013-05-31 05:42:13Z eric $ # Maintainer: dorphell <dorphell@archlinux.org> # Contributor: Jose Javier <jojapa@terra.es> pkgname=tftp-hpa pkgver=5.2 -pkgrel=3 +pkgrel=4 pkgdesc="Official tftp server" arch=('i686' 'x86_64' 'mips64el') url="http://www.kernel.org/pub/software/network/tftp/tftp-hpa/" license=('BSD') depends=('readline>=6.0.00') conflicts=('netkit-tftp') -backup=('etc/conf.d/tftpd') source=(http://www.kernel.org/pub/software/network/tftp/tftp-hpa/$pkgname-$pkgver.tar.gz - tftpd.rc - tftpd.conf LICENSE tftpd.service tftpd.socket tftp-hpa-0.49-fortify-strcpy-crash.patch) md5sums=('3de3038e7c2bf6fc5d496825893ac8e7' - '83fbb6f52205d95951a3c059e5351ca2' - 'f41f484f94e91175e9183e872a2bff3b' '6ce21e27b6fdc1a1adf85c81e42aeecf' - '165b98f814f74568635a720e674d7f18' + 'ffeac33192eac4c526657b6789cace21' 'a23369ea33be8b4a5427ec2cfc5373dd' '22e8629ef19bc276a102c5d4d284c1bd') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" +prepare() { + cd ${pkgname}-${pkgver} # fix #28103 patch -Np1 -i ../tftp-hpa-0.49-fortify-strcpy-crash.patch - ./configure --prefix=/usr --mandir=/usr/share/man --without-tcpwrappers +} + +build() { + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr --mandir=/usr/share/man --sbindir=/usr/bin --without-tcpwrappers make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make INSTALLROOT="${pkgdir}" install - install -d "${pkgdir}/etc/rc.d" install -d "${pkgdir}/srv/tftp" - install -m755 "${srcdir}/tftpd.rc" "${pkgdir}/etc/rc.d/tftpd" - install -D -m644 "${srcdir}/tftpd.conf" "${pkgdir}/etc/conf.d/tftpd" install -D -m655 "${srcdir}/tftpd.service" "${pkgdir}/usr/lib/systemd/system/tftpd.service" install -D -m655 "${srcdir}/tftpd.socket" "${pkgdir}/usr/lib/systemd/system/tftpd.socket" install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" diff --git a/extra/tftp-hpa/tftpd.conf b/extra/tftp-hpa/tftpd.conf deleted file mode 100644 index a4329f608..000000000 --- a/extra/tftp-hpa/tftpd.conf +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to TFTPD -# -TFTPD_ARGS="-l -s /srv/tftp/" diff --git a/extra/tftp-hpa/tftpd.rc b/extra/tftp-hpa/tftpd.rc deleted file mode 100755 index 0222d1693..000000000 --- a/extra/tftp-hpa/tftpd.rc +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -TFTPD_ARGS= -[ -f /etc/conf.d/tftpd ] && . /etc/conf.d/tftpd - -PID=$(pidof -o %PPID /usr/sbin/in.tftpd) -case "$1" in - start) - stat_busy "Starting TFTPD" - [ -z "$PID" ] && /usr/sbin/in.tftpd ${TFTPD_ARGS} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon tftpd - stat_done - fi - ;; - stop) - stat_busy "Stopping TFTPD" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon tftpd - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/tftp-hpa/tftpd.service b/extra/tftp-hpa/tftpd.service index 62562343d..293e0370b 100644 --- a/extra/tftp-hpa/tftpd.service +++ b/extra/tftp-hpa/tftpd.service @@ -2,7 +2,7 @@ Description=hpa's original TFTP daemon [Service] -ExecStart=/usr/sbin/in.tftpd -s /srv/tftp/ +ExecStart=/usr/bin/in.tftpd -s /srv/tftp/ StandardInput=socket StandardOutput=inherit StandardError=journal diff --git a/extra/thinkfinger/PKGBUILD b/extra/thinkfinger/PKGBUILD index 431c3b4d0..20de4c0ba 100644 --- a/extra/thinkfinger/PKGBUILD +++ b/extra/thinkfinger/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 158572 2012-05-04 23:57:24Z allan $ +# $Id: PKGBUILD 185609 2013-05-15 22:56:59Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: François Charette <francois.archlinux.org> # Contributor: Damir Perisa <damir.archlinux.org> @@ -6,13 +6,12 @@ pkgname=thinkfinger pkgver=0.3 -pkgrel=6 +pkgrel=7 pkgdesc="A driver for the SGS Thomson Microelectronics fingerprint reader found in most IBM/Lenovo ThinkPads" url="http://thinkfinger.sourceforge.net/" arch=('i686' 'x86_64' 'mips64el') license=("GPL") depends=('pam' 'libusb-compat') -install=thinkfinger.install options=('!libtool' 'emptydirs') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" 'thinkfinger-uinput-hack.patch' @@ -22,7 +21,7 @@ md5sums=('588565233bcbea5ff0a7f5314361c380' '93c80f342329a5bd40f5f324fe670225') build() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver # Patch from Ubuntu: see http://bugs.archlinux.org/task/12580 patch -p0 -i "${srcdir}"/thinkfinger-uinput-hack.patch @@ -30,12 +29,13 @@ build() { patch -p1 -i "${srcdir}"/gcc46.patch ./configure --prefix=/usr \ - --with-birdir=/etc/pam_thinkfinger + --sbindir=/usr/bin \ + --with-birdir=/etc/pam_thinkfinger make } package() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver # create dir to store fingerprints install -d $pkgdir/etc/pam_thinkfinger diff --git a/extra/thinkfinger/thinkfinger.install b/extra/thinkfinger/thinkfinger.install deleted file mode 100644 index bb1f6dde0..000000000 --- a/extra/thinkfinger/thinkfinger.install +++ /dev/null @@ -1,4 +0,0 @@ -post_install() { - echo "==> To use thinkfinger, add 'uinput' to the MODULES=() in /etc/rc.conf." - echo " More Infos: http://wiki.archlinux.org/index.php/Thinkfinger" -} diff --git a/extra/tomboy/PKGBUILD b/extra/tomboy/PKGBUILD index 29f155d28..05b159ff6 100644 --- a/extra/tomboy/PKGBUILD +++ b/extra/tomboy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183462 2013-04-21 22:12:14Z heftig $ +# $Id: PKGBUILD 185355 2013-05-13 17:25:26Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=tomboy -pkgver=1.14.0 +pkgver=1.14.1 pkgrel=1 pkgdesc="Desktop note-taking application for Linux and Unix" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils') options=('!libtool' '!emptydirs' '!makeflags') install=tomboy.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('14c1e7f2c7d67d8603a7de95830c3b159779909e8a74c5a6ca9e08a2508fea18') +sha256sums=('f9e81fd9c9a9180e8ddcb4b9237ead0c842aa5b5ac21af87e97939e5015af018') build() { export MONO_SHARED_DIR="$srcdir/.wabi" diff --git a/extra/totem-plparser/PKGBUILD b/extra/totem-plparser/PKGBUILD index 1a687c454..8fdb6f0a2 100644 --- a/extra/totem-plparser/PKGBUILD +++ b/extra/totem-plparser/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183463 2013-04-21 22:12:16Z heftig $ +# $Id: PKGBUILD 185506 2013-05-14 12:10:02Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=totem-plparser -pkgver=3.4.4 +pkgver=3.4.5 pkgrel=1 url="http://www.gnome.org" pkgdesc="Totem playlist parser library" @@ -13,7 +13,7 @@ depends=('gmime' 'libsoup' 'libarchive' 'libquvi') makedepends=('intltool' 'gobject-introspection') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/totem-pl-parser/${pkgver%.*}/totem-pl-parser-$pkgver.tar.xz) -sha256sums=('b821e812da3f3e42d2f831296b4031c60a615d29857781971578ce2c0c807457') +sha256sums=('a573e078692b48895cb5b041385b2760d63e2ee496c8d499eccfa942e7c79f89') build() { cd totem-pl-parser-$pkgver diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD index e68efbb37..29125de86 100644 --- a/extra/totem/PKGBUILD +++ b/extra/totem/PKGBUILD @@ -1,25 +1,35 @@ -# $Id: PKGBUILD 183323 2013-04-21 22:06:42Z heftig $ +# $Id: PKGBUILD 186680 2013-05-30 12:54:23Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgbase=totem pkgname=('totem' 'totem-plugin') -pkgver=3.8.0 -pkgrel=1 +pkgver=3.8.2 +pkgrel=2 pkgdesc="GNOME3 movie player based on GStreamer" url="http://www.gnome.org" arch=('i686' 'x86_64' 'mips64el') license=(GPL2 custom) depends=(gst-plugins-base gst-plugins-good totem-plparser desktop-file-utils iso-codes libpeas hicolor-icon-theme gnome-icon-theme gsettings-desktop-schemas dconf clutter-gst - clutter-gtk python2-gobject gst-plugins-bad) -makedepends=(intltool libnautilus-extension vala grilo pylint dbus-glib libzeitgeist itstool docbook-xsl) + clutter-gtk python-gobject python-xdg gst-plugins-bad) +makedepends=(intltool libnautilus-extension vala grilo dbus-glib libzeitgeist + itstool docbook-xsl python-pylint) [ "$CARCH" != "mips64el" ] && makedepends+=('lirc-utils') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz - browser-plugins.ini) -sha256sums=('74c73a5decb69572cb182005b144493c2f6e7f48d4c57851e6da33e8e76fb039' - 'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e') + browser-plugins.ini bugreport.patch) +sha256sums=('eda9e0a016bb2ac14f7cd7c8c03b8ee1ab3f1b3ba6558f65c64514e5d2583e01' + 'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e' + '30481dab7e21b66257e3238f5a8b708e1a5c4797d7da904f7ebaba4c2c2ef167') + + +prepare() { + cd "$pkgbase-$pkgver" + + # Make compatible with Python 3 and Gstreamer 1.0 + patch -Np1 -i ../bugreport.patch +} build() { cd "$pkgbase-$pkgver" @@ -30,6 +40,10 @@ build() { --disable-static \ --enable-python \ --enable-nautilus + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } @@ -40,7 +54,6 @@ package_totem() { 'gst-libav: Extra media codecs' 'lirc-utils: Infrared Remote Control plugin' 'grilo-plugins: Browse sidebar (remote media)' - 'pyxdg: opensubtitles plugin' 'libzeitgeist: Zeitgeist plugin') cd "$pkgbase-$pkgver" @@ -49,9 +62,6 @@ package_totem() { rm -r "$pkgdir/usr/lib/mozilla" rm "$pkgdir/usr/lib/totem/totem-plugin-viewer" - sed -i "s|#!/usr/bin/python$|#!/usr/bin/python2|" \ - $pkgdir/usr/lib/totem/totem/totem-bugreport.py - install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem/COPYING" } @@ -65,7 +75,7 @@ package_totem-plugin() { plugindir=/usr/lib/mozilla/plugins \ xptdir=/usr/lib/mozilla/plugins \ DESTDIR="$pkgdir" install - + install -Dm644 ../browser-plugins.ini "$pkgdir/etc/totem/browser-plugins.ini" install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem-plugin/COPYING" diff --git a/extra/totem/bugreport.patch b/extra/totem/bugreport.patch new file mode 100644 index 000000000..13bcfe2e5 --- /dev/null +++ b/extra/totem/bugreport.patch @@ -0,0 +1,22 @@ +diff -u -r totem-3.8.2/data/totem-bugreport.py totem-3.8.2-bugreport/data/totem-bugreport.py +--- totem-3.8.2/data/totem-bugreport.py 2013-03-13 16:34:44.000000000 +0100 ++++ totem-3.8.2-bugreport/data/totem-bugreport.py 2013-05-14 13:54:04.243699665 +0200 +@@ -4,7 +4,7 @@ + from gi.repository import Gtk + + # Get the GStreamer version +-if os.system ('gst-typefind-0.10 --version') == 0: ++if os.system ('gst-typefind-1.0 --version') == 0: + # List the formats of the last files played + last_visited = 0 + recent_manager = Gtk.RecentManager.get_default () +@@ -15,7 +15,7 @@ + last = recent.get_uri_display () + + if last != None: +- file_handle = os.popen ('gst-typefind-0.10 "%s"' % (last)) ++ file_handle = os.popen ('gst-typefind-1.0 "%s"' % (last)) + parts = file_handle.read ().split (' ') + date = datetime.fromtimestamp (last_visited) +- print 'Listened to a "%s" file on %s' % (parts.pop ().strip (), date.isoformat ()) ++ print('Listened to a "%s" file on %s' % (parts.pop ().strip (), date.isoformat ())) diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD index a95b9c42d..b01553131 100644 --- a/extra/transmission/PKGBUILD +++ b/extra/transmission/PKGBUILD @@ -1,20 +1,18 @@ -# $Id: PKGBUILD 179032 2013-03-01 18:56:31Z andrea $ +# $Id: PKGBUILD 186895 2013-05-31 15:05:32Z foutrelis $ # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgbase=transmission pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt') pkgver=2.77 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url="http://www.transmissionbt.com/" license=('MIT') makedepends=('gtk3' 'intltool' 'curl' 'qt4' 'libevent') source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz - transmissiond transmissiond.conf transmission.systemd + transmission.systemd transmission.tmpfiles) md5sums=('60c0e77a1852656215f7102a437b2a3d' - '7d6186ee2a852ae3d44980f05063e194' - 'db72b02fee139e8ab416324e6c044d76' '5c289c8901221a94be74665368ab5c2c' '23f2320361ad54373c3a4551ef634fe8') @@ -30,7 +28,6 @@ build() { package_transmission-cli() { pkgdesc="Fast, easy, and free BitTorrent client (CLI tools, daemon and web client)" depends=('curl' 'libevent') - backup=('etc/conf.d/transmissiond') install=transmission-cli.install cd $pkgbase-$pkgver @@ -40,8 +37,6 @@ package_transmission-cli() { make -C "$dir" DESTDIR="$pkgdir" install done - install -D -m755 "$srcdir/transmissiond" "$pkgdir/etc/rc.d/transmissiond" - install -D -m644 "$srcdir/transmissiond.conf" "$pkgdir/etc/conf.d/transmissiond" install -D -m644 "$srcdir/transmission.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/transmission.conf" install -D -m644 "$srcdir/transmission.systemd" "$pkgdir/usr/lib/systemd/system/transmission.service" install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-cli/COPYING" diff --git a/extra/transmission/transmissiond b/extra/transmission/transmissiond deleted file mode 100644 index ea3d770f9..000000000 --- a/extra/transmission/transmissiond +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/transmissiond - -PID=`pidof -o %PPID /usr/bin/transmission-daemon` -case "$1" in - start) - stat_busy "Starting Transmission Daemon" - [ -z "$PID" ] && su -l -s /bin/sh -c "/usr/bin/transmission-daemon $TRANS_ARGS" "${TRANS_USER:-transmission}" - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon transmissiond - stat_done - fi - ;; - stop) - stat_busy "Stopping Transmission Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon transmissiond - stat_done - fi - ;; - restart) - $0 stop - while [ ! -z "$PID" -a -d "/proc/$PID" ]; do sleep 1; done - $0 start - ;; - reload) - stat_busy "Reloading config" - [ ! -z "$PID" ] && kill -HUP $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - *) - echo "usage: $0 {start|stop|restart|reload}" -esac -exit 0 diff --git a/extra/transmission/transmissiond.conf b/extra/transmission/transmissiond.conf deleted file mode 100644 index 45a9fd51d..000000000 --- a/extra/transmission/transmissiond.conf +++ /dev/null @@ -1,4 +0,0 @@ -# example configuration file - -# TRANS_USER="transmission" -# TRANS_ARGS="" diff --git a/extra/ucommon/PKGBUILD b/extra/ucommon/PKGBUILD index a2d47808f..f8c5ecf60 100644 --- a/extra/ucommon/PKGBUILD +++ b/extra/ucommon/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 184356 2013-05-06 19:20:44Z eric $ +# $Id: PKGBUILD 186289 2013-05-23 22:11:35Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=ucommon -pkgver=6.0.4 +pkgver=6.0.5 pkgrel=1 pkgdesc="A light-weight C++ library to facilitate using C++ design patterns" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('GPL3' 'LGPL3') depends=('openssl') options=('!libtool') source=("http://ftp.gnu.org/pub/gnu/commoncpp/$pkgname-$pkgver.tar.gz"{,.sig}) -md5sums=('b20a43a8cba901c2145778b3d653eef6' +md5sums=('afbcf89264e9c96dccf4104bab52a9c0' 'SKIP') build() { diff --git a/extra/udisks/PKGBUILD b/extra/udisks/PKGBUILD index 0d52af9fc..d2ec948de 100644 --- a/extra/udisks/PKGBUILD +++ b/extra/udisks/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172088 2012-11-27 19:16:47Z dreisner $ +# $Id: PKGBUILD 186141 2013-05-21 09:11:20Z tpowa $ # Maintainer: Tom Gundersen <teg@jklm.no> pkgname=udisks pkgver=1.0.4 -pkgrel=6 +pkgrel=8 pkgdesc="Disk Management Service" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/udisks" @@ -21,6 +21,9 @@ build() { patch -p1 < ../drop-pci-db.patch make + # fix mdadm location + sed -i -e 's#/sbin/mdadm#/usr/bin/mdadm#g' \ + "${srcdir}/${pkgname}-${pkgver}"/data/80-udisks.rules } package() { @@ -32,6 +35,10 @@ package() { mv "${pkgdir}"/lib/udev "${pkgdir}"/usr/lib/ rm -r "${pkgdir}"/lib + # move umount helper to /usr/bin + mv "${pkgdir}"/sbin/umount.udisks "${pkgdir}"/usr/bin/ + rm -r "${pkgdir}"/sbin + install -Dm644 "$srcdir/udisks.service" "$pkgdir/usr/lib/systemd/system/udisks.service" echo "SystemdService=udisks.service" \ >> "$pkgdir/usr/share/dbus-1/system-services/org.freedesktop.UDisks.service" diff --git a/extra/udisks2/PKGBUILD b/extra/udisks2/PKGBUILD index fd8ac016a..becc1ec6c 100644 --- a/extra/udisks2/PKGBUILD +++ b/extra/udisks2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183464 2013-04-21 22:12:17Z heftig $ +# $Id: PKGBUILD 186142 2013-05-21 09:11:21Z tpowa $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=udisks2 pkgver=2.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Disk Management Service, version 2" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/udisks" @@ -22,6 +22,9 @@ build() { --with-systemdsystemunitdir=/usr/lib/systemd/system \ --localstatedir=/var --disable-static make + # fix mdadm location + sed -i -e 's#/sbin/mdadm#/usr/bin/mdadm#g' \ + "${srcdir}/udisks-${pkgver}"/data/80-udisks2.rules } package() { diff --git a/extra/vamp-plugin-sdk/PKGBUILD b/extra/vamp-plugin-sdk/PKGBUILD index 096446ee9..b537013c9 100644 --- a/extra/vamp-plugin-sdk/PKGBUILD +++ b/extra/vamp-plugin-sdk/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 164737 2012-08-04 10:47:06Z schiv $ +# $Id: PKGBUILD 185824 2013-05-19 13:06:56Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Orivej Desh <smpuj@bk.ru> pkgname=vamp-plugin-sdk -pkgver=2.4 -pkgrel=1.1 +pkgver=2.5 +_dir=690 +pkgrel=1 pkgdesc="The Vamp audio analysis plug-in system" arch=('i686' 'x86_64' 'mips64el') url="http://www.vamp-plugins.org/" license=('BSD') depends=('gcc-libs' 'libsndfile') -#options=('!libtool') -source=("http://code.soundsoftware.ac.uk/attachments/download/517/$pkgname-$pkgver.tar.gz") -md5sums=('4bd75ca4515c141cd8776bdb59066261') +options=('!libtool') +source=("http://code.soundsoftware.ac.uk/attachments/download/$_dir/$pkgname-$pkgver.tar.gz") +md5sums=('199872997f74951f6769b982bf0d0646') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/varnish/PKGBUILD b/extra/varnish/PKGBUILD index 1c4c944fb..0905938e4 100644 --- a/extra/varnish/PKGBUILD +++ b/extra/varnish/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 165520 2012-08-22 17:11:02Z dreisner $ +# $Id: PKGBUILD 185368 2013-05-13 17:51:30Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Douglas Soares de Andrade @@ -6,37 +6,34 @@ pkgname=varnish pkgver=3.0.3 -pkgrel=2 +pkgrel=3 pkgdesc="High-performance HTTP accelerator" arch=('i686' 'x86_64' 'mips64el') url="http://www.varnish-cache.org/" license=('BSD') depends=('gcc' 'libedit' 'pcre') -backup=('etc/conf.d/varnish' - 'etc/varnish/default.vcl') +backup=('etc/varnish/default.vcl') install=$pkgname.install options=('!libtool') source=("http://repo.varnish-cache.org/source/$pkgname-$pkgver.tar.gz" - "$pkgname.conf.d" - "rc.$pkgname" varnish-vcl-reload varnish.service) md5sums=('714310c83fdbd2061d897dacd3f63d8b' - '3b563d2d9bd74a819fdb116d69d022f0' - '40b4c83b3ad225ed2f4bd7e677fe41a2' '03196dee7fc68e75069393d52c370762' - '1adf5282d111a9e00e99786045451016') + 'a59b17d8e3066abcf3dd7755a2212dd4') build() { cd "$pkgname-$pkgver" - # disable JIT compilation for now, as it's crashy on VCL reload + # disable JIT compilation, as it's crashy crashy (bug in PCRE) + # this is flagged out and disabled by default in $nextrelease of Varnish. sed -i '/pcre_study/ s/PCRE_STUDY_JIT_COMPILE/0/' lib/libvarnish/vre.c ./configure \ --prefix=/usr \ --sysconfdir=/etc \ - --localstatedir=/var/lib + --localstatedir=/var/lib \ + --sbindir=/usr/bin make } @@ -44,14 +41,7 @@ build() { package() { make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install - # reload helper install -m755 "$srcdir/varnish-vcl-reload" "$pkgdir/usr/bin" - - # sysvinit - install -Dm755 "$srcdir/rc.$pkgname" "$pkgdir/etc/rc.d/$pkgname" - install -Dm644 "$srcdir/$pkgname.conf.d" "$pkgdir/etc/conf.d/$pkgname" - - # systemd install -Dm644 "$srcdir/$pkgname.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service" # license diff --git a/extra/varnish/rc.varnish b/extra/varnish/rc.varnish deleted file mode 100644 index 352f07dbd..000000000 --- a/extra/varnish/rc.varnish +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/varnish - -pidfile=/run/varnish.pid -if [[ -r $pidfile ]]; then - read -r PID < "$pidfile" - if [[ ! -d /proc/$PID ]]; then - # stale pidfile - unset PID - rm -f "$pidfile" - fi -fi - -case $1 in - start) - stat_busy "Starting Varnish Reverse Proxy" - if /usr/sbin/varnishd $VARNISHD_OPTS -P "$pidfile"; then - add_daemon varnish - stat_done - else - stat_fail - exit 1 - fi - ;; - stop) - stat_busy "Stopping Varnish Reverse Proxy" - if [[ $PID ]] && kill $PID &>/dev/null; then - rm_daemon varnish - stat_done - else - stat_fail - exit 1 - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - reload) - status "Recompiling and Reloading VCL" varnish-vcl-reload $VARNISH_CFG - ;; - *) - echo "usage: $0 {start|stop|restart|reload}" - ;; -esac diff --git a/extra/varnish/varnish.conf.d b/extra/varnish/varnish.conf.d deleted file mode 100644 index 4cf40c4fc..000000000 --- a/extra/varnish/varnish.conf.d +++ /dev/null @@ -1,11 +0,0 @@ -# -# Command line options to varnishd -# - -VARNISH_CFG="/etc/varnish/default.vcl" - -VARNISHD_OPTS="-a 0.0.0.0:80 \ - -f $VARNISH_CFG \ - -T localhost:6082 \ - -s malloc,64M - -u nobody -g nobody" diff --git a/extra/varnish/varnish.service b/extra/varnish/varnish.service index d5b0aa66d..851e32140 100644 --- a/extra/varnish/varnish.service +++ b/extra/varnish/varnish.service @@ -3,7 +3,7 @@ Description=Web Application Accelerator After=network.target [Service] -ExecStart=/usr/sbin/varnishd -a 0.0.0.0:80 -f /etc/varnish/default.vcl -T localhost:6082 -s malloc,64M -u nobody -g nobody -F +ExecStart=/usr/bin/varnishd -a 0.0.0.0:80 -f /etc/varnish/default.vcl -T localhost:6082 -s malloc,64M -u nobody -g nobody -F ExecReload=/usr/bin/varnish-vcl-reload [Install] diff --git a/extra/vde2/PKGBUILD b/extra/vde2/PKGBUILD index 929e8686c..392586b3d 100644 --- a/extra/vde2/PKGBUILD +++ b/extra/vde2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 169040 2012-10-17 10:21:21Z allan $ +# $Id: PKGBUILD 186164 2013-05-21 13:35:09Z tpowa $ # Contributor: Sergej Pupykin # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=vde2 pkgver=2.3.2 -pkgrel=2.1 +pkgrel=4 pkgdesc="Virtual Distributed Ethernet for emulators like qemu" url="http://sourceforge.net/projects/vde/" license=("GPL" "LGPL" "CUSTOM") @@ -15,24 +15,20 @@ source=(http://downloads.sourceforge.net/vde/$pkgname-$pkgver.tar.bz2 dhcpd.conf.sample iptables.rules.sample vde-config.sample - vde-connection.sample - vde.conf - vde.rc) + vde-connection.sample) install=vde2.install options=(!libtool !makeflags) build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/vde2 \ + ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --libexecdir=/usr/lib/vde2 \ --enable-experimental make } package() { cd $srcdir/$pkgname-$pkgver - make prefix=$pkgdir/usr sysconfdir=$pkgdir/etc libexecdir=$pkgdir/usr/lib/vde2 install - install -D -m 755 ../vde.rc $pkgdir/etc/rc.d/vde - install -D -m 644 ../vde.conf $pkgdir/etc/conf.d/vde + make prefix=$pkgdir/usr sysconfdir=$pkgdir/etc sbindir=$pkgdir/usr/bin libexecdir=$pkgdir/usr/lib/vde2 install install -D -m 644 ../vde-config.sample $pkgdir/etc/vde/vde-config.sample install -D -m 644 ../vde-connection.sample $pkgdir/etc/vde/vde-connection.sample install -D -m 644 ../dhcpd.conf.sample $pkgdir/usr/share/vde2/dhcpd.conf.sample @@ -40,11 +36,13 @@ package() { # install slirp license install -D -m 644 COPYING.slirpvde $pkgdir/usr/share/licenses/vde2/COPYING.slirpvde } - md5sums=('46fbc5f97f03dc517aa3b2c9d9ea6628' '7d9bc56d2e561d849e915000d1c0f269' 'a920123fc620bcedbccb703a8d1bdc55' 'cb8ace28e8efd4dad128be4be71b3b07' - '63033c33565e2030541c5e05e9d9b063' - 'a22730f051f4840da4a3162a88ff8156' - '6c7dc01bc2f039f0ff1682ee70d3d1da') + '63033c33565e2030541c5e05e9d9b063') +md5sums=('46fbc5f97f03dc517aa3b2c9d9ea6628' + '7d9bc56d2e561d849e915000d1c0f269' + 'a920123fc620bcedbccb703a8d1bdc55' + 'f47d3372382dc9d67c1174d2796729fe' + '63033c33565e2030541c5e05e9d9b063') diff --git a/extra/vde2/vde-config.sample b/extra/vde2/vde-config.sample index c5a5b7d88..f7e0660a4 100644 --- a/extra/vde2/vde-config.sample +++ b/extra/vde2/vde-config.sample @@ -6,7 +6,7 @@ VDE_NUMPORTS="32" # Number of ports (default 32) VDE_HUB="no" # [yes|no] Make the switch act as a hub VDE_FSTP="no" # [yes|no] Activate the fast spanning tree protocol VDE_MAC="" # Set the Switch MAC address -VDE_PRIOTIRY="" # Set the priority for FST (MAC extension) +VDE_PRIORITY="" # Set the priority for FST (MAC extension) VDE_HASHSIZE="" # Hash table size # Options from datasock module @@ -32,4 +32,4 @@ SLIRP="no" # [yes|no] enable/disable SLIRP daemon support SLIRP_DHCP="no" # [yes|no] turn on the DHCP server for the network autoconfiguration of all the units connected to the VDE SLIRP_NETWORK="" # specify the network address (default 10.0.2.0) # other options to parse to slirpvde -SLIRP_OPTIONS=""
\ No newline at end of file +SLIRP_OPTIONS="" diff --git a/extra/vde2/vde.conf b/extra/vde2/vde.conf deleted file mode 100644 index bc61dceda..000000000 --- a/extra/vde2/vde.conf +++ /dev/null @@ -1,11 +0,0 @@ -# Set options for a vde daemon script -# -# Array for your vde config files, eg.: "internal-net external-net" -# You need a config file in /etc/vde/ with the same name. -# Sample config file provided: /etc/vde/vde-config.sample -VDE_CONFIG="" - -# Array for your dpipe connections, eg.: "connect-switches" -# You need a config file in /etc/vde/ with the same name. -# Sample config file provided: /etc/vde/vde-connection.sample -VDE_CONNECTION=""
\ No newline at end of file diff --git a/extra/vde2/vde.rc b/extra/vde2/vde.rc deleted file mode 100755 index b368f9955..000000000 --- a/extra/vde2/vde.rc +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/vde - -case "$1" in - start) - # bring up all defined profiles - for i in $VDE_CONFIG; do - [ -e /etc/vde/$i ] && . /etc/vde/$i - stat_busy "Starting vde_switch $i" - # get options from profile - [ -n "$VDE_NUMPORTS" ] && OPTIONS="-n $VDE_NUMPORTS" - [ "$VDE_HUB" = "yes" ] && OPTIONS="$OPTIONS -x" - [ "$VDE_FSTP" = "yes" ] && OPTIONS="$OPTIONS -F" - [ -n "$VDE_MAC" ] && OPTIONS="$OPTIONS --macaddr $VDE_MAC" - [ -n "$VDE_PRIORITY" ] && OPTIONS="$OPTIONS --priority $VDE_PRIORITY" - [ -n "$VDE_HASH" ] && OPTIONS="$OPTIONS --hashsize $VDE_HASH" - [ -n "$VDE_SOCK" ] && OPTIONS="$OPTIONS -s $VDE_SOCK" - [ -n "$VDE_SOCK_MODE" ] && OPTIONS="$OPTIONS -m $VDE_SOCK_MODE" - [ -n "$VDE_SOCK_GROUP" ] && OPTIONS="$OPTIONS -g $VDE_SOCK_GROUP" - [ -n "$VDE_MANAGEMENT_SOCK" ] && OPTIONS="$OPTIONS -M $VDE_MANAGEMENT_SOCK" - [ -n "$VDE_MANAGEMENT_SOCK_MODE" ] && OPTIONS="$OPTIONS --mgmtmode $VDE_MANAGEMENT_SOCK_MODE" - [ -n "$VDE_TAP" ] && OPTIONS="$OPTIONS -t $VDE_TAP" - [ -n "$VDE_OPTIONS" ] && OPTIONS="$OPTIONS $VDE_OPTIONS" - vde_switch $OPTIONS -p /var/run/vde-$i.pid -daemon &>/dev/null - [ -n "$VDE_SOCK" -a -n "$VDE_SOCK_GROUP" ] && chgrp "$VDE_SOCK_GROUP" "$VDE_SOCK" - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - if [ "$SLIRP" = "yes" ]; then - stat_busy "Starting slirpvde for $i" - [ "$SLIRP_DHCP" = "yes" ] && SP_OPTIONS="-D" - [ -n "$SLIRP_NETWORK" ] && SP_OPTIONS="$SP_OPTIONS -n $SLIRP_NETWORK" - [ -n "$SLIRP_OPTIONS" ] && SP_OPTIONS="$SP_OPTIONS $SLIRP_OPTIONS" - [ -n "$VDE_SOCK" ] && SP_OPTIONS="$SP_OPTIONS -s $VDE_SOCK" - [ -n "$VDE_SOCK_MODE" ] && SP_OPTIONS="$SP_OPTIONS -m $VDE_SOCK_MODE" - [ -n "$VDE_SOCK_GROUP" ] && SP_OPTIONS="$SP_OPTIONS -g $VDE_SOCK_GROUP" - slirpvde $SP_OPTIONS -p /var/run/slirpvde-$i.pid -daemon &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - unset OPTIONS - unset SP_OPTIONS - fi - done - for i in $VDE_CONNECTION; do - # connect specified vde_switches - if [ "$(grep ^vde_plug /etc/vde/$i)" ]; then - stat_busy "Connecting VDE switches $i together..." - while read j; do - switch="$(echo $j | grep ^vde_plug)" - [ -n "$switch" ] && (dpipe $switch &) - done </etc/vde/$i - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - fi - done - add_daemon vde - ;; - stop) - # kill vde_plug if switches are connected - [ -n "$VDE_CONNECTION" ] && killall vde_plug >/dev/null 2>&1 - for i in $VDE_CONFIG; do - [ -e /etc/vde/$i ] && . /etc/vde/$i - if [ "$SLIRP" = "yes" ]; then - stat_busy "Stopping slirpvde for $i" - kill $(cat /var/run/slirpvde-$i.pid) &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - rm /var/run/slirpvde-$i.pid &> /dev/null - fi - stat_busy "Stopping vde_switch $i" - kill $(cat /var/run/vde-$i.pid) &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - rm /var/run/vde-$i.pid &> /dev/null - stat_busy "Removing $i vde sockets" - rm -rf $VDE_SOCK $VDE_MANAGEMENT_SOCK - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - done - unset OPTIONS - unset SP_OPTIONS - [ -e /var/run/vde/gmon.out ] && rm /var/run/vde/gmon.out - rm_daemon vde - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/vde2/vde2.install b/extra/vde2/vde2.install index 74e1710ff..bf538e01f 100644 --- a/extra/vde2/vde2.install +++ b/extra/vde2/vde2.install @@ -1,5 +1,4 @@ post_install() { - echo "Change /etc/conf.d/vde to your needs." echo "vde config files should be placed in /etc/vde, sample files are provided." echo "iptables and dhcpd sample files have been installed to '/usr/share/vde2'." echo "Merge those examples, if needed to the according config files." diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index 43b3b8dce..7128a15fa 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -10,7 +10,7 @@ _patchlevel=918 __hgrev=c61da758a9a2 _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('custom:vim') url="http://www.vim.org" diff --git a/extra/vinagre/PKGBUILD b/extra/vinagre/PKGBUILD index 01c484075..029ea78ef 100644 --- a/extra/vinagre/PKGBUILD +++ b/extra/vinagre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 183466 2013-04-21 22:12:20Z heftig $ +# $Id: PKGBUILD 185450 2013-05-14 10:15:54Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: lp76 <l.peduto@gmail.com> pkgname=vinagre -pkgver=3.8.1 +pkgver=3.8.2 pkgrel=1 pkgdesc="A VNC Client for the GNOME Desktop" arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ makedepends=('docbook-xsl' 'intltool' 'rdesktop' 'openssh' 'itstool') groups=('gnome-extra') options=('!emptydirs' '!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('64f9bcd08f33e5e767565909792094ad78d7b400f16dc24e0a5699c7e87da000') +sha256sums=('eda05e6abfd3d575f8b954c1e442d28639ae13b67fc285ef585b8cd78da014e8') build() { cd $pkgname-$pkgver diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 0b5a3ed0e..89e79b0ef 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184445 2013-05-06 19:40:05Z foutrelis $ +# $Id: PKGBUILD 186492 2013-05-27 19:38:42Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc -pkgver=2.0.6 -pkgrel=2 +pkgver=2.0.7 +pkgrel=1 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/vlc/" @@ -13,10 +13,9 @@ license=('LGPL2.1' 'GPL2') depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt4' 'libproxy' 'sdl_image' 'libdvdnav' 'libtiger' 'lua51' 'libmatroska' 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' - 'libshout' 'libmad' 'libmpeg2' 'libmodplug' 'libass' - 'xcb-util-keysyms') + 'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms') makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs' - 'fluidsynth' 'libdc1394' 'libavc1394' + 'libdc1394' 'libavc1394' 'libcaca' 'librsvg' 'portaudio' 'libgme' 'xosd' 'twolame' 'aalib' 'libmtp' 'libdvdcss' 'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager' 'opus' 'libssh2' @@ -47,7 +46,6 @@ optdepends+=('libcaca: for colored ASCII art video output' 'xosd: for xosd support' 'aalib: for ASCII art plugin' 'libmtp: for MTP devices support' - 'fluidsynth: for synthesizer MIDI FluidSynth' 'smbclient: for SMB access plugin' 'libcdio: for audio CD playback support' 'ttf-freefont: for subtitle font ' @@ -61,7 +59,7 @@ backup=('usr/share/vlc/lua/http/.hosts' options=('!libtool' '!emptydirs') install=vlc.install source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz") -md5sums=('b45be633c71dca04ca7d6c3d64dd728b') +md5sums=('3b0e465b0990097b65abaf3e25589957') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/vpnc/PKGBUILD b/extra/vpnc/PKGBUILD index 3cb20ae21..b9f449d4a 100644 --- a/extra/vpnc/PKGBUILD +++ b/extra/vpnc/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 164259 2012-07-29 01:13:10Z dreisner $ +# $Id: PKGBUILD 185907 2013-05-19 18:45:48Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=vpnc _vpncver=0.5.3 -_git=1b65c39e3cdebb89ce5c75f05d44a0519a67ede6 -pkgver=$_vpncver.svn516 -pkgrel=3 +_git=d2c5a77f3f0ea6ad80fc59158127d63ede81a6cb +pkgver=$_vpncver.svn527 +pkgrel=1 pkgdesc="VPN client for cisco3000 VPN Concentrators" url="http://www.unix-ag.uni-kl.de/~massar/vpnc/" license=('GPL') @@ -17,8 +17,8 @@ source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz" "http://git.infradead.org/users/dwmw2/vpnc-scripts.git/blob_plain/$_git:/vpnc-script" 'vpnc.conf') backup=('etc/vpnc/default.conf') -md5sums=('2118c5ccc464250c0892be57dbfabdf7' - '6293c15ef6e7a3365ed7add5e336b806' +md5sums=('db1908bc5cf2b70334c9f74a597a4623' + '70198474faf36a84beaa11136f6c4d9c' 'a3f4e0cc682f437e310a1c86ae198e45') mktarball() { @@ -52,7 +52,7 @@ build() { package() { cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" PREFIX=/usr install + make DESTDIR="$pkgdir" PREFIX=/usr SBINDIR=/usr/bin install install -Dm644 "$srcdir"/vpnc.conf "$pkgdir"/etc/vpnc/default.conf install -Dm755 "$srcdir"/vpnc-script "$pkgdir"/etc/vpnc/vpnc-script diff --git a/extra/vte3/PKGBUILD b/extra/vte3/PKGBUILD index b9073b50d..29bb4fc41 100644 --- a/extra/vte3/PKGBUILD +++ b/extra/vte3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183325 2013-04-21 22:06:44Z heftig $ +# $Id: PKGBUILD 185394 2013-05-13 18:51:37Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=vte3 pkgname=(vte3 vte-common) -pkgver=0.34.4 +pkgver=0.34.5 pkgrel=1 pkgdesc="Virtual Terminal Emulator widget for use with GTK3" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ options=('!libtool' '!emptydirs') makedepends=('intltool' 'gobject-introspection' 'gtk3') url="http://www.gnome.org" source=(http://download.gnome.org/sources/vte/${pkgver::4}/vte-$pkgver.tar.xz) -sha256sums=('477de8f0b8473e1cb27c9488e278df44d16fc384d1753c5c3961e3f0417860bd') +sha256sums=('8847fb75b620a94ba62c2ffd9e1653396978106f294574ba24a19ced259a7351') build() { cd "vte-$pkgver" diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD index aaf6b12e2..e95bccc34 100644 --- a/extra/webkitgtk/PKGBUILD +++ b/extra/webkitgtk/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184446 2013-05-06 19:40:06Z foutrelis $ +# $Id: PKGBUILD 185357 2013-05-13 17:34:56Z heftig $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=webkitgtk pkgname=('webkitgtk3') -pkgver=2.0.1 -pkgrel=2 +pkgver=2.0.2 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://webkitgtk.org/" license=('custom') @@ -12,7 +12,7 @@ makedepends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'g options=('!libtool' '!emptydirs') source=(http://webkitgtk.org/releases/$pkgbase-$pkgver.tar.xz 0001-https-bugs.webkit.org-show_bug.cgi-id-112141.patch) -sha256sums=('6303552a39d7912725d75bc55f530cdb99171fb873e299798d0bb932d6ea76cb' +sha256sums=('c3685032545eb4c23f3f56826817783a6963ad59bd7bbf806705059b3d8caeb2' '7b4c1419342bafcca642d7a41abe92713810401591906b081fe476169cb9a3aa') prepare() { @@ -47,11 +47,7 @@ build() { extra="--disable-fast-malloc --disable-optimizations" fi - # Suppress a *lot* of gcc 4.8 warnings - export CPPFLAGS="$CPPFLAGS -Wno-unused-local-typedefs" - - ../configure --prefix=/usr --libexecdir=/usr/lib/webkitgtk3 \ - --enable-introspection $extra + ../configure --prefix=/usr --libexecdir=/usr/lib/webkitgtk3 --enable-introspection $extra make all stamp-po } diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD index d67f26041..cc5c661b3 100644 --- a/extra/weechat/PKGBUILD +++ b/extra/weechat/PKGBUILD @@ -1,30 +1,24 @@ -# $Id: PKGBUILD 180587 2013-03-23 23:09:44Z td123 $ +# $Id: PKGBUILD 186429 2013-05-26 09:26:13Z bluewind $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: lucke <lucke at o2 dot pl> pkgname=weechat -pkgver=0.4.0 -pkgrel=3 +pkgver=0.4.1 +pkgrel=2 pkgdesc="Fast, light and extensible IRC client (curses UI)" arch=('i686' 'x86_64' 'mips64el') url="http://www.weechat.org/" license=('GPL') depends=('gnutls' 'curl' 'libgcrypt') -makedepends=('cmake' 'pkgconfig' 'perl' 'python2' 'lua' 'tcl>=8.6.0' 'ruby' 'aspell' 'guile') +makedepends=('cmake' 'pkg-config' 'perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell' 'guile') optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell' 'guile') options=('!libtool') -source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2" - 'ruby-2.0.0-crash-fix.diff') -md5sums=('b2e10ca1e3a72142fcc8d58c7c774b1b' - '8bafb0ec603af018e2d66155640685b4') +source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2") +md5sums=('071d6f1cd21c892cae126af21095c43f') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # fix: https://bugs.archlinux.org/task/34342 - # original commit: http://git.savannah.gnu.org/gitweb/?p=weechat.git;a=commit;h=4fdbb83a079f24a742633fd4d02084911580c19c - patch -Np1 -i ${srcdir}/ruby-2.0.0-crash-fix.diff - mkdir build cd build cmake .. -DPREFIX=/usr \ diff --git a/extra/weechat/ruby-2.0.0-crash-fix.diff b/extra/weechat/ruby-2.0.0-crash-fix.diff deleted file mode 100644 index bfc816ade..000000000 --- a/extra/weechat/ruby-2.0.0-crash-fix.diff +++ /dev/null @@ -1,76 +0,0 @@ -X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=weechat.git;a=blobdiff_plain;f=src%2Fplugins%2Fruby%2Fweechat-ruby-api.c;h=101caec961829de03f8097edc63f497eab99aaa3;hp=bbc2fbcbe3c5290a8a975c4676a85a8c7e0998b7;hb=4fdbb83a079f24a742633fd4d02084911580c19c;hpb=55e58811b3df451db4f95b1035a39f5659788989 - -diff --git a/src/plugins/ruby/weechat-ruby-api.c b/src/plugins/ruby/weechat-ruby-api.c -index bbc2fbc..101caec 100644 ---- a/src/plugins/ruby/weechat-ruby-api.c -+++ b/src/plugins/ruby/weechat-ruby-api.c -@@ -1333,28 +1333,21 @@ weechat_ruby_api_config_new_option (VALUE class, VALUE config_file, - VALUE description, VALUE string_values, - VALUE min, VALUE max, VALUE default_value, - VALUE value, VALUE null_value_allowed, -- VALUE function_check_value, -- VALUE data_check_value, -- VALUE function_change, -- VALUE data_change, -- VALUE function_delete, -- VALUE data_delete) -+ VALUE callbacks) - { - char *c_config_file, *c_section, *c_name, *c_type, *c_description; - char *c_string_values, *c_default_value, *c_value; - char *c_function_check_value, *c_data_check_value, *c_function_change; - char *c_data_change, *c_function_delete, *c_data_delete, *result; - int c_min, c_max, c_null_value_allowed; -- VALUE return_value; -+ VALUE function_check_value, data_check_value, function_change, data_change; -+ VALUE function_delete, data_delete, return_value; - - API_FUNC(1, "config_new_option", API_RETURN_EMPTY); - if (NIL_P (config_file) || NIL_P (section) || NIL_P (name) || NIL_P (type) - || NIL_P (description) || NIL_P (string_values) || NIL_P (min) - || NIL_P (max) || NIL_P (default_value) || NIL_P (value) -- || NIL_P (null_value_allowed) || NIL_P (function_check_value) -- || NIL_P (data_check_value) || NIL_P (function_change) -- || NIL_P (data_change) || NIL_P (function_delete) -- || NIL_P (data_delete)) -+ || NIL_P (null_value_allowed) || NIL_P (callbacks)) - API_WRONG_ARGS(API_RETURN_EMPTY); - - Check_Type (config_file, T_STRING); -@@ -1368,12 +1361,21 @@ weechat_ruby_api_config_new_option (VALUE class, VALUE config_file, - Check_Type (default_value, T_STRING); - Check_Type (value, T_STRING); - Check_Type (null_value_allowed, T_FIXNUM); -- Check_Type (function_check_value, T_STRING); -- Check_Type (data_check_value, T_STRING); -- Check_Type (function_change, T_STRING); -- Check_Type (data_change, T_STRING); -- Check_Type (function_delete, T_STRING); -- Check_Type (data_delete, T_STRING); -+ Check_Type (callbacks, T_ARRAY); -+ -+ /* -+ * due to a Ruby limitation (15 arguments max by function), we receive the -+ * the callbacks in an array of 6 strings (3 callbacks + 3 data) -+ */ -+ if (RARRAY_LEN(callbacks) != 6) -+ API_WRONG_ARGS(API_RETURN_EMPTY); -+ -+ function_check_value = rb_ary_entry (callbacks, 0); -+ data_check_value = rb_ary_entry (callbacks, 1); -+ function_change = rb_ary_entry (callbacks, 2); -+ data_change = rb_ary_entry (callbacks, 3); -+ function_delete = rb_ary_entry (callbacks, 4); -+ data_delete = rb_ary_entry (callbacks, 5); - - c_config_file = StringValuePtr (config_file); - c_section = StringValuePtr (section); -@@ -5915,7 +5917,7 @@ weechat_ruby_api_init (VALUE ruby_mWeechat) - API_DEF_FUNC(config_new, 3); - API_DEF_FUNC(config_new_section, 14); - API_DEF_FUNC(config_search_section, 2); -- API_DEF_FUNC(config_new_option, 17); -+ API_DEF_FUNC(config_new_option, 12); - API_DEF_FUNC(config_search_option, 3); - API_DEF_FUNC(config_string_to_boolean, 1); - API_DEF_FUNC(config_option_reset, 2); diff --git a/extra/wireshark/01_patch-automake-1.13.diff b/extra/wireshark/01_patch-automake-1.13.diff deleted file mode 100644 index cf03fa060..000000000 --- a/extra/wireshark/01_patch-automake-1.13.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.in.init 2013-02-02 22:11:27.140322526 +0100 -+++ configure.in 2013-02-02 22:11:42.863854681 +0100 -@@ -1960,7 +1960,7 @@ - sinclude(asn1/Custom.m4) dnl - ifdef(_CUSTOM_ASN1_AC_OUTPUT_,, define(_CUSTOM_ASN1_AC_OUTPUT_, )) dnl - --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - AC_OUTPUT( - Makefile - doxygen.cfg diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index 94d554263..4e7d51f14 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 182116 2013-04-07 20:47:05Z guillaume $ +# $Id: PKGBUILD 186024 2013-05-20 14:35:40Z guillaume $ # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> pkgname=('wireshark-cli' 'wireshark-gtk') pkgbase=wireshark -pkgver=1.8.6 -pkgrel=2 +pkgver=1.8.7 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL2') makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' @@ -12,17 +12,13 @@ makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' url='http://www.wireshark.org/' options=(!libtool) source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2 - 01_patch-automake-1.13.diff 02_enable-version.diff) -sha256sums=('2722ed3e926c26648faec31a81b7881d829df85762c21794b9dd9e4f227331ea' - '388a9cf4c924c32a0f7ee8ffeaae060cdbf0c712bcc0032d5dfaa5717b217b80' +sha256sums=('5c7e429c1e410289b49d65a2e635e00c0becdcb56fe703a1d3e7b5e275fca842' 'dd71a9fc3443b5e586d9e50c31208d031f20d7b96cf72d9e4e0f02f2f175d00b') build() { cd "${srcdir}/${pkgbase}-${pkgver}" -# https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8202 - patch -p0 < ${srcdir}/01_patch-automake-1.13.diff patch -p0 < ${srcdir}/02_enable-version.diff ./autogen.sh diff --git a/extra/wireshark/wireshark.install b/extra/wireshark/wireshark.install index 69adcc4bc..001bd0c58 100644 --- a/extra/wireshark/wireshark.install +++ b/extra/wireshark/wireshark.install @@ -1,14 +1,14 @@ post_install() { /usr/bin/getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null - /usr/sbin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap + /usr/bin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap echo "NOTE: To run wireshark as normal user you have to add yourself into wireshark group" } post_upgrade() { /usr/bin/getent group wireshark >/dev/null 2>&1 || usr/sbin/groupadd -g 150 wireshark &>/dev/null - - /usr/sbin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap + + /usr/bin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap } post_remove() { diff --git a/extra/x2goserver/PKGBUILD b/extra/x2goserver/PKGBUILD index 44e9d531f..298458759 100644 --- a/extra/x2goserver/PKGBUILD +++ b/extra/x2goserver/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180593 2013-03-24 09:34:13Z andyrtr $ +# $Id: PKGBUILD 186036 2013-05-20 18:09:21Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Gerhard Brauer <gerbra@archlinux.de> @@ -7,8 +7,8 @@ # Contributor: Milan KnÞek <knizek@volny.cz> pkgname=x2goserver -pkgver=4.0.0.1 -pkgrel=1 +pkgver=4.0.0.2 +pkgrel=2 pkgdesc="Open source terminal server" arch=('i686' 'x86_64' 'mips64el') url="http://www.x2go.org/" @@ -19,13 +19,20 @@ makedepends=('man2html') options=('emptydirs') install=x2goserver.install backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') -source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz x2goserver.service) -md5sums=('85dc2a2d52e82eead744a51007155ff9' - 'b09799f9203150dc1277a56058be48a8') +source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz + x2goserver.service + revert.patch) +md5sums=('6b8cecfdd31a8877203f50d3666c265f' + 'f76081c01e40b6206895d194dc949707' + 'c487c31e7c0aa9a73323313007497764') build() { cd "${srcdir}/${pkgname}-${pkgver}" + # revert an upstream commit that breaks sessions showing up + # http://code.x2go.org/gitweb?p=x2goserver.git;a=commitdiff;h=011d14ae076ba6fec96cd1e019c4f82444ab0f9f + patch -Rp1 -i ${srcdir}/revert.patch + # -r option does not exist in Arch linux # (However, html man pages do not get installed anyway...) for Makefile in $(find . -type f -name Makefile); do @@ -43,15 +50,14 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make -j1 PREFIX=/usr DESTDIR="$pkgdir" install + make -j1 PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" install # systemd service file - only runs x2gocleansessions install -Dm 644 "$srcdir/x2goserver.service" "$pkgdir/usr/lib/systemd/system/x2goserver.service" # X2go homedir + printing spool dir - #install -dm 755 $pkgdir/var/lib/x2go install -dm 770 $pkgdir/var/lib/x2go - install -dm 755 $pkgdir/var/spool/x2go + install -dm 770 $pkgdir/var/spool/x2go # load fuse module at system start install -dm755 $pkgdir/lib/modules-load.d diff --git a/extra/x2goserver/revert.patch b/extra/x2goserver/revert.patch new file mode 100644 index 000000000..023bbd18c --- /dev/null +++ b/extra/x2goserver/revert.patch @@ -0,0 +1,152 @@ +From 011d14ae076ba6fec96cd1e019c4f82444ab0f9f Mon Sep 17 00:00:00 2001 +From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +Date: Sun, 19 May 2013 00:41:32 +0200 +Subject: [PATCH] Security fix for setgid wrapper x2gosqlitewrapper.c. + Hard-code path to x2gosqlitewrapper.pl during build via + defining a macro in the Makefile. Thanks to Richard + Weinberger for spotting this!!! + +--- + Makefile | 2 +- + debian/changelog | 3 +++ + debian/rules | 4 +-- + x2goserver/Makefile | 4 +-- + x2goserver/x2gosqlitewrapper.c | 54 +++------------------------------------- + 5 files changed, 12 insertions(+), 55 deletions(-) + +diff --git a/Makefile b/Makefile +index 3be40f9..588084f 100755 +--- a/Makefile ++++ b/Makefile +@@ -4,7 +4,7 @@ RM_FILE=rm -f + RM_DIR=rmdir -p --ignore-fail-on-non-empty + + DESTDIR= +-PREFIX=/usr/local ++PREFIX ?= /usr/local + ETCDIR=/etc/x2go + LIBDIR=$(PREFIX)/lib/x2go + SHAREDIR=$(PREFIX)/share/x2go +diff --git a/debian/changelog b/debian/changelog +index 470a502..2cf2dde 100644 +--- a/debian/changelog ++++ b/debian/changelog +@@ -12,6 +12,9 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low + * New upstream version (4.0.0.2): + - Use make_path from File::Path in x2godbadmin to create user directory if + not present. (Fixes: #200). ++ - Security fix for setgid wrapper x2gosqlitewrapper.c. Hard-code path to ++ x2gosqlitewrapper.pl during build via defining a macro in the Makefile. ++ Thanks to Richard Weinberger for spotting this!!! + /debian/control: + + Let x2goserver bin:package depend on xfonts-base and fontconfig. (Fixes: + #163). +diff --git a/debian/rules b/debian/rules +index b32e08d..5bb94b2 100755 +--- a/debian/rules ++++ b/debian/rules +@@ -1,10 +1,10 @@ + #!/usr/bin/make -f + + %: +- dh $@ ++ PREFIX=/usr dh $@ + + override_dh_auto_install: +- make -f Makefile build-arch ++ PREFIX=/usr make -f Makefile build-arch + + override_dh_auto_clean: + rm -fv x2gosqlitewrapper +diff --git a/x2goserver/Makefile b/x2goserver/Makefile +index 4287478..e9d56e6 100755 +--- a/x2goserver/Makefile ++++ b/x2goserver/Makefile +@@ -15,7 +15,7 @@ RM_FILE=rm -f + RM_DIR=rmdir -p --ignore-fail-on-non-empty + + DESTDIR= +-PREFIX=/usr/local ++PREFIX ?= /usr/local + ETCDIR=/etc/x2go + BINDIR=$(PREFIX)/bin + SBINDIR=$(PREFIX)/sbin +@@ -41,7 +41,7 @@ build: build-arch build-indep + build-arch: build_setgidwrappers + + build_setgidwrappers: +- $(CC) $(CFLAGS) $(LDFLAGS) -o x2gosqlitewrapper x2gosqlitewrapper.c ++ $(CC) $(CFLAGS) $(LDFLAGS) -DTRUSTED_BINARY=\"$(DESTDIR)$(LIBDIR)/x2gosqlitewrapper.pl\" -o x2gosqlitewrapper x2gosqlitewrapper.c + + build-indep: build_man2html + +diff --git a/x2goserver/x2gosqlitewrapper.c b/x2goserver/x2gosqlitewrapper.c +index a134efc..ad95eff 100644 +--- a/x2goserver/x2gosqlitewrapper.c ++++ b/x2goserver/x2gosqlitewrapper.c +@@ -21,58 +21,12 @@ + * + */ + +-#include <stdio.h> +-#include <stdlib.h> +-#include <unistd.h> +-#include <libgen.h> +-#include <errno.h> +- + int main( int argc, char *argv[] ) { +- char * x2gosqlitewrapper = NULL; +- size_t path_max; +- +-/* +- The following snippet is taken from the realpath manpage +-*/ +-#ifdef PATH_MAX +- path_max = PATH_MAX; +-#else +- path_max = pathconf (".", _PC_PATH_MAX); +- if (path_max <= 0){ +- path_max = 4096; +- } +-#endif +- { +- // allocate dynamic buffer in stack: this needs C99 or gnu?? +- char buffer[path_max]; +- ssize_t rvrl; +- int rvap; +- +- // resolve link of /proc/self/exe to find out where we are +- rvrl = readlink("/proc/self/exe", buffer, path_max); +- if(rvrl == -1){ +- perror("readlink(\"/proc/self/exe\",buffer,path_max)"); +- exit(EXIT_FAILURE); +- } +- if(rvrl >= path_max){ +- fprintf(stderr, "Could not resolve the path of this file using \"/proc/self/exe\". The path is too long (> %i)", path_max); +- exit(EXIT_FAILURE); +- } +- +- // derive the full path of x2gosqlitewrapper.pl from path of this binary +- rvap = asprintf(&x2gosqlitewrapper, "%s/%s", dirname(buffer), "x2gosqlitewrapper.pl"); +- if(rvap == -1){ +- fprintf(stderr, "Failed to allocate memory calling asprintf\n"); +- exit(EXIT_FAILURE); +- } +- +- // execute the script, running with user-rights of this binary +- execv(x2gosqlitewrapper, argv); + +- } ++ char x2gosqlitewrapper[] = TRUSTED_BINARY; + +- // ...fail +- fprintf(stderr, "Failed to execute %s: %s\n", x2gosqlitewrapper, strerror(errno)); +- return EXIT_FAILURE; ++ argv[0] = "x2gosqlitewrapper.pl"; ++ // execute the script, running with user-rights of this binary ++ execv(x2gosqlitewrapper, argv); + + } +-- +1.7.9.5 + diff --git a/extra/x2goserver/x2goserver.install b/extra/x2goserver/x2goserver.install index cac06dac8..223eaac62 100644 --- a/extra/x2goserver/x2goserver.install +++ b/extra/x2goserver/x2goserver.install @@ -39,7 +39,7 @@ post_install() { # fix permissions - see INSTALL file chown -R x2goprint:x2goprint /var/spool/x2go chmod 0770 /var/spool/x2go - + chown root:x2gouser /usr/lib/x2go/x2gosqlitewrapper chmod 2755 /usr/lib/x2go/x2gosqlitewrapper diff --git a/extra/x2goserver/x2goserver.service b/extra/x2goserver/x2goserver.service index 393d841c5..f06d39499 100644 --- a/extra/x2goserver/x2goserver.service +++ b/extra/x2goserver/x2goserver.service @@ -3,7 +3,7 @@ Description=x2go - remote desktop server After=syslog.target network.target [Service] -ExecStart=/usr/sbin/x2gocleansessions +ExecStart=/usr/bin/x2gocleansessions PIDFile=/run/x2goserver.pid [Install] diff --git a/extra/xf86-input-synaptics/PKGBUILD b/extra/xf86-input-synaptics/PKGBUILD index a79ae614a..842037d8b 100644 --- a/extra/xf86-input-synaptics/PKGBUILD +++ b/extra/xf86-input-synaptics/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 182039 2013-04-05 19:13:38Z andyrtr $ +# $Id: PKGBUILD 185760 2013-05-18 11:02:57Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Bächler <thomas@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xf86-input-synaptics -pkgver=1.7.0 +pkgver=1.7.1 pkgrel=1 pkgdesc="Synaptics driver for notebook touchpads" arch=('i686' 'x86_64' 'mips64el') @@ -22,7 +22,7 @@ options=(!libtool) backup=('etc/X11/xorg.conf.d/50-synaptics.conf') source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 add_tapbuttons.diff) -sha256sums=('d6f1ad0b0653dddbe2e2db7e2f06c1860e491045e87a6577b63568d65e5d0f0e' +sha256sums=('db5825660e1fb23190697f609bf75d4450fe707344a14298e1c9b47039bbb58e' '5298d3e871db3768b34cf8516d3f53f9291202e2ea5de3300256e1cd9119a1ec') build() { diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index 19c5ed42f..2f0f13e72 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182343 2013-04-08 15:23:26Z andyrtr $ +# $Id: PKGBUILD 186484 2013-05-27 13:17:23Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-intel -pkgver=2.21.6 +pkgver=2.21.8 pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -19,7 +19,7 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('c3ef371e72544350c878d5373b2e7f49b8a0e253f9b63cb1ce2881180b45f8d9') +sha256sums=('4d850c0515012ca370a72469dfbfa6161aa9ee5bb39779fab5f496f2d94acf8f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-openchrome/PKGBUILD b/extra/xf86-video-openchrome/PKGBUILD index 4a2d01826..5d38408b6 100644 --- a/extra/xf86-video-openchrome/PKGBUILD +++ b/extra/xf86-video-openchrome/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180937 2013-03-28 18:10:47Z andyrtr $ +# $Id: PKGBUILD 186307 2013-05-24 13:57:21Z andyrtr $ # Contributor: Paul Mattal <paul@mattal.com> # Maintainer: Juergen Hoetzel <juergen@hoetzel.info> pkgname=xf86-video-openchrome -pkgver=0.3.2 +pkgver=0.3.3 pkgrel=1 pkgdesc="X.Org Openchrome drivers" arch=(i686 x86_64) @@ -16,7 +16,7 @@ replaces=('openchrome' 'xf86-video-via') groups=('xorg-drivers' 'xorg') options=('!libtool' '!emptydirs' '!makeflags') source=(http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('e5be9a8200410b3e3e66349bab4c8acd1ead4402') +sha1sums=('1f7b23d4ed53417eda5c6730486b36812f469295') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xfce4-dict/PKGBUILD b/extra/xfce4-dict/PKGBUILD index 9dcac1ab6..5d68de766 100644 --- a/extra/xfce4-dict/PKGBUILD +++ b/extra/xfce4-dict/PKGBUILD @@ -1,41 +1,41 @@ -# $Id: PKGBUILD 157851 2012-04-30 04:20:17Z foutrelis $ +# $Id: PKGBUILD 186157 2013-05-21 10:21:01Z foutrelis $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=xfce4-dict -pkgver=0.6.0 -pkgrel=3 +pkgver=0.7.0 +pkgrel=1 pkgdesc="A dictionary plugin for the Xfce panel" arch=('i686' 'x86_64' 'mips64el') -license=('GPL2') url="http://goodies.xfce.org/projects/applications/xfce4-dict" +license=('GPL2') groups=('xfce4-goodies') -depends=('xfce4-panel' 'libxfcegui4' 'hicolor-icon-theme' 'librsvg') +depends=('xfce4-panel' 'librsvg' 'hicolor-icon-theme') makedepends=('intltool') provides=('xfce4-dict-plugin') conflicts=('xfce4-dict-plugin') replaces=('xfce4-dict-plugin') options=('!libtool') -install=${pkgname}.install -source=(http://archive.xfce.org/src/apps/xfce4-dict/0.6/xfce4-dict-${pkgver}.tar.bz2) -md5sums=('c371c5c0bbe45a2bfac336cfe01dfe01') +install=$pkgname.install +source=(http://archive.xfce.org/src/apps/$pkgname/0.7/$pkgname-$pkgver.tar.bz2) +sha256sums=('407fc0f02adf6ea85dec6993db1e222b548afcdd63a9e35ed2d70a42c9738e58') build() { - cd ${srcdir}/xfce4-dict-${pkgver} + cd "$srcdir/$pkgname-$pkgver" - # Work around DSO linking issue - LDFLAGS+=' -Wl,--copy-dt-needed-entries' - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-static \ - --disable-debug + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-static \ + --disable-debug make } package() { - cd ${srcdir}/xfce4-dict-${pkgver} - make DESTDIR=${pkgdir} install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/extra/xfce4-dict/xfce4-dict.install b/extra/xfce4-dict/xfce4-dict.install index 21b79d2d4..e4f8fd06c 100644 --- a/extra/xfce4-dict/xfce4-dict.install +++ b/extra/xfce4-dict/xfce4-dict.install @@ -3,9 +3,11 @@ post_install() { } post_upgrade() { - post_install $1 + post_install } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } + +# vim:set ts=2 sw=2 et: diff --git a/extra/xfce4-xkb-plugin/PKGBUILD b/extra/xfce4-xkb-plugin/PKGBUILD index eca650431..8571f0b4c 100644 --- a/extra/xfce4-xkb-plugin/PKGBUILD +++ b/extra/xfce4-xkb-plugin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 168753 2012-10-15 14:42:49Z foutrelis $ +# $Id: PKGBUILD 185421 2013-05-14 08:06:15Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: AndyRTR <andyrtr@archlinux.org> # Contributor: Tobias Kieslich <tobias (at) archlinux.org> pkgname=xfce4-xkb-plugin -pkgver=0.5.4.3 -pkgrel=3 +pkgver=0.5.5 +pkgrel=1 pkgdesc="Plugin to switch keyboard layouts for the Xfce4 panel" arch=('i686' 'x86_64' 'mips64el') url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin" @@ -14,17 +14,12 @@ groups=('xfce4-goodies') depends=('xfce4-panel' 'libxklavier' 'librsvg') makedepends=('intltool') options=('!libtool') -source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.5/$pkgname-$pkgver.tar.bz2 - xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch) -sha256sums=('ca4801bb2edfe04eeceb71879b3cf79a0674e8311c39117efdb9d3521307396d' - 'f5e6e5964df897045ed8c3443f632033689409459acdc54c0351264edc11b4ce') +source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.5/$pkgname-$pkgver.tar.bz2) +sha256sums=('c97306298b0c804d4797c431bb9b698f123c0437ec845930bf938dc5d24ea8c9') build() { cd "$srcdir/$pkgname-$pkgver" - # https://bugs.archlinux.org/task/31880 - patch -Np1 -i "$srcdir/xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch" - ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch b/extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch deleted file mode 100644 index 16f684b12..000000000 --- a/extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.5.4.3-2-fix-memory-corruption.patch +++ /dev/null @@ -1,59 +0,0 @@ -From ac73bc9de624d322b318c2eda0ace7f0bee97a64 Mon Sep 17 00:00:00 2001 -From: Igor Slepchin <igor.slepchin@gmail.com> -Date: Thu, 19 Jul 2012 05:59:40 +0000 -Subject: Fix memory corruption. - -g_free(c) in the original code was freeing memory at the pointer -that was incremented a few times since the allocation. - -This is similar to ubuntu bug #899290 and fedora bug 589898. ---- -diff --git a/panel-plugin/xkb-util.c b/panel-plugin/xkb-util.c -index d0d0230..324928f 100644 ---- a/panel-plugin/xkb-util.c -+++ b/panel-plugin/xkb-util.c -@@ -66,11 +66,10 @@ xkb_util_get_layout_string (const gchar *group_name, const gchar *variant) - gchar* - xkb_util_normalize_group_name (const gchar* group_name) - { -- gchar *c; -+ const gchar *c; - gchar *result; - gint cut_length; - gint index_of_na = -1; -- gint index_tmp = -1; - - if (!group_name) - return NULL; -@@ -78,27 +77,19 @@ xkb_util_normalize_group_name (const gchar* group_name) - if (strlen (group_name) <= 3) - return g_strdup (group_name); - -- c = g_strdup (group_name); -- -- while (*c) -+ for (c = group_name; *c; c++) - { -- index_tmp++; -- - if (!((*c >= 'a' && *c <= 'z') || (*c >= 'A' && *c <= 'Z'))) - { -- index_of_na = index_tmp; -+ index_of_na = group_name - c; - break; - } -- -- c++; - } - - cut_length = (index_of_na != -1 && index_of_na <= 3) ? index_of_na : 3; - - result = g_strndup (group_name, cut_length); - -- g_free (c); -- - return result; - } - --- -cgit v0.9.0.3 diff --git a/extra/xfconf/PKGBUILD b/extra/xfconf/PKGBUILD index ff934d36a..ad711b53a 100644 --- a/extra/xfconf/PKGBUILD +++ b/extra/xfconf/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160585 2012-06-02 10:29:16Z bluewind $ +# $Id: PKGBUILD 186431 2013-05-26 09:26:17Z bluewind $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfconf pkgver=4.10.0 -pkgrel=2 +pkgrel=3 pkgdesc="A simple client-server configuration storage and query system" arch=('i686' 'x86_64' 'mips64el') url="http://www.xfce.org/" @@ -13,8 +13,8 @@ groups=('xfce4') # http://www.xfce.org/documentation/requirements # keep dbus, see also http://bugs.archlinux.org/task/14536 depends=('libxfce4util' 'dbus-glib' 'dbus') -makedepends=('pkgconfig' 'perl-extutils-depends' 'perl-extutils-pkgconfig' - 'glib-perl' 'intltool' 'gtk-doc' 'chrpath') +makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig' 'glib-perl' + 'intltool' 'gtk-doc' 'chrpath') options=('!libtool' '!emptydirs') source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2) sha256sums=('175219a441cc7d0f210bbd1a3b0abba41598627cd9db27235811400c3e100576') diff --git a/extra/xine-lib/0001-fix-non-x86-build.patch b/extra/xine-lib/0001-fix-non-x86-build.patch deleted file mode 100644 index 73cdf2c8d..000000000 --- a/extra/xine-lib/0001-fix-non-x86-build.patch +++ /dev/null @@ -1,43 +0,0 @@ -# HG changeset patch -# User Petri Hintukainen <phintuka@users.sourceforge.net> -# Date 1339310702 -10800 -# Node ID b0df4b6003ad2b7454059c2d82ef7f8f29e48e9e -# Parent 52a99e60c2c9aa7e03be894b4396f229f881025c -Fix building on non-x86 systems - -diff --git a/src/post/deinterlace/plugins/greedy2frame_template.c b/src/post/deinterlace/plugins/greedy2frame_template.c ---- a/src/post/deinterlace/plugins/greedy2frame_template.c -+++ b/src/post/deinterlace/plugins/greedy2frame_template.c -@@ -85,6 +85,7 @@ - */ - - -+#if defined(ARCH_X86) || defined(ARCH_X86_64) - #if !defined(MASKS_DEFINED) - #define MASKS_DEFINED - static const mmx_t Mask = { uq: 0x7f7f7f7f7f7f7f7fll }; -@@ -92,6 +93,7 @@ static const mmx_t Mask = { uq: 0x7f7f7f - static const mmx_t GreedyTwoFrameThreshold = { ub: {TP, TP, TP, TP} }; - #undef TP - #endif -+#endif - - #if defined(IS_MMXEXT) - static void DeinterlaceGreedy2Frame_MMXEXT(uint8_t *output, int outstride, -diff --git a/src/post/deinterlace/plugins/greedy2frame_template_sse2.c b/src/post/deinterlace/plugins/greedy2frame_template_sse2.c ---- a/src/post/deinterlace/plugins/greedy2frame_template_sse2.c -+++ b/src/post/deinterlace/plugins/greedy2frame_template_sse2.c -@@ -84,11 +84,12 @@ - ** B0 | | B1 | | - */ - -- -+#if defined(ARCH_X86) || defined(ARCH_X86_64) - static const sse_t Mask128 = { uq: { 0x7f7f7f7f7f7f7f7fll, 0x7f7f7f7f7f7f7f7fll} }; - #define TP GREEDYTWOFRAMETHRESHOLD, GREEDYTWOFRAMETHRESHOLD2 - static const sse_t GreedyTwoFrameThreshold128 = { ub: {TP, TP, TP, TP, TP, TP, TP, TP} }; - #undef TP -+#endif - - static void DeinterlaceGreedy2Frame_SSE2(uint8_t *output, int outstride, - deinterlace_frame_data_t *data, diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD index 7d0726930..46c21bb73 100644 --- a/extra/xine-lib/PKGBUILD +++ b/extra/xine-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180316 2013-03-20 02:35:37Z eric $ +# $Id: PKGBUILD 186598 2013-05-30 03:34:04Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xine-lib -pkgver=1.2.2 -pkgrel=8 +pkgver=1.2.3 +pkgrel=1 pkgdesc="A multimedia playback engine" arch=('i686' 'x86_64' 'mips64el') url="http://www.xine-project.org" @@ -31,29 +31,22 @@ optdepends+=('wavpack: for using the wavpack plugin' \ 'gnome-vfs: for using the gnome-vfs plugin') [ "$CARCH" = "mips64el" ] || optdepends+=('libvdpau: for using the VDPAU plugin') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz - xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch - 0001-fix-non-x86-build.patch) -sha1sums=('a349cbb0b72256bb262377796a022dcf63829b4c' - '45500eca2aa40c133e1a6e8b23dbadc4b921b11f' - '5f1a34c7bafa7ea96c0e4e14fbf6e31e53fe41e0') +source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz accel_vaapi.h) +sha1sums=('6f9ef4ba75688659052d21448d46527db2b77e57' + '08ed9947ef919c71c87151baa8fc0ce7d8f72050') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # Fix audio decoding with newest FFmpeg - # https://bugs.archlinux.org/task/33818 - patch -Np1 -i "$srcdir/xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch" - - patch -Np1 -i ${srcdir}/0001-fix-non-x86-build.patch +prepare() { + cp accel_vaapi.h ${pkgname}-${pkgver}/src/xine-engine/ +} +build() { + cd ${pkgname}-${pkgver} [ "$CARCH" = "mips64el" ] || extraconf=--enable-vdpau - - ./configure --prefix=/usr --with-wavpack --disable-optimizations $extra + ./configure --prefix=/usr --with-wavpack --disable-optimizations $extraconf make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/xine-lib/accel_vaapi.h b/extra/xine-lib/accel_vaapi.h new file mode 100644 index 000000000..666b23fd6 --- /dev/null +++ b/extra/xine-lib/accel_vaapi.h @@ -0,0 +1,135 @@ +/* + * Copyright (C) 2008 the xine project + * + * This file is part of xine, a free video player. + * + * xine is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * xine is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA + * + * + * Common acceleration definitions for vdpau + * + * + */ + +#ifndef HAVE_XINE_ACCEL_VAAPI_H +#define HAVE_XINE_ACCEL_VAAPI_H + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <va/va_x11.h> +#include <pthread.h> +#ifdef HAVE_FFMPEG_AVUTIL_H +# include <avcodec.h> +#else +# include <libavcodec/avcodec.h> +#endif + +#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32) +# define AVVIDEO 2 +#else +# define AVVIDEO 1 +# define pp_context pp_context_t +# define pp_mode pp_mode_t +#endif + +#define NUM_OUTPUT_SURFACES 22 + +#define SURFACE_FREE 0 +#define SURFACE_ALOC 1 +#define SURFACE_RELEASE 2 +#define SURFACE_RENDER 3 +#define SURFACE_RENDER_RELEASE 5 + +struct vaapi_equalizer { + VADisplayAttribute brightness; + VADisplayAttribute contrast; + VADisplayAttribute hue; + VADisplayAttribute saturation; +}; + +typedef struct ff_vaapi_context_s ff_vaapi_context_t; + +struct ff_vaapi_context_s { + VADisplay va_display; + VAContextID va_context_id; + VAConfigID va_config_id; + int width; + int height; + int sw_width; + int sw_height; + int va_profile; + unsigned int va_colorspace; + VAImage va_subpic_image; + VASubpictureID va_subpic_id; + int va_subpic_width; + int va_subpic_height; + int is_bound; + void *gl_surface; + unsigned int soft_head; + unsigned int valid_context; + unsigned int va_head; + unsigned int va_soft_head; + vo_driver_t *driver; + unsigned int last_sub_image_fmt; + VASurfaceID last_sub_surface_id; + struct vaapi_equalizer va_equalizer; + VAImageFormat *va_image_formats; + int va_num_image_formats; + VAImageFormat *va_subpic_formats; + int va_num_subpic_formats; +}; + +typedef struct ff_vaapi_surface_s ff_vaapi_surface_t; +typedef struct vaapi_accel_s vaapi_accel_t; + +struct ff_vaapi_surface_s { + unsigned int index; + vaapi_accel_t *accel; + VASurfaceID va_surface_id; + unsigned int status; +}; + +struct vaapi_accel_s { + unsigned int index; + vo_frame_t *vo_frame; + +#if AVVIDEO > 1 + int (*avcodec_decode_video2)(vo_frame_t *frame_gen, AVCodecContext *avctx, AVFrame *picture, + int *got_picture_ptr, AVPacket *avpkt); +#else + int (*avcodec_decode_video)(vo_frame_t *frame_gen, AVCodecContext *avctx, AVFrame *picture, + int *got_picture_ptr, uint8_t *buf, int buf_size); +#endif + VAStatus (*vaapi_init)(vo_frame_t *frame_gen, int va_profile, int width, int height, int softrender); + int (*profile_from_imgfmt)(vo_frame_t *frame_gen, enum PixelFormat pix_fmt, int codec_id, int vaapi_mpeg_sofdec); + ff_vaapi_context_t *(*get_context)(vo_frame_t *frame_gen); + int (*guarded_render)(vo_frame_t *frame_gen); + ff_vaapi_surface_t *(*get_vaapi_surface)(vo_frame_t *frame_gen); + void (*render_vaapi_surface)(vo_frame_t *frame_gen, ff_vaapi_surface_t *va_surface); + void (*release_vaapi_surface)(vo_frame_t *frame_gen, ff_vaapi_surface_t *va_surface); +}; + +#ifdef __cplusplus +} +#endif + +#endif + diff --git a/extra/xine-lib/xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch b/extra/xine-lib/xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch deleted file mode 100644 index 255f56d0d..000000000 --- a/extra/xine-lib/xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch +++ /dev/null @@ -1,277 +0,0 @@ -From 679582503c8ba2f91a82e44c4a2938550306fd07 Mon Sep 17 00:00:00 2001 -From: Torsten Jager <t.jager@gmx.de> -Date: Thu, 21 Feb 2013 22:35:00 +0200 -Subject: [PATCH 3/5] ffmpeg_audio_decoder: support new av_decode_audio4 () - ---- - src/combined/ffmpeg/ff_audio_decoder.c | 153 +++++++++++++++++++++++++++------ - src/combined/ffmpeg/ffmpeg_compat.h | 4 +- - 2 files changed, 131 insertions(+), 26 deletions(-) - -diff --git a/src/combined/ffmpeg/ff_audio_decoder.c b/src/combined/ffmpeg/ff_audio_decoder.c -index 4e64378..34a7a9e 100644 ---- a/src/combined/ffmpeg/ff_audio_decoder.c -+++ b/src/combined/ffmpeg/ff_audio_decoder.c -@@ -71,7 +71,9 @@ typedef struct ff_audio_decoder_s { - int decoder_ok; - - AVCodecParserContext *parser_context; -- -+#if AVAUDIO > 3 -+ AVFrame *av_frame; -+#endif - } ff_audio_decoder_t; - - -@@ -150,6 +152,9 @@ static void ff_audio_init_codec(ff_audio_decoder_t *this, unsigned int codec_typ - return; - } - -+ /* Try to make the following true */ -+ this->context->request_sample_fmt = AV_SAMPLE_FMT_S16; -+ - /* Current ffmpeg audio decoders usually use 16 bits/sample - * buf->decoder_info[2] can't be used as it doesn't refer to the output - * bits/sample for some codecs (e.g. MS ADPCM) */ -@@ -358,25 +363,19 @@ static void ff_audio_output_close(ff_audio_decoder_t *this) - this->audio_channels = 0; - } - --static int ff_audio_decode(xine_t *xine, -- AVCodecContext *ctx, -- AVCodecParserContext *parser_ctx, -- int16_t *decode_buffer, int *decode_buffer_size, -- uint8_t *buf, int size) --{ -+static int ff_audio_decode (ff_audio_decoder_t *this, -+ int16_t *decode_buffer, int *decode_buffer_size, uint8_t *buf, int size) { - int consumed; - int parser_consumed = 0; - - #if AVPARSE > 1 -- if (parser_ctx) { -+ if (this->parser_context) { - uint8_t *outbuf; - int outsize; - - do { -- int ret = av_parser_parse2(parser_ctx, ctx, -- &outbuf, &outsize, -- buf, size, -- 0, 0, 0); -+ int ret = av_parser_parse2 (this->parser_context, this->context, -+ &outbuf, &outsize, buf, size, 0, 0, 0); - parser_consumed += ret; - buf += ret; - size -= ret; -@@ -385,7 +384,7 @@ static int ff_audio_decode(xine_t *xine, - /* nothing to decode ? */ - if (outsize <= 0) { - *decode_buffer_size = 0; -- xprintf (xine, XINE_VERBOSITY_DEBUG, -+ xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, - "ffmpeg_audio_dec: not enough data to decode\n"); - return parser_consumed; - } -@@ -402,21 +401,115 @@ static int ff_audio_decode(xine_t *xine, - avpkt.data = buf; - avpkt.size = size; - avpkt.flags = AV_PKT_FLAG_KEY; -- consumed = avcodec_decode_audio3 (ctx, -- decode_buffer, decode_buffer_size, -- &avpkt); -+# if AVAUDIO > 3 -+ int got_frame; -+ if (!this->av_frame) -+ this->av_frame = avcodec_alloc_frame (); -+ -+ consumed = avcodec_decode_audio4 (this->context, this->av_frame, &got_frame, &avpkt); -+ if ((consumed >= 0) && got_frame) { -+ int16_t *q = decode_buffer; -+ int samples = this->av_frame->nb_samples; -+ int channels = this->context->channels; -+ int bytes, i, j; -+ /* limit buffer */ -+ if (channels > 12) -+ channels = 12; -+ if (*decode_buffer_size < samples * channels * 2) -+ samples = *decode_buffer_size / (channels * 2); -+ bytes = samples * channels * 2; -+ *decode_buffer_size = bytes; -+ /* convert to packed int16_t. I guess there is something -+ in libavfilter but also another dependency... */ -+ switch (this->context->sample_fmt) { -+ case AV_SAMPLE_FMT_U8P: -+ if (channels > 1) { -+ uint8_t *p[12]; -+ for (i = 0; i < channels; i++) -+ p[i] = (uint8_t *)this->av_frame->extended_data[i]; -+ for (i = samples; i; i--) { -+ for (j = 0; j < channels; j++) -+ *q++ = ((uint16_t)(*p[j]++) << 8) ^ 0x8000; -+ } -+ break; -+ } -+ case AV_SAMPLE_FMT_U8: -+ { -+ uint8_t *p = (uint8_t *)this->av_frame->extended_data[0]; -+ for (i = samples * channels; i; i--) -+ *q++ = ((uint16_t)(*p++) << 8) ^ 0x8000; -+ } -+ break; -+ case AV_SAMPLE_FMT_S16P: -+ if (channels > 1) { -+ int16_t *p[12]; -+ for (i = 0; i < channels; i++) -+ p[i] = (int16_t *)this->av_frame->extended_data[i]; -+ for (i = samples; i; i--) { -+ for (j = 0; j < channels; j++) -+ *q++ = *p[j]++; -+ } -+ break; -+ } -+ case AV_SAMPLE_FMT_S16: -+ xine_fast_memcpy (q, this->av_frame->extended_data[0], bytes); -+ break; -+ case AV_SAMPLE_FMT_S32P: -+ if (channels > 1) { -+ int32_t *p[12]; -+ for (i = 0; i < channels; i++) -+ p[i] = (int32_t *)this->av_frame->extended_data[i]; -+ for (i = samples; i; i--) { -+ for (j = 0; j < channels; j++) -+ *q++ = *p[j]++ >> 16; -+ } -+ break; -+ } -+ case AV_SAMPLE_FMT_S32: -+ { -+ int32_t *p = (int32_t *)this->av_frame->extended_data[0]; -+ for (i = samples * channels; i; i--) -+ *q++ = *p++ >> 16; -+ } -+ break; -+ case AV_SAMPLE_FMT_FLTP: /* the most popular one */ -+ if (channels > 1) { -+ float *p[12]; -+ for (i = 0; i < channels; i++) -+ p[i] = (float *)this->av_frame->extended_data[i]; -+ for (i = samples; i; i--) { -+ for (j = 0; j < channels; j++) { -+ int v = *p[j]++ * (float)0x7fff; -+ *q++ = (v + 0x8000) & ~0xffff ? (v >> 31) ^ 0x7fff : v; -+ } -+ } -+ break; -+ } -+ case AV_SAMPLE_FMT_FLT: -+ { -+ float *p = (float *)this->av_frame->extended_data[0]; -+ for (i = samples * channels; i; i--) { -+ int v = *p++ * (float)0x7fff; -+ *q++ = (v + 0x8000) & ~0xffff ? (v >> 31) ^ 0x7fff : v; -+ } -+ } -+ break; -+ default: ; -+ } -+ } else *decode_buffer_size = 0; -+# else -+ consumed = avcodec_decode_audio3 (this->context, decode_buffer, decode_buffer_size, &avpkt); -+# endif - #else -- consumed = avcodec_decode_audio2 (ctx, -- decode_buffer, decode_buffer_size, -- buf, size); -+ consumed = avcodec_decode_audio2 (this->context, decode_buffer, decode_buffer_size, buf, size); - #endif - - if (consumed < 0) { -- xprintf (xine, XINE_VERBOSITY_DEBUG, -+ xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, - "ffmpeg_audio_dec: error decompressing audio frame (%d)\n", consumed); - } else if (parser_consumed && consumed != size) { - -- xprintf (xine, XINE_VERBOSITY_DEBUG, -+ xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, - "ffmpeg_audio_dec: decoder didn't consume all data\n"); - } - -@@ -469,8 +562,7 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) - decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE; - - bytes_consumed = -- ff_audio_decode(this->stream->xine, this->context, -- this->parser_context, -+ ff_audio_decode(this, - (int16_t *)this->decode_buffer, &decode_buffer_size, - &this->buf[offset], this->size); - -@@ -539,6 +631,7 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) - } - - /* fill up this buffer */ -+#if AVAUDIO < 4 - if (codec_type == BUF_AUDIO_WMAPRO) { - /* the above codecs output float samples, not 16-bit integers */ - int bytes_per_sample = sizeof(float); -@@ -558,7 +651,9 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) - bytes_to_send = bytes_to_send * 2 / bytes_per_sample; - xine_fast_memcpy(audio_buffer->mem, int_buffer, bytes_to_send); - free(int_buffer); -- } else { -+ } else -+#endif -+ { - if ((decode_buffer_size - out) > audio_buffer->mem_size) - bytes_to_send = audio_buffer->mem_size; - else -@@ -595,6 +690,9 @@ static void ff_audio_reset (audio_decoder_t *this_gen) { - - /* try to reset the wma decoder */ - if( this->decoder_ok ) { -+#if AVAUDIO > 3 -+ avcodec_free_frame (&this->av_frame); -+#endif - pthread_mutex_lock (&ffmpeg_lock); - avcodec_close (this->context); - if (avcodec_open (this->context, this->codec) < 0) -@@ -626,6 +724,9 @@ static void ff_audio_dispose (audio_decoder_t *this_gen) { - } - - if( this->context && this->decoder_ok ) { -+#if AVAUDIO > 3 -+ avcodec_free_frame (&this->av_frame); -+#endif - pthread_mutex_lock (&ffmpeg_lock); - avcodec_close (this->context); - pthread_mutex_unlock (&ffmpeg_lock); -@@ -668,7 +769,9 @@ static audio_decoder_t *ff_audio_open_plugin (audio_decoder_class_t *class_gen, - - this->context = avcodec_alloc_context(); - this->decode_buffer = malloc16 (AVCODEC_MAX_AUDIO_FRAME_SIZE); -- -+#if AVAUDIO > 3 -+ this->av_frame = NULL; -+#endif - return &this->audio_decoder; - } - -diff --git a/src/combined/ffmpeg/ffmpeg_compat.h b/src/combined/ffmpeg/ffmpeg_compat.h -index 0acead8..b567dc1 100644 ---- a/src/combined/ffmpeg/ffmpeg_compat.h -+++ b/src/combined/ffmpeg/ffmpeg_compat.h -@@ -94,7 +94,9 @@ - #endif - - /* avcodec_decode_audio() */ --#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32) -+#if LIBAVCODEC_VERSION_MAJOR >= 54 -+# define AVAUDIO 4 -+#elif LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32) - # define AVAUDIO 3 - #else - # define AVAUDIO 2 --- -1.8.1.5 - diff --git a/extra/xorg-appres/PKGBUILD b/extra/xorg-appres/PKGBUILD index a96168194..6f566cd17 100644 --- a/extra/xorg-appres/PKGBUILD +++ b/extra/xorg-appres/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 150960 2012-02-24 10:08:12Z pierre $ +# $Id: PKGBUILD 185747 2013-05-18 10:41:38Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-appres -pkgver=1.0.3 -pkgrel=3.1 +pkgver=1.0.4 +pkgrel=1 pkgdesc="List X application resource database" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +13,7 @@ depends=('libxt') makedepends=('xorg-util-macros') conflicts=('xorg-res-utils') source=("http://xorg.freedesktop.org/archive/individual/app/appres-${pkgver}.tar.bz2") -sha1sums=('7303f12fae8cce92da2dbd88c9d31d816dc5da06') +sha256sums=('9f614e9427cd9641a4a801ed5055700afa410674c0b7aa186b86078f11b83e8d') build() { cd "${srcdir}/appres-${pkgver}" diff --git a/extra/xorg-xdpyinfo/PKGBUILD b/extra/xorg-xdpyinfo/PKGBUILD index 6c589a7ee..dc1b608d5 100644 --- a/extra/xorg-xdpyinfo/PKGBUILD +++ b/extra/xorg-xdpyinfo/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 176903 2013-02-02 07:12:27Z andyrtr $ +# $Id: PKGBUILD 186272 2013-05-23 15:31:13Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xdpyinfo -pkgver=1.3.0 -pkgrel=2 +pkgver=1.3.1 +pkgrel=1 pkgdesc="Display information utility for X" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +13,7 @@ depends=('libx11' 'libxext' 'libxtst' 'libxxf86vm' 'libxxf86dga' 'libxrender' 'l makedepends=('xorg-util-macros') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xdpyinfo-${pkgver}.tar.bz2) -sha256sums=('23ee4944a32b5701b4379cb420729eb7a4dde54de2b5b006d4747855efd6d73f') +sha256sums=('aef9285069a517ed870e5d8a02d13f7d8a953d7f7220146da563e04c7f128b94') build() { cd "${srcdir}/xdpyinfo-${pkgver}" diff --git a/extra/xorg-xfontsel/PKGBUILD b/extra/xorg-xfontsel/PKGBUILD index cfdc6122c..ba9194ebf 100644 --- a/extra/xorg-xfontsel/PKGBUILD +++ b/extra/xorg-xfontsel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 154158 2012-03-23 20:07:28Z andyrtr $ +# $Id: PKGBUILD 185743 2013-05-18 09:28:36Z bisson $ # Contributor: Jan de Groot <jgc@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=xorg-xfontsel -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=1 pkgdesc='Point and click selection of X11 font names' url='http://xorg.freedesktop.org/' @@ -12,7 +12,7 @@ license=('custom') makedepends=('xorg-util-macros') depends=('libxaw' 'libxmu' 'libxt' 'libx11') source=("http://xorg.freedesktop.org/archive/individual/app/xfontsel-${pkgver}.tar.bz2") -sha1sums=('8e3da9d050ad71531bfeb98d5f1071c7b392b3bd') +sha1sums=('fbd8fa8a1c87d8da2e71def964e97bca1d4c4adf') build() { cd "${srcdir}/xfontsel-${pkgver}" diff --git a/extra/xorg-xlsfonts/PKGBUILD b/extra/xorg-xlsfonts/PKGBUILD new file mode 100644 index 000000000..a2a623685 --- /dev/null +++ b/extra/xorg-xlsfonts/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 156352 2012-04-17 16:02:26Z andyrtr $ +# Contributor: Jan de Groot <jgc@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=xorg-xlsfonts +pkgver=1.0.4 +pkgrel=1 +pkgdesc='List available X fonts' +url='http://xorg.freedesktop.org/' +license=('custom') +arch=('i686' 'x86_64') +depends=('libx11') +makedepends=('xorg-util-macros') +source=("http://xorg.freedesktop.org/archive/individual/app/xlsfonts-${pkgver}.tar.bz2") +sha1sums=('6fc23537797bb1ae4945efd8c01e675edf4a4c3f') + +build() { + cd "${srcdir}/xlsfonts-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/xlsfonts-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" +} diff --git a/extra/xorg-xrefresh/PKGBUILD b/extra/xorg-xrefresh/PKGBUILD index 7113113bf..66bf9a086 100644 --- a/extra/xorg-xrefresh/PKGBUILD +++ b/extra/xorg-xrefresh/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 151005 2012-02-24 13:07:46Z allan $ +# $Id: PKGBUILD 185750 2013-05-18 10:45:33Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xrefresh -pkgver=1.0.4 -pkgrel=3.1 +pkgver=1.0.5 +pkgrel=1 pkgdesc="Refresh all or part of an X screen" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +13,7 @@ depends=('libx11') makedepends=('xorg-util-macros') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xrefresh-${pkgver}.tar.bz2) -sha1sums=('5e85ee14ea9a357c1d4372bbc068a8d452a134aa') +sha256sums=('3213671b0a8a9d1e8d1d5d9e3fd86842c894dd9acc1be2560eda50bc1fb791d6') build() { cd "${srcdir}/xrefresh-${pkgver}" diff --git a/extra/xorg-xwininfo/PKGBUILD b/extra/xorg-xwininfo/PKGBUILD index d790d29d8..6e0f703a5 100644 --- a/extra/xorg-xwininfo/PKGBUILD +++ b/extra/xorg-xwininfo/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 130758 2011-07-07 22:32:22Z andyrtr $ +# $Id: PKGBUILD 185752 2013-05-18 10:48:20Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xwininfo -pkgver=1.1.2 -pkgrel=1.1 +pkgver=1.1.3 +pkgrel=1 pkgdesc="Command-line utility to print information about windows on an X server" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +13,7 @@ depends=('libxcb') makedepends=('xorg-util-macros' 'libx11') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xwininfo-${pkgver}.tar.bz2) -sha1sums=('c90b3c289f95474aa8eb6cf1bf4caf3b9dbf82d3') +sha256sums=('218eb0ea95bd8de7903dfaa26423820c523ad1598be0751d2d8b6a2c23b23ff8') build() { cd "${srcdir}/xwininfo-${pkgver}" diff --git a/extra/xsane/PKGBUILD b/extra/xsane/PKGBUILD index 7f8e8f99b..dd25f19b9 100644 --- a/extra/xsane/PKGBUILD +++ b/extra/xsane/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184456 2013-05-06 19:40:28Z foutrelis $ +# $Id: PKGBUILD 185793 2013-05-19 08:52:55Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgbase=xsane pkgname=('xsane' 'xsane-gimp') pkgver=0.998 -pkgrel=4 +pkgrel=5 arch=(i686 x86_64 mips64el) url="http://www.xsane.org" license=('GPL2') @@ -15,11 +15,15 @@ source=(http://www.xsane.org/download/$pkgname-$pkgver.tar.gz md5sums=('936f1cc76b37caa8f285e1e15ac7e0aa' '15541ff0ddc10acfa2059cf99d5478eb') -build() { - cd "$srcdir/$pkgbase-$pkgver" +prepare() { + cd "$srcdir/$pkgname-$pkgver" # fix use "xdg-open" instead of "netscape" to launch help browser - taken from Fedora - patch -Np1 -i "${srcdir}/xsane-0.995-xdg-open.patch" + patch -Np1 -i ${srcdir}/xsane-0.995-xdg-open.patch sed -i -e 's:png_ptr->jmpbuf:png_jmpbuf(png_ptr):' src/xsane-save.c +} + +build() { + cd "$srcdir/$pkgbase-$pkgver" ./configure --prefix=/usr \ --mandir=/usr/share/man \ @@ -29,7 +33,7 @@ build() { # build again with gimp enabled make clean - ./configure --prefix=/usr --mandir=/usr/share/man --disable-gimp + ./configure --prefix=/usr --sbindir=/usr/bin --mandir=/usr/share/man --disable-gimp make } @@ -49,9 +53,10 @@ package_xsane-gimp() { install -D -m755 src/xsane-gimp "${pkgdir}/usr/bin/xsane-gimp" ## For making Gimp Plugin available - /bin/mkdir -p "$pkgdir/usr/lib/gimp/2.0/plug-ins" - cd "$pkgdir/usr/lib/gimp/2.0/plug-ins/" - /bin/ln -s ../../../../bin/xsane-gimp xsane + mkdir -p "$pkgdir/usr/lib/gimp/2.0/plug-ins" + ln -sf /usr/bin/xsane-gimp $pkgdir/usr/lib/gimp/2.0/plug-ins/xsane + #cd "$pkgdir/usr/lib/gimp/2.0/plug-ins/" + #/bin/ln -s ../../../../bin/xsane-gimp xsane # http://cvs.fedoraproject.org/viewvc/rpms/xsane/devel/xsane.spec?revision=1.80&view=markup # when makepkg will allow splitted pkg install file support we might change add a xsane-gimp.install file with the commands that are used by fedora, diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD index 2133e855a..05f9129a2 100644 --- a/extra/xterm/PKGBUILD +++ b/extra/xterm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183672 2013-04-26 12:52:31Z andyrtr $ +# $Id: PKGBUILD 186582 2013-05-29 15:27:30Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xterm -pkgver=292 +pkgver=293 pkgrel=1 pkgdesc="X Terminal Emulator" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('custom') depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps' 'libutempter') source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz LICENSE) -md5sums=('d6e7d1bd31b23fb58ca213c912f32009' +md5sums=('f9dc37486d5f1e550b6dc2e26a8a0439' '10ecc3f8ee91e3189863a172f68282d2') build() { diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD index ea101c1b6..8045f9ab8 100644 --- a/extra/xulrunner/PKGBUILD +++ b/extra/xulrunner/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184457 2013-05-06 19:40:30Z foutrelis $ +# $Id: PKGBUILD 185530 2013-05-14 19:12:24Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xulrunner -pkgver=20.0 -pkgrel=2 +pkgver=21.0 +pkgrel=1 pkgdesc="Mozilla Runtime Environment" arch=('i686' 'x86_64') license=('MPL' 'GPL' 'LGPL') @@ -16,10 +16,10 @@ source=(ftp://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$pkgver/source/ shared-libs.patch) options=('!emptydirs') replaces=('xulrunner-oss') -md5sums=('1b8a1907919eb805f390a05216f2d8d0' - 'f26710bcf3e65699a0646c47155cb147' - '27271ce647a83906ef7a24605e840d61' - '52e52f840a49eb1d14be1c0065b03a93') +sha256sums=('c3623bc243bd57c7267eacac658993f5f635f639235bea9ed8fce9b52e59be64' + '3fba82b327f8825ebe93ceaeaea4968d57cf7d700f40bf4457b06d263bcc2e8f' + '23485d937035648add27a7657f6934dc5b295e886cdb0506eebd02a43d07f269' + 'e2b4a00d14f4ba69c62b3f9ef9908263fbab179ba8004197cbc67edbd916fdf1') prepare() { cd "$srcdir/mozilla-release" diff --git a/extra/yelp/PKGBUILD b/extra/yelp/PKGBUILD index b91266562..7900d1dd2 100644 --- a/extra/yelp/PKGBUILD +++ b/extra/yelp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183469 2013-04-21 22:12:25Z heftig $ +# $Id: PKGBUILD 185459 2013-05-14 10:26:22Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=yelp -pkgver=3.8.0 +pkgver=3.8.1 pkgrel=1 pkgdesc="A help browser for GNOME" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ options=('!emptydirs' '!libtool') url="http://www.gnome.org" install=yelp.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('f4a02dad614bfc04b6a998440123633145f4011c3a1d35415492d2ff76c1707f') +sha256sums=('73b3941316194dea8ea7d1d2b1f6612424c5d80ee1871ef627455893ad15606e') build() { cd $pkgname-$pkgver diff --git a/extra/ypbind-mt/PKGBUILD b/extra/ypbind-mt/PKGBUILD index 27fb1b8fe..c1fedbfc3 100644 --- a/extra/ypbind-mt/PKGBUILD +++ b/extra/ypbind-mt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184214 2013-05-03 22:54:48Z tomegun $ +# $Id: PKGBUILD 185611 2013-05-15 22:57:01Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Gaetan Bisson <bisson@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> @@ -6,13 +6,13 @@ pkgname=ypbind-mt pkgver=1.37.1 -pkgrel=4 +pkgrel=5 pkgdesc='Linux NIS daemon' url='http://www.linux-nis.org/nis/ypbind-mt/' license=('GPL2') arch=('i686' 'x86_64' 'mips64el') makedepends=('networkmanager') -depends=('rpcbind' 'openslp' 'yp-tools') +depends=('rpcbind' 'openslp' 'yp-tools' 'systemd') backup=('etc/yp.conf') source=("http://www.linux-nis.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'ypbind.service') @@ -22,7 +22,8 @@ build() { ./configure \ --prefix=/usr \ - --build=$CHOST + --build=$CHOST \ + --sbindir=/usr/bin make } @@ -37,4 +38,4 @@ package() { install -d -m755 "${pkgdir}"/var/yp/binding } md5sums=('8af8d35e7b9a7fcc3a1576697a04bd82' - '9083debd16fc49c6645372caa25969b5') + '5ea205756731c2978cca4934141424bd') diff --git a/extra/ypbind-mt/ypbind.service b/extra/ypbind-mt/ypbind.service index 08e4fe14e..bb13f1d66 100644 --- a/extra/ypbind-mt/ypbind.service +++ b/extra/ypbind-mt/ypbind.service @@ -7,7 +7,7 @@ Before=systemd-user-sessions.service [Service] Type=forking PIDFile=/run/ypbind.pid -ExecStart=/usr/sbin/ypbind +ExecStart=/usr/bin/ypbind # Terrible hack, upstream ypbind should sort something out # Wait for at most 10 seconds for a NIS master to become available ExecStartPost=/bin/sh -c "for i in 1 2 3 4 5 6 7 8 9 10; do ypwhich && break; sleep 1; done" diff --git a/extra/ypserv/PKGBUILD b/extra/ypserv/PKGBUILD index 3e20855a7..1b84a81ac 100644 --- a/extra/ypserv/PKGBUILD +++ b/extra/ypserv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184215 2013-05-03 22:54:49Z tomegun $ +# $Id: PKGBUILD 185612 2013-05-15 22:57:02Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Gaetan Bisson <bisson@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> @@ -6,7 +6,7 @@ pkgname=ypserv pkgver=2.31 -pkgrel=1 +pkgrel=2 pkgdesc='Linux NIS Server' arch=('i686' 'x86_64' 'mips64el') url='http://www.linux-nis.org/nis/ypserv/' @@ -21,7 +21,7 @@ source=("http://www.linux-nis.org/download/${pkgname}/${pkgname}-${pkgver}.tar.b build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + ./configure --prefix=/usr --sbindir=/usr/bin make } @@ -37,6 +37,6 @@ package() { install -D -m644 ../yppasswdd.service "${pkgdir}"/usr/lib/systemd/system/yppasswdd.service } md5sums=('4537b8f0e917edca8f57b70b9cbc37f3' - 'c80e253756446d59a90c4c21b1cb8740' - '7cba3dd3544436c3c1f05e36c0018e92' - '3398271c3e0a054e64b06b99aa2dc63d') + '0639cc2e8f667272335649eeede77206' + '9ff147310a5b83749357b6587cccdf34' + '89b8b608c81fd01bb81cdb551854833f') diff --git a/extra/ypserv/yppasswdd.service b/extra/ypserv/yppasswdd.service index 9a7068b6c..371a7d481 100644 --- a/extra/ypserv/yppasswdd.service +++ b/extra/ypserv/yppasswdd.service @@ -6,7 +6,7 @@ After=network.target rpcbind.service [Service] Type=forking PIDFile=/run/yppasswdd.pid -ExecStart=/usr/sbin/rpc.yppasswdd +ExecStart=/usr/bin/rpc.yppasswdd [Install] WantedBy=multi-user.target diff --git a/extra/ypserv/ypserv.service b/extra/ypserv/ypserv.service index 024a92e5a..8aa6b2a24 100644 --- a/extra/ypserv/ypserv.service +++ b/extra/ypserv/ypserv.service @@ -6,7 +6,7 @@ After=network.target rpcbind.service [Service] Type=forking PIDFile=/run/ypserv.pid -ExecStart=/usr/sbin/ypserv +ExecStart=/usr/bin/ypserv [Install] WantedBy=multi-user.target diff --git a/extra/ypserv/ypxfrd.service b/extra/ypserv/ypxfrd.service index 322ef559f..c7bb6ed87 100644 --- a/extra/ypserv/ypxfrd.service +++ b/extra/ypserv/ypxfrd.service @@ -6,7 +6,7 @@ After=network.target rpcbind.service [Service] Type=forking PIDFile=/run/ypxfrd.pid -ExecStart=/usr/sbin/rpc.ypxfrd +ExecStart=/usr/bin/rpc.ypxfrd [Install] WantedBy=multi-user.target |