From b8322aaddc0dc6b249457dd19ab7fb246b92c997 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Sat, 11 Jan 2014 03:27:04 +0000 Subject: Sat Jan 11 03:21:10 UTC 2014 --- community/autofs/PKGBUILD | 23 +- community/autofs/git-fixes.patch | 777 +++++++++++++++++++++++++++++++++++++++ community/dwdiff/PKGBUILD | 8 +- community/elasticsearch/PKGBUILD | 6 +- community/glfw/PKGBUILD | 6 +- community/glusterfs/PKGBUILD | 8 +- community/opensips/PKGBUILD | 8 +- community/rust/PKGBUILD | 13 +- community/stunnel/PKGBUILD | 15 +- community/zynaddsubfx/PKGBUILD | 20 +- extra/clutter-gst/PKGBUILD | 6 +- extra/cogl/PKGBUILD | 8 +- extra/easytag/PKGBUILD | 24 +- extra/graphviz/PKGBUILD | 10 +- extra/graphviz/yyerror0.patch | 53 +++ extra/graphviz/yyerror1.patch | 26 ++ extra/gst-plugins-good/PKGBUILD | 12 +- extra/gst-plugins-ugly/PKGBUILD | 8 +- extra/libmikmod/PKGBUILD | 9 +- extra/php/PKGBUILD | 13 +- extra/refind-efi/PKGBUILD | 18 +- libre/openexr-libre/PKGBUILD | 53 ++- libre/povray-libre/PKGBUILD | 15 +- libre/psutils-libre/PKGBUILD | 22 +- pcr/youtube-dl-current/PKGBUILD | 4 +- 25 files changed, 1014 insertions(+), 151 deletions(-) create mode 100644 community/autofs/git-fixes.patch create mode 100644 extra/graphviz/yyerror0.patch create mode 100644 extra/graphviz/yyerror1.patch diff --git a/community/autofs/PKGBUILD b/community/autofs/PKGBUILD index 0618daea0..8c949954e 100644 --- a/community/autofs/PKGBUILD +++ b/community/autofs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 103218 2013-12-30 14:30:57Z lfleischer $ +# $Id: PKGBUILD 103697 2014-01-10 07:48:01Z bgyorgy $ # Maintainer: Lukas Fleischer # Contributor: Andrea Scarpino # Contributor: Dale Blount @@ -6,7 +6,7 @@ pkgname=autofs pkgver=5.0.8 -pkgrel=1 +pkgrel=2 pkgdesc='A kernel-based automounter for Linux.' arch=('i686' 'x86_64') url='http://freshmeat.net/projects/autofs' @@ -14,15 +14,24 @@ license=('GPL2') depends=('libxml2') makedepends=('libldap' 'krb5' 'kmod') optdepends=('krb5: for LDAP support') -backup=('etc/default/autofs' - 'etc/autofs/auto.master' - 'etc/autofs/auto.misc') +backup=('etc/autofs/auto.master' + 'etc/autofs/auto.misc' + 'etc/autofs/auto.net' + 'etc/autofs/auto.smb' + 'etc/autofs/autofs_ldap_auth.conf' + 'etc/default/autofs') options=(!makeflags) -source=("http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar.xz") -sha256sums=('32c41fb4e3439f18400468e84dc82fbbd4b14156bef6b9a7f09196ecd9299d52') +source=("http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar.xz" + "git-fixes.patch") +sha256sums=('32c41fb4e3439f18400468e84dc82fbbd4b14156bef6b9a7f09196ecd9299d52' + '09c41a73db6a352cb04b51795591e5ae1c4a3fff37257fc8bb117020fa0e2724') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" + + # Apply fixes from git + patch -Np1 -i "${srcdir}/git-fixes.patch" + sed -i -e 's|/etc/auto.misc|/etc/autofs/auto.misc|' \ -e 's|/etc/auto.master.d|/etc/autofs/auto.master.d|' samples/auto.master } diff --git a/community/autofs/git-fixes.patch b/community/autofs/git-fixes.patch new file mode 100644 index 000000000..fd096193f --- /dev/null +++ b/community/autofs/git-fixes.patch @@ -0,0 +1,777 @@ +diff --git a/CHANGELOG b/CHANGELOG +index 62dac81..a9263c8 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -1,3 +1,17 @@ ++??/??/20?? autofs-5.0.9 ++======================= ++- fix undefined authtype_requires_creds err if ldap enabled but without sasl. ++- fix master map type check. ++- fix task manager not getting signaled. ++- allow --with-systemd to take a path arg. ++- fix WITH_LIBTIRPC function name. ++- fix ipv6 libtirpc getport. ++- fix ipv6 link local address handling. ++- fix fix ipv6 libtirpc getport. ++- get_nfs_info() should query portmapper if port is not given. ++- fix rpc_portmap_getport() proto not set. ++- fix protmap not trying proto v2. ++ + 17/10/2013 autofs-5.0.8 + ======================= + - fix nobind sun escaped map entries. +diff --git a/aclocal.m4 b/aclocal.m4 +index 3e6f223..2115204 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -229,8 +229,10 @@ dnl Check the location of the systemd unit files directory + dnl -------------------------------------------------------------------------- + AC_DEFUN([AF_WITH_SYSTEMD], + [AC_ARG_WITH(systemd, +-[ --with-systemd install systemd unit file if systemd unit directory +- is found on system], ++[ --with-systemd@<:@=systemddir@:>@ install systemd unit file. If 'yes' ++ probe the system for unit directory. ++ If a path is specified, assume that ++ is a valid install path.], + [if test "$withval" = yes; then + if test -z "$systemddir"; then + AC_MSG_CHECKING([location of the systemd unit files directory]) +@@ -247,6 +249,10 @@ AC_DEFUN([AF_WITH_SYSTEMD], + else + AC_MSG_RESULT(not found) + fi ++else ++ if test "$withval" != no; then ++ systemddir=$withval ++ fi + fi]) + ]) + +@@ -435,7 +441,7 @@ CFLAGS="$af_check_libtirpc_save_cflags" + LDFLAGS="$af_check_libtirpc_save_ldflags" + ]) + +-AC_DEFUN([AM_WITH_LIBTIRPC], ++AC_DEFUN([AF_WITH_LIBTIRPC], + [AC_MSG_CHECKING([if libtirpc is requested and available]) + AC_ARG_WITH(libtirpc, + [ --with-libtirpc use libtirpc if available], +diff --git a/configure b/configure +index 2c2e312..4e1743d 100755 +--- a/configure ++++ b/configure +@@ -1372,8 +1372,10 @@ Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-path=PATH look in PATH for binaries needed by the automounter +- --with-systemd install systemd unit file if systemd unit directory +- is found on system ++ --with-systemd[=systemddir] install systemd unit file. If 'yes' ++ probe the system for unit directory. ++ If a path is specified, assume that ++ is a valid install path. + --with-confdir=DIR use DIR for autofs configuration files + --with-mapdir=PATH look in PATH for mount maps used by the automounter + --with-fifodir=PATH use PATH as the directory for fifos used by the automounter +@@ -2260,6 +2262,10 @@ $as_echo "$systemddir" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 + $as_echo "not found" >&6; } + fi ++else ++ if test "$withval" != no; then ++ systemddir=$withval ++ fi + fi + fi + +diff --git a/configure.in b/configure.in +index 5f29163..1eeb8dc 100644 +--- a/configure.in ++++ b/configure.in +@@ -124,7 +124,7 @@ AC_SUBST(flagdir) + # + # Use libtirpc + # +-AM_WITH_LIBTIRPC() ++AF_WITH_LIBTIRPC() + AC_SUBST(TIRPCLIB) + + # +diff --git a/daemon/lookup.c b/daemon/lookup.c +index e3d9536..7fea942 100644 +--- a/daemon/lookup.c ++++ b/daemon/lookup.c +@@ -171,14 +171,22 @@ int lookup_nss_read_master(struct master *master, time_t age) + char source[10]; + + memset(source, 0, 10); +- if (!strncmp(name, "file:", 5) || +- !strncmp(name, "yp:", 3) || +- !strncmp(name, "nis:", 4) || +- !strncmp(name, "nisplus:", 8) || +- !strncmp(name, "ldap:", 5) || +- !strncmp(name, "ldaps:", 6) || +- !strncmp(name, "sss:", 4) || +- !strncmp(name, "dir:", 4)) { ++ if ((!strncmp(name, "file", 4) && ++ (name[4] == ',' || name[4] == ':')) || ++ (!strncmp(name, "yp", 3) && ++ (name[3] == ',' || name[3] == ':')) || ++ (!strncmp(name, "nis", 3) && ++ (name[3] == ',' || name[3] == ':')) || ++ (!strncmp(name, "nisplus", 7) && ++ (name[7] == ',' || name[7] == ':')) || ++ (!strncmp(name, "ldap", 4) && ++ (name[4] == ',' || name[4] == ':')) || ++ (!strncmp(name, "ldaps", 5) && ++ (name[5] == ',' || name[5] == ':')) || ++ (!strncmp(name, "sss", 3) || ++ (name[3] == ',' || name[3] == ':')) || ++ (!strncmp(name, "dir", 3) && ++ (name[3] == ',' || name[3] == ':'))) { + strncpy(source, name, tmp - name); + + /* +diff --git a/daemon/state.c b/daemon/state.c +index 8d81788..3174a9c 100644 +--- a/daemon/state.c ++++ b/daemon/state.c +@@ -818,13 +818,13 @@ done: + new = st_alloc_task(ap, state); + if (new) + list_add(&new->list, head); +- /* Added to empty state queue, kick state machine */ +- signaled = 1; +- status = pthread_cond_signal(&cond); +- if (status) +- fatal(status); + } + ++ signaled = 1; ++ status = pthread_cond_signal(&cond); ++ if (status) ++ fatal(status); ++ + return 1; + } + +diff --git a/include/automount.h b/include/automount.h +index 71787a5..396391c 100644 +--- a/include/automount.h ++++ b/include/automount.h +@@ -335,6 +335,7 @@ size_t _strlen(const char *str, size_t max); + int cat_path(char *buf, size_t len, const char *dir, const char *base); + int ncat_path(char *buf, size_t len, + const char *dir, const char *base, size_t blen); ++int _strncmp(const char *s1, const char *s2, size_t n); + + /* Core automount definitions */ + +diff --git a/lib/cat_path.c b/lib/cat_path.c +index 60669db..c386b33 100644 +--- a/lib/cat_path.c ++++ b/lib/cat_path.c +@@ -87,3 +87,12 @@ int ncat_path(char *buf, size_t len, + return cat_path(buf, len, dir, name); + } + ++/* Compare first n bytes of s1 and s2 and that n == strlen(s1) */ ++int _strncmp(const char *s1, const char *s2, size_t n) ++{ ++ size_t len = strlen(s1); ++ ++ if (n != len) ++ return n - len; ++ return strncmp(s1, s2, n); ++} +diff --git a/lib/rpc_subs.c b/lib/rpc_subs.c +index 46b3e8d..5d6ead0 100644 +--- a/lib/rpc_subs.c ++++ b/lib/rpc_subs.c +@@ -234,6 +234,29 @@ static int rpc_do_create_client(struct sockaddr *addr, struct conn_info *info, i + + return 0; + } ++static int rpc_getport(struct conn_info *info, ++ struct pmap *parms, CLIENT *client, ++ unsigned short *port) ++{ ++ enum clnt_stat status; ++ ++ /* ++ * Check to see if server is up otherwise a getport will take ++ * forever to timeout. ++ */ ++ status = clnt_call(client, PMAPPROC_NULL, ++ (xdrproc_t) xdr_void, 0, (xdrproc_t) xdr_void, 0, ++ info->timeout); ++ ++ if (status == RPC_SUCCESS) { ++ status = clnt_call(client, PMAPPROC_GETPORT, ++ (xdrproc_t) xdr_pmap, (caddr_t) parms, ++ (xdrproc_t) xdr_u_short, (caddr_t) port, ++ info->timeout); ++ } ++ ++ return status; ++} + #else + static int rpc_do_create_client(struct sockaddr *addr, struct conn_info *info, int *fd, CLIENT **client) + { +@@ -267,9 +290,6 @@ static int rpc_do_create_client(struct sockaddr *addr, struct conn_info *info, i + laddr = (struct sockaddr *) &in4_laddr; + in4_raddr->sin_port = htons(info->port); + slen = sizeof(struct sockaddr_in); +- /* Use rpcbind v2 for AF_INET */ +- if (info->program == rpcb_prog) +- info->version = PMAPVERS; + } else if (addr->sa_family == AF_INET6) { + struct sockaddr_in6 *in6_raddr = (struct sockaddr_in6 *) addr; + in6_laddr.sin6_family = AF_INET6; +@@ -324,6 +344,255 @@ static int rpc_do_create_client(struct sockaddr *addr, struct conn_info *info, i + + return 0; + } ++ ++/* ++ * Thankfully nfs-utils had already dealt with this. ++ * Thanks to Chuck Lever for his nfs-utils patch series, much of ++ * which is used here. ++ */ ++static pthread_mutex_t proto_mutex = PTHREAD_MUTEX_INITIALIZER; ++ ++static enum clnt_stat rpc_get_netid(const sa_family_t family, ++ const int protocol, char **netid) ++{ ++ char *nc_protofmly, *nc_proto, *nc_netid; ++ struct netconfig *nconf; ++ struct protoent *proto; ++ void *handle; ++ ++ switch (family) { ++ case AF_LOCAL: ++ case AF_INET: ++ nc_protofmly = NC_INET; ++ break; ++ case AF_INET6: ++ nc_protofmly = NC_INET6; ++ break; ++ default: ++ return RPC_UNKNOWNPROTO; ++ } ++ ++ pthread_mutex_lock(&proto_mutex); ++ proto = getprotobynumber(protocol); ++ if (!proto) { ++ pthread_mutex_unlock(&proto_mutex); ++ return RPC_UNKNOWNPROTO; ++ } ++ nc_proto = strdup(proto->p_name); ++ pthread_mutex_unlock(&proto_mutex); ++ if (!nc_proto) ++ return RPC_SYSTEMERROR; ++ ++ handle = setnetconfig(); ++ while ((nconf = getnetconfig(handle)) != NULL) { ++ if (nconf->nc_protofmly != NULL && ++ strcmp(nconf->nc_protofmly, nc_protofmly) != 0) ++ continue; ++ if (nconf->nc_proto != NULL && ++ strcmp(nconf->nc_proto, nc_proto) != 0) ++ continue; ++ ++ nc_netid = strdup(nconf->nc_netid); ++ if (!nc_netid) { ++ free(nc_proto); ++ return RPC_SYSTEMERROR; ++ } ++ ++ *netid = nc_netid; ++ } ++ endnetconfig(handle); ++ free(nc_proto); ++ ++ return RPC_SUCCESS; ++} ++ ++static char *rpc_sockaddr2universal(const struct sockaddr *addr) ++{ ++ const struct sockaddr_in6 *sin6 = (const struct sockaddr_in6 *) addr; ++ const struct sockaddr_un *sun = (const struct sockaddr_un *) addr; ++ const struct sockaddr_in *sin = (const struct sockaddr_in *) addr; ++ char buf[INET6_ADDRSTRLEN + 8 /* for port information */]; ++ uint16_t port; ++ size_t count; ++ char *result; ++ int len; ++ ++ switch (addr->sa_family) { ++ case AF_LOCAL: ++ return strndup(sun->sun_path, sizeof(sun->sun_path)); ++ case AF_INET: ++ if (inet_ntop(AF_INET, (const void *)&sin->sin_addr.s_addr, ++ buf, (socklen_t)sizeof(buf)) == NULL) ++ goto out_err; ++ port = ntohs(sin->sin_port); ++ break; ++ case AF_INET6: ++ if (inet_ntop(AF_INET6, (const void *)&sin6->sin6_addr, ++ buf, (socklen_t)sizeof(buf)) == NULL) ++ goto out_err; ++ port = ntohs(sin6->sin6_port); ++ break; ++ default: ++ goto out_err; ++ } ++ ++ count = sizeof(buf) - strlen(buf); ++ len = snprintf(buf + strlen(buf), count, ".%u.%u", ++ (unsigned)(port >> 8), (unsigned)(port & 0xff)); ++ /* before glibc 2.0.6, snprintf(3) could return -1 */ ++ if (len < 0 || (size_t)len > count) ++ goto out_err; ++ ++ result = strdup(buf); ++ return result; ++ ++out_err: ++ return NULL; ++} ++ ++static int rpc_universal2port(const char *uaddr) ++{ ++ char *addrstr; ++ char *p, *endptr; ++ unsigned long portlo, porthi; ++ int port = -1; ++ ++ addrstr = strdup(uaddr); ++ if (!addrstr) ++ return -1; ++ ++ p = strrchr(addrstr, '.'); ++ if (!p) ++ goto out; ++ ++ portlo = strtoul(p + 1, &endptr, 10); ++ if (*endptr != '\0' || portlo > 255) ++ goto out; ++ *p = '\0'; ++ ++ p = strrchr(addrstr, '.'); ++ if (!p) ++ goto out; ++ ++ porthi = strtoul(p + 1, &endptr, 10); ++ if (*endptr != '\0' || porthi > 255) ++ goto out; ++ *p = '\0'; ++ ++ port = (porthi << 8) | portlo; ++ ++out: ++ free(addrstr); ++ return port; ++} ++ ++static enum clnt_stat rpc_rpcb_getport(CLIENT *client, ++ struct rpcb *parms, ++ struct timeval timeout, ++ unsigned short *port) ++{ ++ rpcvers_t rpcb_version; ++ struct rpc_err rpcerr; ++ int s_port = 0; ++ ++ for (rpcb_version = RPCBVERS_4; ++ rpcb_version >= RPCBVERS_3; ++ rpcb_version--) { ++ enum clnt_stat status; ++ char *uaddr = NULL; ++ ++ CLNT_CONTROL(client, CLSET_VERS, (void *) &rpcb_version); ++ status = CLNT_CALL(client, (rpcproc_t) RPCBPROC_GETADDR, ++ (xdrproc_t) xdr_rpcb, (void *) parms, ++ (xdrproc_t) xdr_wrapstring, (void *) &uaddr, ++ timeout); ++ ++ switch (status) { ++ case RPC_SUCCESS: ++ if ((uaddr == NULL) || (uaddr[0] == '\0')) ++ return RPC_PROGNOTREGISTERED; ++ ++ s_port = rpc_universal2port(uaddr); ++ xdr_free((xdrproc_t) xdr_wrapstring, (char *) &uaddr); ++ if (s_port == -1) { ++ return RPC_N2AXLATEFAILURE; ++ } ++ *port = s_port; ++ return RPC_SUCCESS; ++ ++ case RPC_PROGVERSMISMATCH: ++ clnt_geterr(client, &rpcerr); ++ if (rpcerr.re_vers.low > RPCBVERS4) ++ return status; ++ continue; ++ ++ case RPC_PROGUNAVAIL: ++ continue; ++ ++ case RPC_PROGNOTREGISTERED: ++ continue; ++ ++ default: ++ /* Most likely RPC_TIMEDOUT or RPC_CANTRECV */ ++ return status; ++ } ++ } ++ ++ return RPC_PROGNOTREGISTERED; ++} ++ ++static enum clnt_stat rpc_getport(struct conn_info *info, ++ struct pmap *parms, CLIENT *client, ++ unsigned short *port) ++{ ++ enum clnt_stat status; ++ struct sockaddr *paddr, addr; ++ struct rpcb rpcb_parms; ++ char *netid, *raddr; ++ ++ if (info->addr) ++ paddr = info->addr; ++ else { ++ if (!clnt_control(client, CLGET_SERVER_ADDR, (char *) &addr)) ++ return RPC_UNKNOWNADDR; ++ paddr = &addr; ++ } ++ ++ netid = NULL; ++ status = rpc_get_netid(paddr->sa_family, info->proto, &netid); ++ if (status != RPC_SUCCESS) ++ return status; ++ ++ raddr = rpc_sockaddr2universal(paddr); ++ if (!raddr) { ++ free(netid); ++ return RPC_UNKNOWNADDR; ++ } ++ ++ memset(&rpcb_parms, 0, sizeof(rpcb_parms)); ++ rpcb_parms.r_prog = parms->pm_prog; ++ rpcb_parms.r_vers = parms->pm_vers; ++ rpcb_parms.r_netid = netid; ++ rpcb_parms.r_addr = raddr; ++ rpcb_parms.r_owner = ""; ++ ++ status = rpc_rpcb_getport(client, &rpcb_parms, info->timeout, port); ++ ++ free(netid); ++ free(raddr); ++ ++ if (status == RPC_PROGNOTREGISTERED) { ++ /* Last chance, version 2 uses a different procedure */ ++ rpcvers_t rpcb_version = PMAPVERS; ++ CLNT_CONTROL(client, CLSET_VERS, (void *) &rpcb_version); ++ status = clnt_call(client, PMAPPROC_GETPORT, ++ (xdrproc_t) xdr_pmap, (caddr_t) parms, ++ (xdrproc_t) xdr_u_short, (caddr_t) port, ++ info->timeout); ++ } ++ ++ return status; ++} + #endif + + #if defined(HAVE_GETRPCBYNAME) || defined(HAVE_GETSERVBYNAME) +@@ -380,7 +649,7 @@ static unsigned short rpc_getrpcbport(const int proto) + done: + pthread_mutex_unlock(&rpcb_mutex); + #endif +- return (unsigned short) PMAPPORT; ++ return (unsigned short) htons(PMAPPORT); + } + + /* +@@ -412,6 +681,12 @@ static int create_client(struct conn_info *info, CLIENT **client) + goto done; + if (ret == -EHOSTUNREACH) + goto out_close; ++ if (ret == -EINVAL) { ++ char buf[MAX_ERR_BUF]; ++ char *estr = strerror_r(-ret, buf, MAX_ERR_BUF); ++ error(LOGOPT_ANY, "connect() failed: %s", estr); ++ goto out_close; ++ } + + if (!info->client && fd != RPC_ANYSOCK) { + close(fd); +@@ -618,6 +893,8 @@ int rpc_portmap_getport(struct conn_info *info, + + memset(&pmap_info, 0, sizeof(struct conn_info)); + ++ pmap_info.proto = proto; ++ + if (proto == IPPROTO_TCP) + pmap_info.timeout.tv_sec = PMAP_TOUT_TCP; + else +@@ -647,20 +924,7 @@ int rpc_portmap_getport(struct conn_info *info, + return ret; + } + +- /* +- * Check to see if server is up otherwise a getport will take +- * forever to timeout. +- */ +- status = clnt_call(client, PMAPPROC_NULL, +- (xdrproc_t) xdr_void, 0, (xdrproc_t) xdr_void, 0, +- pmap_info.timeout); +- +- if (status == RPC_SUCCESS) { +- status = clnt_call(client, PMAPPROC_GETPORT, +- (xdrproc_t) xdr_pmap, (caddr_t) parms, +- (xdrproc_t) xdr_u_short, (caddr_t) port, +- pmap_info.timeout); +- } ++ status = rpc_getport(&pmap_info, parms, client, port); + + if (!info->client) { + /* +@@ -867,6 +1131,11 @@ static int rpc_get_exports_proto(struct conn_info *info, exports *exp) + clnt_control(client, CLSET_RETRY_TIMEOUT, (char *) &info->timeout); + + client->cl_auth = authunix_create_default(); ++ if (client->cl_auth == NULL) { ++ error(LOGOPT_ANY, "auth create failed"); ++ clnt_destroy(client); ++ return 0; ++ } + + vers_entry = 0; + while (1) { +diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c +index 2ab1e8c..04b1da7 100644 +--- a/modules/lookup_ldap.c ++++ b/modules/lookup_ldap.c +@@ -846,20 +846,20 @@ int get_property(unsigned logopt, xmlNodePtr node, const char *prop, char **valu + return 0; + } + +-#ifdef WITH_SASL + /* + * For plain text, login and digest-md5 authentication types, we need + * user and password credentials. + */ + int authtype_requires_creds(const char *authtype) + { ++#ifdef WITH_SASL + if (!strncmp(authtype, "PLAIN", strlen("PLAIN")) || + !strncmp(authtype, "DIGEST-MD5", strlen("DIGEST-MD5")) || + !strncmp(authtype, "LOGIN", strlen("LOGIN"))) + return 1; ++#endif + return 0; + } +-#endif + + /* + * Returns: +diff --git a/modules/mount_autofs.c b/modules/mount_autofs.c +index 319f2e4..61aec70 100644 +--- a/modules/mount_autofs.c ++++ b/modules/mount_autofs.c +@@ -116,17 +116,17 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, + while (*comma != '\0' && *comma != ',') + comma++; + +- if (strncmp(cp, "nobrowse", 8) == 0) ++ if (_strncmp(cp, "nobrowse", 8) == 0) + ghost = 0; +- else if (strncmp(cp, "nobind", 6) == 0) ++ else if (_strncmp(cp, "nobind", 6) == 0) + nobind = 1; +- else if (strncmp(cp, "browse", 6) == 0) ++ else if (_strncmp(cp, "browse", 6) == 0) + ghost = 1; +- else if (strncmp(cp, "symlink", 7) == 0) ++ else if (_strncmp(cp, "symlink", 7) == 0) + symlnk = 1; +- else if (strncmp(cp, "hosts", 5) == 0) ++ else if (_strncmp(cp, "hosts", 5) == 0) + hosts = 1; +- else if (strncmp(cp, "timeout=", 8) == 0) { ++ else if (_strncmp(cp, "timeout=", 8) == 0) { + char *val = strchr(cp, '='); + unsigned tout; + if (val) { +diff --git a/modules/mount_bind.c b/modules/mount_bind.c +index 2b70104..a70bf3a 100644 +--- a/modules/mount_bind.c ++++ b/modules/mount_bind.c +@@ -107,7 +107,7 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int + end--; + + o_len = end - cp + 1; +- if (strncmp("symlink", cp, o_len) == 0) ++ if (_strncmp("symlink", cp, o_len) == 0) + symlnk = 1; + } + } +diff --git a/modules/mount_ext2.c b/modules/mount_ext2.c +index 1edf347..1bc429d 100644 +--- a/modules/mount_ext2.c ++++ b/modules/mount_ext2.c +@@ -77,7 +77,7 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int + + if (options && options[0]) { + for (p = options; (p1 = strchr(p, ',')); p = p1) +- if (!strncmp(p, "ro", p1 - p) && ++p1 - p == sizeof("ro")) ++ if (!_strncmp(p, "ro", p1 - p) && ++p1 - p == sizeof("ro")) + ro = 1; + if (!strcmp(p, "ro")) + ro = 1; +diff --git a/modules/mount_nfs.c b/modules/mount_nfs.c +index 5a582ef..315fc99 100644 +--- a/modules/mount_nfs.c ++++ b/modules/mount_nfs.c +@@ -126,32 +126,32 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int + + o_len = end - cp + 1; + +- if (strncmp("proto=rdma", cp, o_len) == 0 || +- strncmp("rdma", cp, o_len) == 0) ++ if (_strncmp("proto=rdma", cp, o_len) == 0 || ++ _strncmp("rdma", cp, o_len) == 0) + rdma = 1; + +- if (strncmp("nosymlink", cp, o_len) == 0) { ++ if (_strncmp("nosymlink", cp, o_len) == 0) { + warn(ap->logopt, MODPREFIX + "the \"nosymlink\" option is depricated " + "and will soon be removed, " + "use the \"nobind\" option instead"); + nosymlink = 1; +- } else if (strncmp("nobind", cp, o_len) == 0) { ++ } else if (_strncmp("nobind", cp, o_len) == 0) { + nobind = 1; +- } else if (strncmp("no-use-weight-only", cp, o_len) == 0) { ++ } else if (_strncmp("no-use-weight-only", cp, o_len) == 0) { + flags &= ~MOUNT_FLAG_USE_WEIGHT_ONLY; +- } else if (strncmp("use-weight-only", cp, o_len) == 0) { ++ } else if (_strncmp("use-weight-only", cp, o_len) == 0) { + flags |= MOUNT_FLAG_USE_WEIGHT_ONLY; + } else { +- if (strncmp("vers=4", cp, o_len) == 0 || +- strncmp("nfsvers=4", cp, o_len) == 0) ++ if (_strncmp("vers=4", cp, o_len) == 0 || ++ _strncmp("nfsvers=4", cp, o_len) == 0) + vers = NFS4_VERS_MASK | TCP_SUPPORTED; +- else if (strncmp("vers=3", cp, o_len) == 0 || +- strncmp("nfsvers=3", cp, o_len) == 0) { ++ else if (_strncmp("vers=3", cp, o_len) == 0 || ++ _strncmp("nfsvers=3", cp, o_len) == 0) { + vers &= ~(NFS4_VERS_MASK | NFS_VERS_MASK); + vers |= NFS3_REQUESTED; +- } else if (strncmp("vers=2", cp, o_len) == 0 || +- strncmp("nfsvers=2", cp, o_len) == 0) { ++ } else if (_strncmp("vers=2", cp, o_len) == 0 || ++ _strncmp("nfsvers=2", cp, o_len) == 0) { + vers &= ~(NFS4_VERS_MASK | NFS_VERS_MASK); + vers |= NFS2_REQUESTED; + } else if (strstr(cp, "port=") == cp && +@@ -164,16 +164,16 @@ int mount_mount(struct autofs_point *ap, const char *root, const char *name, int + if (port < 0) + port = 0; + port_opt = cp; +- } else if (strncmp("proto=udp", cp, o_len) == 0 || +- strncmp("udp", cp, o_len) == 0) { ++ } else if (_strncmp("proto=udp", cp, o_len) == 0 || ++ _strncmp("udp", cp, o_len) == 0) { + vers &= ~TCP_SUPPORTED; +- } else if (strncmp("proto=tcp", cp, o_len) == 0 || +- strncmp("tcp", cp, o_len) == 0) { ++ } else if (_strncmp("proto=tcp", cp, o_len) == 0 || ++ _strncmp("tcp", cp, o_len) == 0) { + vers &= ~UDP_SUPPORTED; + } + /* Check for options that also make sense + with bind mounts */ +- else if (strncmp("ro", cp, o_len) == 0) ++ else if (_strncmp("ro", cp, o_len) == 0) + ro = 1; + /* and jump over trailing white space */ + memcpy(nfsp, cp, comma - cp + 1); +diff --git a/modules/parse_sun.c b/modules/parse_sun.c +index 30820b5..9a877c8 100644 +--- a/modules/parse_sun.c ++++ b/modules/parse_sun.c +@@ -511,29 +511,29 @@ static int sun_mount(struct autofs_point *ap, const char *root, + while (*comma != '\0' && *comma != ',') + comma++; + +- if (strncmp("fstype=", cp, 7) == 0) { ++ if (_strncmp("fstype=", cp, 7) == 0) { + int typelen = comma - (cp + 7); + fstype = alloca(typelen + 1); + memcpy(fstype, cp + 7, typelen); + fstype[typelen] = '\0'; +- } else if (strncmp("nonstrict", cp, 9) == 0) { ++ } else if (_strncmp("nonstrict", cp, 9) == 0) { + nonstrict = 1; +- } else if (strncmp("strict", cp, 6) == 0) { ++ } else if (_strncmp("strict", cp, 6) == 0) { + nonstrict = 0; +- } else if (strncmp("nobrowse", cp, 8) == 0 || +- strncmp("browse", cp, 6) == 0 || +- strncmp("timeout=", cp, 8) == 0) { ++ } else if (_strncmp("nobrowse", cp, 8) == 0 || ++ _strncmp("browse", cp, 6) == 0 || ++ _strncmp("timeout=", cp, 8) == 0) { + if (strcmp(fstype, "autofs") == 0 || + strstr(cp, "fstype=autofs")) { + memcpy(np, cp, comma - cp + 1); + np += comma - cp + 1; + } +- } else if (strncmp("no-use-weight-only", cp, 18) == 0) { ++ } else if (_strncmp("no-use-weight-only", cp, 18) == 0) { + use_weight_only = -1; +- } else if (strncmp("use-weight-only", cp, 15) == 0) { ++ } else if (_strncmp("use-weight-only", cp, 15) == 0) { + use_weight_only = MOUNT_FLAG_USE_WEIGHT_ONLY; +- } else if (strncmp("bg", cp, 2) == 0 || +- strncmp("nofg", cp, 4) == 0) { ++ } else if (_strncmp("bg", cp, 2) == 0 || ++ _strncmp("nofg", cp, 4) == 0) { + continue; + } else { + memcpy(np, cp, comma - cp + 1); +@@ -862,7 +862,7 @@ static int validate_location(unsigned int logopt, char *loc) + *ptr == '-' || *ptr == '.' || *ptr == '_' || + *ptr == ',' || *ptr == '(' || *ptr == ')' || + *ptr == '#' || *ptr == '@' || *ptr == ':' || +- *ptr == '[' || *ptr == ']')) { ++ *ptr == '[' || *ptr == ']' || *ptr == '%')) { + error(logopt, "invalid character \"%c\" " + "found in location %s", *ptr, loc); + return 0; +diff --git a/modules/replicated.c b/modules/replicated.c +index 5fdd9d9..2463235 100644 +--- a/modules/replicated.c ++++ b/modules/replicated.c +@@ -444,9 +444,12 @@ static unsigned int get_nfs_info(unsigned logopt, struct host *host, + host->name, proto, version); + + rpc_info->proto = proto; +- if (port < 0) +- rpc_info->port = NFS_PORT; +- else if (port > 0) ++ if (port < 0) { ++ if (version & NFS4_REQUESTED) ++ rpc_info->port = NFS_PORT; ++ else ++ port = 0; ++ } else if (port > 0) + rpc_info->port = port; + + memset(&parms, 0, sizeof(struct pmap)); diff --git a/community/dwdiff/PKGBUILD b/community/dwdiff/PKGBUILD index 6350f5fb7..701edc468 100644 --- a/community/dwdiff/PKGBUILD +++ b/community/dwdiff/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 98737 2013-10-17 14:01:43Z andyrtr $ +# $Id: PKGBUILD 103699 2014-01-10 10:25:00Z spupykin $ # Maintainer: Sergej Pupykin pkgname=dwdiff -pkgver=2.0.4 -pkgrel=5 +pkgver=2.0.9 +pkgrel=1 pkgdesc="A front-end for the diff program that operates at the word level instead of the line level" arch=('i686' 'x86_64') url="http://os.ghalkes.nl/dwdiff.html" depends=('diffutils' 'icu') license=('GPL') source=("http://os.ghalkes.nl/dist/$pkgname-$pkgver.tgz") -md5sums=('1bb69cbfb76583f69c6912f925fc4cec') +md5sums=('f8364e1257011cc9dfe349775a651606') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/elasticsearch/PKGBUILD b/community/elasticsearch/PKGBUILD index f25e85294..af8d71bb0 100644 --- a/community/elasticsearch/PKGBUILD +++ b/community/elasticsearch/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 103596 2014-01-08 09:32:01Z mtorromeo $ +# $Id: PKGBUILD 103723 2014-01-10 13:09:44Z mtorromeo $ # Maintainer: Massimiliano Torromeo # Contributor: Marcello "mererghost" Rocha # Refactored by Blaž "Speed" Hrastnik pkgname=elasticsearch -pkgver=0.90.9 +pkgver=0.90.10 pkgrel=1 pkgdesc="Distributed RESTful search engine built on top of Lucene" arch=('i686' 'x86_64') @@ -70,6 +70,6 @@ package() { install -Dm644 "$srcdir/elasticsearch-tmpfile.conf" "$pkgdir/usr/lib/tmpfiles.d/elasticsearch.conf" } -sha256sums=('5521c4dc775c18ee4abd6cd6ad94cdc1f106d63fddd3d97cfae1ec25b3f01095' +sha256sums=('78c87f600878a6cab41c1d447f6a40b25892a59f8fb49da11392a682884fb8df' '09a4027780d73103c26f311c64774dcbc47b5e1d54789c1f2d9c697f518f2eeb' '48b5a876e14819270c85f8ca626a011e01d10a2728758ced9a4d5bcf5c1fd23f') diff --git a/community/glfw/PKGBUILD b/community/glfw/PKGBUILD index 7d44ad480..db5bda30f 100644 --- a/community/glfw/PKGBUILD +++ b/community/glfw/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 98064 2013-10-05 08:59:45Z svenstaro $ +# $Id: PKGBUILD 103691 2014-01-09 23:58:47Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: philefou # Contributor: lindquist @@ -7,7 +7,7 @@ # Contributor: SpepS pkgname=glfw -pkgver=3.0.3 +pkgver=3.0.4 pkgrel=1 pkgdesc="A free, open source, portable framework for OpenGL application development" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ license=('custom:ZLIB') depends=('libgl' 'libxrandr' 'glu' 'xorg-xinput') makedepends=('mesa' 'cmake' 'doxygen') source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('623977c096b28c25528e3c958e9fb3fd') +md5sums=('133a9faed6f1fbd527551a7e42aeb4f9') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/glusterfs/PKGBUILD b/community/glusterfs/PKGBUILD index e841b8cc0..bd9fb167c 100644 --- a/community/glusterfs/PKGBUILD +++ b/community/glusterfs/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 102127 2013-12-05 14:49:23Z spupykin $ +# $Id: PKGBUILD 103705 2014-01-10 10:51:26Z spupykin $ # Maintainer: Sergej Pupykin # Contributors: # Andrei Antoukh - niwi@niwi.be - http://www.niwi.be # henning mueller pkgname=glusterfs -pkgver=3.4.1 +pkgver=3.4.2 _basever=`echo $pkgver | cut -f1-2 -d.` -pkgrel=2 +pkgrel=1 pkgdesc='Is a cluster file-system capable of scaling to several peta-bytes.' arch=(i686 x86_64) url='http://www.gluster.org/' @@ -15,7 +15,7 @@ license=(GPL2 LGPL3) depends=(fuse python2 libxml2) makedepends=(flex bison) source=(http://download.gluster.org/pub/gluster/glusterfs/$_basever/$pkgver/glusterfs-$pkgver.tar.gz) -md5sums=('dce3d066b7351b360454ea9ca4cabe4c') +md5sums=('7c05304a9aca3c85ff27458461783623') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/opensips/PKGBUILD b/community/opensips/PKGBUILD index 23ccc3729..bb7205168 100644 --- a/community/opensips/PKGBUILD +++ b/community/opensips/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 103436 2014-01-05 21:24:23Z spupykin $ +# $Id: PKGBUILD 103707 2014-01-10 10:51:45Z spupykin $ # Maintainer: Sergej Pupykin pkgname=opensips pkgver=1.10.0 -pkgrel=1 +pkgrel=2 pkgdesc="An Open Source SIP Server able to act as a SIP proxy, registrar, location server, redirect server ..." url="http://www.opensips.org" depends=('gcc-libs' 'openssl' 'db' 'attr' 'libxml2') @@ -46,7 +46,7 @@ build() { make \ include_modules="ldap db_mysql db_postgres db_unixodbc presence presence_xml h350" \ - TLS=1 LIBDIR=lib + TLS=1 LIBDIR=lib PREFIX=/usr } package() { @@ -54,7 +54,7 @@ package() { make \ include_modules="ldap db_mysql db_postgres db_unixodbc presence presence_xml h350" \ - TLS=1 DESTDIR=$pkgdir/usr LIBDIR=lib install + TLS=1 BASEDIR=$pkgdir PREFIX=/usr LIBDIR=lib install # Conforms to the arch packaging standards (http://wiki.archlinux.org/index.php/Arch_Packaging_Standards) mkdir -p $pkgdir/etc/ diff --git a/community/rust/PKGBUILD b/community/rust/PKGBUILD index b6831ab5d..fb1832001 100644 --- a/community/rust/PKGBUILD +++ b/community/rust/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 97658 2013-09-27 01:45:47Z thestinger $ +# $Id: PKGBUILD 103695 2014-01-10 03:08:10Z thestinger $ # Maintainer: Daniel Micay pkgname=rust -pkgver=0.8 -pkgrel=1 +pkgver=0.9 +pkgrel=2 arch=('i686' 'x86_64') pkgdesc='A safe, concurrent, practical language' url='http://www.rust-lang.org/' @@ -11,9 +11,10 @@ depends=(gcc shared-mime-info) makedepends=(libffi perl python2 curl chrpath) source=("http://static.rust-lang.org/dist/rust-${pkgver}.tar.gz" "http://static.rust-lang.org/dist/rust-${pkgver}.tar.gz.asc") -sha256sums=('42f791ab1537357fe0f63d67ffe6bcb64ecf16b2bd3f1484ab589823f5914182' +sha256sums=('c0911c3545b797a1ca16f3d76bf5ed234754b828efd1e22c182c7300ac7dd5d1' 'SKIP') install=rust.install +options=(staticlibs) build() { cd rust-$pkgver @@ -57,8 +58,8 @@ package() { cd "$pkgdir/usr" # https://github.com/mozilla/rust/issues/5219 - chrpath -d bin/* lib/*.so lib/rustc/*/lib/*.so + chrpath -d bin/* lib/*.so lib/rustlib/*/lib/*.so cd lib - ln -sf rustc/$CARCH-unknown-linux-gnu/lib/* . + ln -sf rustlib/$CARCH-unknown-linux-gnu/lib/* . } diff --git a/community/stunnel/PKGBUILD b/community/stunnel/PKGBUILD index eb440b4bf..988e5c2e8 100644 --- a/community/stunnel/PKGBUILD +++ b/community/stunnel/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99994 2013-10-31 02:53:44Z allan $ +# $Id: PKGBUILD 103727 2014-01-10 21:25:08Z bgyorgy $ # Maintainer: Lukas Fleischer # Contributor: Kaiting Chen # Contributor: Daniel J Griffiths @@ -6,7 +6,7 @@ pkgname=stunnel pkgver=4.56 -pkgrel=3 +pkgrel=4 pkgdesc="A program that allows you to encrypt arbitrary TCP connections inside SSL" arch=('i686' 'x86_64') url="http://www.stunnel.org" @@ -42,17 +42,10 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install - for i in ca.pl importCA.sh; do - install -Dm755 "tools/$i" "$pkgdir/usr/share/stunnel/$i" - done - - install -Dm644 tools/stunnel.cnf "$pkgdir/etc/stunnel/stunnel.cnf" + install -Dm644 tools/stunnel.cnf "$pkgdir/etc/stunnel/stunnel-openssl.cnf-sample" + install -Dm644 tools/stunnel.service "$pkgdir/usr/lib/systemd/system/stunnel.service" install -Dm644 "$srcdir/stunnel.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/stunnel.conf" - # move systemd service into place - install -dm755 "$pkgdir/usr/lib/systemd/system" - mv "tools/stunnel.service" "$pkgdir/usr/lib/systemd/system/" - sed -e "s:/usr/var/lib/stunnel/:/var/run/stunnel:g" \ -e "s:/usr/etc/stunnel/:/etc/stunnel/:g" \ -e "s:no\(body\|group\):stunnel:g" \ diff --git a/community/zynaddsubfx/PKGBUILD b/community/zynaddsubfx/PKGBUILD index b5ce8787a..9f5dcdcfb 100644 --- a/community/zynaddsubfx/PKGBUILD +++ b/community/zynaddsubfx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72810 2012-06-22 13:58:49Z spupykin $ +# $Id: PKGBUILD 103709 2014-01-10 12:47:51Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: SpepS # Contributor: Ionut Biru @@ -6,7 +6,7 @@ pkgname=zynaddsubfx pkgver=2.4.3 -pkgrel=1 +pkgrel=2 pkgdesc="Opensource software synthesizer capable of making a countless number of instruments." arch=('i686' 'x86_64') url="http://zynaddsubfx.sourceforge.net" @@ -15,28 +15,26 @@ depends=('fltk' 'libgl' 'fftw' 'lash' 'mxml') makedepends=('cmake' 'pkgconfig' 'mesa' 'setconf' 'gendesk') options=('!emptydirs') source=("http://switch.dl.sourceforge.net/sourceforge/$pkgname/ZynAddSubFX-$pkgver.tar.bz2" - "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk.patch" - "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/zynaddsubfx/files/zynaddsubfx-2.4.1-fltk13.patch" "$pkgname.svg") md5sums=('2e8994cc54e5f1a64b77dfac3baf0d9a' - 'eb95d339ff5deac8c6b54965f04a8c60' - '49464a33ab9c4250520eda0df7705663' '6f7e9c3ce3947088a10c99c46a65431f') build() { cd "$srcdir" - gendesk + gendesk $startdir/PKGBUILD setconf "$pkgname.desktop" Icon "$pkgname.svg" cd "ZynAddSubFX-$pkgver" - # patches -# patch -p1 -i "$srcdir/$pkgname-$pkgver-fltk.patch" -# patch -p1 -i "$srcdir/$pkgname-$pkgver-fltk13.patch" sed -i '1,1i#include ' src/Nio/NulEngine.cpp [ -d build ] || mkdir build && cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr -DOutputModule=jack -DGuiModule=fltk .. + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DDefaultOutput=jack \ + -DDefaultInput=jack \ + -DGuiModule=fltk \ + .. make # build external programs diff --git a/extra/clutter-gst/PKGBUILD b/extra/clutter-gst/PKGBUILD index a1bcfbf96..e9c29232e 100644 --- a/extra/clutter-gst/PKGBUILD +++ b/extra/clutter-gst/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 197896 2013-10-30 11:32:22Z allan $ +# $Id: PKGBUILD 203440 2014-01-10 21:09:04Z heftig $ # Maintainer: Jan "heftig" Steffens pkgname=clutter-gst -pkgver=2.0.8 +pkgver=2.0.10 pkgrel=1 pkgdesc="GStreamer bindings for clutter" arch=(i686 x86_64) @@ -11,7 +11,7 @@ license=(LGPL) depends=(clutter gst-plugins-base-libs libxdamage gst-plugins-bad) makedepends=(gobject-introspection) source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('cee6b0667c74a54fdf43f0ec7c1dc8ff0ffd1c594e0d43529de45048f8080a4d') +sha256sums=('f00cf492a6d4f1036c70d8a0ebd2f0f47586ea9a9b49b1ffda79c9dc7eadca00') build() { cd $pkgname-$pkgver diff --git a/extra/cogl/PKGBUILD b/extra/cogl/PKGBUILD index 4c9de3f79..089ba8f7d 100644 --- a/extra/cogl/PKGBUILD +++ b/extra/cogl/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 197898 2013-10-30 11:33:08Z allan $ +# $Id: PKGBUILD 203439 2014-01-10 21:08:52Z heftig $ # Maintainer: Ionut Biru pkgname=cogl pkgver=1.16.0 -pkgrel=2 +pkgrel=3 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer" arch=('i686' 'x86_64') url="http://www.clutter-project.org/" license=('GPL2') -depends=('libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'pango') -makedepends=('mesa' 'gobject-introspection') +depends=('mesa' 'libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'pango' 'libxrandr') +makedepends=('gobject-introspection') options=(!emptydirs) source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) sha256sums=('75c2c4636a050fda7ee8722ce3d9c618b08799ed92bbb72b4fdff3e73b096094') diff --git a/extra/easytag/PKGBUILD b/extra/easytag/PKGBUILD index 6c0973b0c..f7a1916c4 100644 --- a/extra/easytag/PKGBUILD +++ b/extra/easytag/PKGBUILD @@ -1,37 +1,25 @@ -# $Id: PKGBUILD 178421 2013-02-21 20:49:20Z guillaume $ +# $Id: PKGBUILD 203446 2014-01-10 22:37:23Z guillaume $ # Maintainer: Guillaume ALAUX # Contributor: Kevin Piche # Contributor: Aaron Griffin # Contributor: dorphell pkgname=easytag -pkgver=2.1.8 -pkgrel=2 +pkgver=2.1.9 +pkgrel=1 pkgdesc='Utility for viewing and editing tags for most audio formats' arch=('i686' 'x86_64') license=('GPL') url='http://easytag.sourceforge.net/' -makedepends=('intltool') +makedepends=('intltool' 'itstool') depends=('id3lib' 'libid3tag' 'gtk2' 'libvorbis' 'flac' 'speex' 'wavpack' 'taglib' 'desktop-file-utils' 'hicolor-icon-theme') install=${pkgname}.install -source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz - easytag-2.1.8-fix_mixed_declarations_and_code.patch - easytag-2.1.8-fix_mime_directory_association.patch) -sha256sums=('1a2f75c9a70aeb7a404dfaa96e0df0eaaa325df301c58f0f708d0da4c08e65a9' - '453d2a102cf482d6d1586b11e531bf267f302aab3ee6b8c43b6bcc61cfa2ede5' - '693da67f0c96d51ad363bb9e70a22b402bc7c5058d648981919a115381700cd3') +source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('f5a6e742a458ef6f48f2d5e98a24182a9c87a213e847fcce75c757ac90273501') build() { cd "${srcdir}/${pkgname}-${pkgver}" - - # Already fixed upstream - # http://git.gnome.org/browse/easytag/commit/src/wavpack_tag.c?id=17a33964c32035f6b9986e13726ae3582a126244 - patch -p0 -i ${srcdir}/easytag-2.1.8-fix_mixed_declarations_and_code.patch - - # Bad Easytag! Bad! You don't know your place! - patch -p0 -i ${srcdir}/easytag-2.1.8-fix_mime_directory_association.patch - ./configure --prefix=/usr make } diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD index 16c4030c7..884b8cec1 100644 --- a/extra/graphviz/PKGBUILD +++ b/extra/graphviz/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 198050 2013-10-30 12:29:51Z allan $ +# $Id: PKGBUILD 203404 2014-01-10 04:16:47Z bisson $ # Maintainer: Gaetan Bisson # Contributor: kevin # Contributor: John Proctor pkgname=graphviz pkgver=2.34.0 -pkgrel=2 +pkgrel=3 pkgdesc='Graph visualization software' url='http://www.graphviz.org/' license=('CPL') @@ -23,14 +23,20 @@ optdepends=('mono: sharp bindings' 'tcl: tcl bindings' 'qt4: gvedit') source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz" + 'yyerror0.patch' + 'yyerror1.patch' 'dotty.patch') sha1sums=('5a0c00bebe7f4c7a04523db21f40966dc9f0d441' + '7a6fe4f532974d9ca173b1aba9927bdeb5f80be9' + '6d76a230ee6c11bcd610ebe56f98e96ecef6217d' '31bc9f505c8b6470289a0d6ec31c237765cba239') install=install prepare() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../yyerror0.patch + patch -p1 -i ../yyerror1.patch patch -p1 -i ../dotty.patch sed \ -e '/LIBPOSTFIX="64"/d' \ diff --git a/extra/graphviz/yyerror0.patch b/extra/graphviz/yyerror0.patch new file mode 100644 index 000000000..f8bb98373 --- /dev/null +++ b/extra/graphviz/yyerror0.patch @@ -0,0 +1,53 @@ +From 7aaddf52cd98589fb0c3ab72a393f8411838438a Mon Sep 17 00:00:00 2001 +From: "Emden R. Gansner" +Date: Fri, 4 Oct 2013 09:06:39 -0400 +Subject: [PATCH] Fix buffer overflow problem when reporting a syntax error + with a very long input line + +--- + lib/cgraph/scan.l | 21 +++++++++++++++------ + 1 file changed, 15 insertions(+), 6 deletions(-) + +diff --git a/lib/cgraph/scan.l b/lib/cgraph/scan.l +index 3cfde0f..2efd203 100644 +--- a/lib/cgraph/scan.l ++++ b/lib/cgraph/scan.l +@@ -16,6 +16,7 @@ + %{ + #include + #include ++#include + #include + #define GRAPH_EOF_TOKEN '@' /* lex class must be defined below */ + /* this is a workaround for linux flex */ +@@ -191,13 +192,21 @@ ID ({NAME}|{NUMBER}) + %% + void yyerror(char *str) + { ++ unsigned char xbuf[BUFSIZ]; + char buf[BUFSIZ]; +- if (InputFile) +- sprintf(buf,"%s:%d: %s in line %d near '%s'\n",InputFile, line_num, +- str,line_num,yytext); +- else +- sprintf(buf," %s in line %d near '%s'\n", str,line_num,yytext); +- agerr(AGWARN,buf); ++ agxbuf xb; ++ ++ agxbinit(&xb, BUFSIZ, xbuf); ++ if (InputFile) { ++ agxbput (&xb, InputFile); ++ agxbput (&xb, ": "); ++ } ++ sprintf(buf," %s in line %d near '", str,line_num); ++ agxbput (&xb, buf); ++ agxbput (&xb, yytext); ++ agxbput (&xb,"'\n"); ++ agerr(AGWARN,agxbuse(&xb)); ++ agxbfree(&xb); + } + /* must be here to see flex's macro defns */ + void aglexeof() { unput(GRAPH_EOF_TOKEN); } +-- +1.8.5.1 + diff --git a/extra/graphviz/yyerror1.patch b/extra/graphviz/yyerror1.patch new file mode 100644 index 000000000..4f1faf4df --- /dev/null +++ b/extra/graphviz/yyerror1.patch @@ -0,0 +1,26 @@ +From d266bb2b4154d11c27252b56d86963aef4434750 Mon Sep 17 00:00:00 2001 +From: "Emden R. Gansner" +Date: Tue, 7 Jan 2014 10:45:36 -0500 +Subject: [PATCH] Prevent possible buffer overflow in yyerror() + +--- + lib/cgraph/scan.l | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/cgraph/scan.l b/lib/cgraph/scan.l +index 3efe1d5..212967c 100644 +--- a/lib/cgraph/scan.l ++++ b/lib/cgraph/scan.l +@@ -201,7 +201,8 @@ void yyerror(char *str) + agxbput (&xb, InputFile); + agxbput (&xb, ": "); + } +- sprintf(buf," %s in line %d near '", str,line_num); ++ agxbput (&xb, str); ++ sprintf(buf," in line %d near '", line_num); + agxbput (&xb, buf); + agxbput (&xb, yytext); + agxbput (&xb,"'\n"); +-- +1.8.5.1 + diff --git a/extra/gst-plugins-good/PKGBUILD b/extra/gst-plugins-good/PKGBUILD index 9082549fe..59f3d12a0 100644 --- a/extra/gst-plugins-good/PKGBUILD +++ b/extra/gst-plugins-good/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 203288 2014-01-07 13:06:50Z heftig $ +# $Id: PKGBUILD 203416 2014-01-10 14:44:32Z heftig $ # Maintainer: Jan de Groot pkgname=gst-plugins-good pkgver=1.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="GStreamer Multimedia Framework Good Plugins" arch=('i686' 'x86_64') license=('LGPL') url="http://gstreamer.freedesktop.org/" depends=('libpulse' 'jack' 'libsoup' 'gst-plugins-base-libs' 'wavpack' 'aalib' 'taglib' 'libdv' 'libshout' 'libvpx' 'gdk-pixbuf2' 'libcaca' 'libavc1394' 'libiec61883' 'libxdamage' 'v4l-utils' 'cairo') -makedepends=('gstreamer' 'speex' 'flac' 'libraw1394' 'python') +makedepends=('gstreamer' 'speex' 'flac' 'libraw1394' 'python' 'gtk-doc') options=(!emptydirs) source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) sha256sums=('6c090f00e8e4588f12807bd9fbb06a03b84a512c93e84d928123ee4a42228a81') @@ -18,7 +18,7 @@ build() { cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-experimental \ + --disable-static --enable-experimental --enable-gtk-doc \ --with-package-name="GStreamer Good Plugins (Arch Linux)" \ --with-package-origin="http://www.archlinux.org/" @@ -28,7 +28,7 @@ build() { make } -# Disable for now: fails with soup timeout +# Disabled for now: souphttpsrc times out, and takes a damn long time to do so #check() { # cd $pkgname-$pkgver # make check @@ -36,5 +36,5 @@ build() { package() { cd $pkgname-$pkgver - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" install } diff --git a/extra/gst-plugins-ugly/PKGBUILD b/extra/gst-plugins-ugly/PKGBUILD index 1308e3cb7..44a286808 100644 --- a/extra/gst-plugins-ugly/PKGBUILD +++ b/extra/gst-plugins-ugly/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 203290 2014-01-07 13:07:17Z heftig $ +# $Id: PKGBUILD 203422 2014-01-10 16:45:43Z heftig $ # Maintainer: Jan de Groot pkgname=gst-plugins-ugly pkgver=1.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="GStreamer Multimedia Framework Ugly Plugins" arch=('i686' 'x86_64') license=('LGPL') url="http://gstreamer.freedesktop.org/" depends=('gst-plugins-base-libs' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') -makedepends=('python') +makedepends=('python' 'gtk-doc') options=(!emptydirs) source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) sha256sums=('4b6aac272a5be0d68f365ef6fba0f829fc5c1d1d601bb4dd9e85f5289b2b56c3') @@ -18,7 +18,7 @@ build() { cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-experimental \ + --disable-static --enable-experimental --enable-gtk-doc \ --with-package-name="GStreamer Ugly Plugins (Arch Linux)" \ --with-package-origin="http://www.archlinux.org/" diff --git a/extra/libmikmod/PKGBUILD b/extra/libmikmod/PKGBUILD index c671c7dde..526bad1d2 100644 --- a/extra/libmikmod/PKGBUILD +++ b/extra/libmikmod/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 201341 2013-12-09 07:42:41Z heftig $ +# $Id: PKGBUILD 203444 2014-01-10 21:24:03Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Allan McRae # Contributor: Tom Newsom pkgname=libmikmod -pkgver=3.3.4 +pkgver=3.3.5 pkgrel=1 pkgdesc="A portable sound library" license=(GPL LGPL) url="http://mikmod.sourceforge.net" arch=(i686 x86_64) -depends=(openal sh) +depends=(libpulse sh) makedepends=(alsa-lib) install=$pkgname.install source=(http://downloads.sourceforge.net/mikmod/$pkgname-$pkgver.tar.gz) -sha256sums=('2e8ca1d945ff7330741d085548a6d4e8b2f6a9d41edda773607905d8905683ae') +sha256sums=('b714ee340a04e6867f60246f679e0f40063b92f99269b6b715c8bf19ad469fb6') prepare() { mkdir build @@ -24,7 +24,6 @@ build() { cd build ../$pkgname-$pkgver/configure \ --prefix=/usr \ - --enable-openal \ --disable-static make } diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index e4d2e892c..93f94a870 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 201484 2013-12-12 18:14:36Z pierre $ +# $Id: PKGBUILD 203430 2014-01-10 20:36:02Z pierre $ # Maintainer: Pierre Schmitz pkgbase=php @@ -21,7 +21,7 @@ pkgname=('php' 'php-sqlite' 'php-tidy' 'php-xsl') -pkgver=5.5.7 +pkgver=5.5.8 pkgrel=1 arch=('i686' 'x86_64') license=('PHP') @@ -30,10 +30,12 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx' 'sqlite' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds' 'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu' 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2' 'systemd') -source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.xz" +source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.gz" + "http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.gz.asc" 'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch' 'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles') -md5sums=('0c02437f661105221e99a301a5275a41' +md5sums=('1ed2b0193ecaca8b980a9b6a90357f1c' + 'SKIP' '799cd5f91f5253f4b47ec4fd7fccf4f1' 'dec2cbaad64e3abf4f0ec70e1de4e8e9' '9f8263996836e27f5be1483e86ac2e33' @@ -46,9 +48,6 @@ prepare() { patch -p0 -i ${srcdir}/php.ini.patch patch -p0 -i ${srcdir}/php-fpm.conf.in.patch - # freetype2 headers moved - # see README at http://sourceforge.net/projects/freetype/files/freetype2/2.5.1/ - sed 's#/include/freetype2/freetype/freetype.h#/include/freetype2/freetype.h#g' -i configure } build() { diff --git a/extra/refind-efi/PKGBUILD b/extra/refind-efi/PKGBUILD index 1206cb882..3c52f4588 100644 --- a/extra/refind-efi/PKGBUILD +++ b/extra/refind-efi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 201584 2013-12-16 08:10:23Z tpowa $ +# $Id: PKGBUILD 203414 2014-01-10 13:20:00Z tpowa $ # Maintainer: Tobias Powalowski # Contributor: Keshav Padram Amburay <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> @@ -17,7 +17,7 @@ _COMPILER="GCC47" ####### pkgname="refind-efi" -pkgver="0.7.6" +pkgver="0.7.7" pkgrel="1" pkgdesc="Rod Smith's fork of rEFIt UEFI Boot Manager - built with Tianocore UDK libs" url="http://www.rodsbooks.com/refind/index.html" @@ -40,13 +40,13 @@ for _DIR_ in BaseTools MdePkg MdeModulePkg IntelFrameworkPkg IntelFrameworkModul source+=("${_TIANO_DIR_}_${_DIR_}::svn+${_TIANOCORE_SVN_URL}/${_DIR_}#revision=${_TIANO_SVN_REV_}") done -sha1sums=('431423452190c9840335f2dd9af887aded52a787' - '3d53eb615c3363d45feb95b9bfbf1d5491bf1c24' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP') +md5sums=('868b178404446f77729823af3758b409' + 'a83e45b10d5efbca1c93a63851728712' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP') [[ "${CARCH}" == "x86_64" ]] && _TIANO_ARCH="X64" [[ "${CARCH}" == "i686" ]] && _TIANO_ARCH="IA32" diff --git a/libre/openexr-libre/PKGBUILD b/libre/openexr-libre/PKGBUILD index 36eeb00ef..ba11a2083 100644 --- a/libre/openexr-libre/PKGBUILD +++ b/libre/openexr-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 196943 2013-10-21 10:31:44Z tpowa $ +# $Id: PKGBUILD 198354 2013-10-30 14:21:29Z allan $ # Maintainer: Tobias Powalowski # Maintainer (Parabola): André Silva @@ -16,22 +16,15 @@ makedepends=('libcups' 'libxinerama') replaces=$_pkgname conflicts=$_pkgname provides=$_pkgname=$pkgver -options=('!libtool') -source=("http://download.savannah.nongnu.org/releases/${_pkgname}/${_pkgname}-${pkgver}.tar.gz" - "http://repo.parabolagnulinux.org/other/${pkgname}/MultiViewOpenEXR.odt" - "http://repo.parabolagnulinux.org/other/${pkgname}/OpenEXRFileLayout.odt" - "http://repo.parabolagnulinux.org/other/${pkgname}/ReadingAndWritingImageFiles.odt" - "http://repo.parabolagnulinux.org/other/${pkgname}/TechnicalIntroduction.odt") +mksource=("http://download.savannah.nongnu.org/releases/${_pkgname}/${_pkgname}-${pkgver}.tar.gz" + "https://repo.parabolagnulinux.org/other/${pkgname}/MultiViewOpenEXR.odt" + "https://repo.parabolagnulinux.org/other/${pkgname}/OpenEXRFileLayout.odt" + "https://repo.parabolagnulinux.org/other/${pkgname}/ReadingAndWritingImageFiles.odt" + "https://repo.parabolagnulinux.org/other/${pkgname}/TechnicalIntroduction.odt") +source=("https://repo.parabolagnulinux.org/sources/${pkgname}-${pkgver}.tar.gz") noextract=(MultiViewOpenEXR.odt OpenEXRFileLayout.odt ReadingAndWritingImageFiles.odt TechnicalIntroduction.odt) -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" - [ "$CARCH" = "mips64el" ] && sed -i 's/ doc //' Makefile.in # no libreoffice yet - ./configure --prefix=/usr - make -} - -package() { +mksource() { cd "${srcdir}/${_pkgname}-${pkgver}" # remove documentation with embedded nonfree fonts @@ -40,24 +33,30 @@ package() { # add source documentation with free fonts install -m644 -v "${srcdir}/"{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt doc + # convert documentation from odt to pdf format and clean source code if [ "$CARCH" != "mips64el" ]; then - # convert documentation to pdf format cd doc - - for x in ${noextract[@]}; do - libreoffice --headless --invisible --convert-to pdf ${x} - done - - cd .. + libreoffice --headless --invisible --convert-to pdf {MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt + rm -rv "${srcdir}/"{Configurations2,META-INF,ObjBFFFDCA{1,3,4,5,7},Object\ 1,ObjectReplacements,Pictures,Thumbnails} fi +} +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${_pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" install -m644 "doc/"{MultiViewOpenEXR,OpenEXRFileLayout,ReadingAndWritingImageFiles,TechnicalIntroduction}.odt "${pkgdir}/usr/share/doc/OpenEXR-${pkgver}" } -md5sums=('4387e6050d2faa65dd5215618ff2ddce' - '69f117d3c91827e5de47f1e00137a4cc' - '4d5ffa31f9af63bd5c621c6cbac6c673' - 'de099240193d8a51086dfae914fff3cf' - 'ece8bf90d438b89c6bd9fe4a89cc318a') +mkmd5sums=('4387e6050d2faa65dd5215618ff2ddce' + '69f117d3c91827e5de47f1e00137a4cc' + '4d5ffa31f9af63bd5c621c6cbac6c673' + 'de099240193d8a51086dfae914fff3cf' + 'ece8bf90d438b89c6bd9fe4a89cc318a') +md5sums=('13e8ec945aa651a7a7f6aad133941866') diff --git a/libre/povray-libre/PKGBUILD b/libre/povray-libre/PKGBUILD index 70cb073a9..dbbca2238 100644 --- a/libre/povray-libre/PKGBUILD +++ b/libre/povray-libre/PKGBUILD @@ -6,7 +6,7 @@ # Contributor: neri # Maintainer (Parabola): Márcio Silva -# Don't build povray before 3.7 version (it's nonfree software) +# Don't build povray before 3.7 version (that ones are nonfree software) _pkgname=povray pkgname=$_pkgname-libre @@ -24,11 +24,20 @@ conflicts=("$_pkgname") replaces=("$_pkgname") backup=("etc/povray/$pkgver/povray.conf" "etc/povray/$pkgver/povray.ini") -source=("https://github.com/POV-Ray/$_pkgname/archive/$pkgver-stable.zip" +mksource=("https://github.com/POV-Ray/$_pkgname/archive/$pkgver-stable.zip") +source=("https://repo.parabolagnulinux.org/sources/$pkgname-$pkgver-stable.tar.xz" 'povray3.7.0_rc3-user-conf.patch') -sha256sums=('1261d963327a4b04c09d56bbd7436d0062e6bf8363674e3fb4e240beefb5b5cb' +mksha256sums=('1261d963327a4b04c09d56bbd7436d0062e6bf8363674e3fb4e240beefb5b5cb') +sha256sums=('ba2a867b8593689067143b23ebdccb8f8f46487244802d24d873517287b924f1' '95b04ec4973e6e8a80fc83df2e3caff0b4d6699c4154144f3017d42cab7236e0') +mksource() { + cd "$_pkgname-$pkgver-stable" + + # remove nonfree documentation + rm -rv doc +} + prepare() { cd "$_pkgname-$pkgver-stable" diff --git a/libre/psutils-libre/PKGBUILD b/libre/psutils-libre/PKGBUILD index a9f697ae0..ad75af70a 100644 --- a/libre/psutils-libre/PKGBUILD +++ b/libre/psutils-libre/PKGBUILD @@ -18,20 +18,26 @@ provides=('psutils-lprng' 'psutils') replaces=('psutils-lprng' 'psutils') conflicts=('psutils-lprng' 'psutils') options=('!makeflags') -source=("ftp://ftp.archlinux.org/other/psutils/${_pkgname}-${pkgver}.tar.gz" - 'psutils-1.17.diff' - 'libre.patch') -md5sums=('b161522f3bd1507655326afa7db4a0ad' - '2b49e9e796000b42f42804d4b50a2be1' - 'a4beaf371607085e89ef190c1db7aee3') +mksource=("ftp://ftp.archlinux.org/other/psutils/${_pkgname}-${pkgver}.tar.gz" + 'libre.patch') +source=("https://repo.parabolagnulinux.org/sources/${pkgname}-${pkgver}.tar.gz" + 'psutils-1.17.diff') +mkmd5sums=('b161522f3bd1507655326afa7db4a0ad' + 'a4beaf371607085e89ef190c1db7aee3') +md5sums=('75c88dc9e33877368d471dfa8652d96d' + '2b49e9e796000b42f42804d4b50a2be1') -build() { +mksource() { cd "${srcdir}/${_pkgname}" - patch -Np1 -i "${srcdir}/psutils-1.17.diff" # apply patch to remove nonfree files support from Makefile patch -Np1 -i "${srcdir}/libre.patch" # remove nonfree files rm -v {fixmacps.{man,pl},md{68_0,71_0}.ps} +} + +build() { + cd "${srcdir}/${_pkgname}" + patch -Np1 -i "${srcdir}/psutils-1.17.diff" make -f Makefile.unix BINDIR=/usr/bin \ INCLUDEDIR=/usr/include/psutils PERL=/usr/bin/perl \ MANDIR=/usr/share/man/man1 \ diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD index 4a251fa93..7d4a90a37 100644 --- a/pcr/youtube-dl-current/PKGBUILD +++ b/pcr/youtube-dl-current/PKGBUILD @@ -5,7 +5,7 @@ pkgname=youtube-dl-current _pkgname=youtube-dl provides=(youtube-dl) -pkgver=2014.01.07.5 +pkgver=2014.01.08 pkgrel=1 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites" arch=('any') @@ -28,5 +28,5 @@ package() { "${pkgdir}/usr/share/bash-completion/completions/youtube-dl" install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" } -md5sums=('de485f1333b9e42ebaaaac16ca4c60b4' +md5sums=('bb3e523b7e4e59ac64ce9a48fda86de7' 'SKIP') -- cgit v1.2.3-54-g00ecf