mirror of
https://gitdl.cn/https://github.com/chakralinux/core.git
synced 2025-02-14 12:19:03 +08:00
Merge branch 'testing' of ssh://git.chakraos.org:86/platform into testing
This commit is contained in:
Neophytos Kolokotronis
commit
35f36144c1
@ -2,8 +2,8 @@
|
||||
|
||||
pkgbase="cups"
|
||||
pkgname=('libcups' 'cups')
|
||||
pkgver=2.0.1
|
||||
pkgrel=2
|
||||
pkgver=2.0.2
|
||||
pkgrel=1
|
||||
arch=('x86_64')
|
||||
license=('GPL')
|
||||
url="http://www.cups.org/"
|
||||
@ -18,7 +18,7 @@ source=(http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.bz2{,.s
|
||||
cups-no-gzip-man.patch
|
||||
cups-1.6.2-statedir.patch
|
||||
cups-1.6.0-fix-install-perms.patch)
|
||||
md5sums=('7f7c33071035fb20d0879929a42da711'
|
||||
md5sums=('6e0ea72dbafcf5baaa1cf4178e71096d'
|
||||
'SKIP'
|
||||
'fc8286f185e2cc5f7e1f6843bf193e2b'
|
||||
'96f82c38f3f540b53f3e5144900acf17'
|
||||
|
||||
@ -3,9 +3,9 @@
|
||||
# freetype2 and harfbuzz update
|
||||
# build freetype2 with old harfbuzz -> harfbuzz with new freetype -> build freetype2 with new harfbuzz.
|
||||
pkgname=freetype2
|
||||
pkgver=2.5.4
|
||||
pkgver=2.5.5
|
||||
_ubuntu_ver=2.5.2
|
||||
pkgrel=2
|
||||
pkgrel=1
|
||||
_ubuntu_diff_version=${_ubuntu_ver}-1ubuntu2
|
||||
pkgdesc="TrueType font rendering library"
|
||||
arch=('x86_64')
|
||||
@ -17,7 +17,7 @@ checkdepends=('valgrind')
|
||||
source=("http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2"
|
||||
"http://archive.ubuntu.com/ubuntu/pool/main/f/freetype/freetype_${_ubuntu_diff_version}.diff.gz")
|
||||
|
||||
md5sums=('438585445a2f1f71c77590155fd96616'
|
||||
md5sums=('2a7a314927011d5030903179cf183be0'
|
||||
'eda9c925032709bbd7463edcded05881')
|
||||
|
||||
prepare() {
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
# Maintainer: Fabian Kosmale <inkane@chakra-project.org>
|
||||
pkgname=libmwaw
|
||||
pkgver=0.3.1
|
||||
pkgver=0.3.4
|
||||
pkgrel=1
|
||||
pkgdesc="Library to extract valid data from within an Excel (.xls) spreadsheet."
|
||||
arch=('x86_64')
|
||||
depends=('libwpd' 'libwpg' 'librevenge')
|
||||
license=('LGPLv2')
|
||||
source=(http://downloads.sourceforge.net/libmwaw/${pkgname}-${pkgver}.tar.bz2)
|
||||
md5sums=('6f1ac4a0e24131c422e1e91f07718fb6')
|
||||
md5sums=('edb8a92a4b6746efbd45bde5006f71b9')
|
||||
|
||||
build() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
# Maintainer: Bruce Liu <brli@users.sourceforge.net>
|
||||
# TODO: Always remember to build lib32-nspr when bumping pkgver
|
||||
|
||||
pkgname=nspr
|
||||
pkgver=4.10.7
|
||||
pkgver=4.10.8
|
||||
pkgrel=1
|
||||
pkgdesc="Netscape Portable Runtime"
|
||||
arch=('x86_64')
|
||||
@ -11,7 +12,7 @@ depends=('glibc')
|
||||
makedepends=('zip')
|
||||
options=('!emptydirs')
|
||||
source=("ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz")
|
||||
sha1sums=('f62972d7c66d4621d6262c5bd9b5723fa67b6bff')
|
||||
sha1sums=('c87c6a10e0e36866006b45c194d70cd8c67d0934')
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
# Maintainer: abveritas@chakra-project.org
|
||||
# Contributor: Jan de Groot <jgc@archlinux.org>
|
||||
# TODO: Always remember to build lib32-nss when bumping pkgver
|
||||
|
||||
pkgbase=nss
|
||||
pkgname=(nss ca-certificates-mozilla)
|
||||
pkgver=3.17.3
|
||||
pkgver=3.17.4
|
||||
pkgrel=1
|
||||
pkgdesc="Mozilla Network Security Services"
|
||||
arch=('x86_64')
|
||||
@ -20,7 +21,7 @@ source=("ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/
|
||||
nss-config.in
|
||||
ssl-renegotiate-transitional.patch
|
||||
legacy-certs.patch)
|
||||
sha256sums=('f4d5e9035a2f84f25f35c283de3b0ff60d72e918748de25eaf017ed201fa21d5'
|
||||
sha256sums=('1d98ad1881a4237ec98cbe472fc851480f0b0e954dfe224d047811fb96ff9d79'
|
||||
'af13c30801a8a27623948206458432a4cf98061b75ff6e5b5e03912f93c034ee'
|
||||
'045f520403f715a4cc7f3607b4e2c9bcc88fee5bce58d462fddaa2fdb0e4c180'
|
||||
'b9f1428ca2305bf30b109507ff335fa00bce5a7ce0434b50acd26ad7c47dd5bd'
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# Contributions from Arch: https://projects.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/openresolv
|
||||
|
||||
pkgname=openresolv
|
||||
pkgver=3.5.6
|
||||
pkgver=3.6.1
|
||||
pkgrel=1
|
||||
pkgdesc="resolv.conf management framework (resolvconf)"
|
||||
arch=(any)
|
||||
@ -13,14 +13,13 @@ provides=(resolvconf)
|
||||
depends=(bash)
|
||||
makedepends=(systemd)
|
||||
source=("http://roy.marples.name/downloads/openresolv/${pkgname}-${pkgver}.tar.bz2"
|
||||
fix-dnsmasq.patch)
|
||||
md5sums=('ac03b7a52cf0f2040cc70df641f1baff'
|
||||
'f2e6207621b284d1879bd004f8784b1e')
|
||||
fs33801.patch)
|
||||
md5sums=('f385e26ec0f9cd06d8ccd45fc219002e'
|
||||
'b6d3c06bd806de87497cb249bea954d0')
|
||||
|
||||
prepare() {
|
||||
cd $pkgname-$pkgver
|
||||
|
||||
patch -Np1 -i ../fix-dnsmasq.patch
|
||||
patch -Np1 -i ../fs33801.patch
|
||||
sed -n '2,25{s:^# \?::;p}' resolvconf.in >LICENSE
|
||||
}
|
||||
|
||||
|
||||
@ -1,83 +0,0 @@
|
||||
diff --git i/dnsmasq.in w/dnsmasq.in
|
||||
index 96b5593..384d9df 100644
|
||||
--- i/dnsmasq.in
|
||||
+++ w/dnsmasq.in
|
||||
@@ -33,10 +33,9 @@
|
||||
NL="
|
||||
"
|
||||
|
||||
-: ${dnsmasq_pid:=/var/run/dnsmasq.pid}
|
||||
-[ -s "$dnsmasq_pid" ] || dnsmasq_pid=/var/run/dnsmasq/dnsmasq.pid
|
||||
: ${dnsmasq_service:=dnsmasq}
|
||||
: ${dnsmasq_restart:=@RESTARTCMD ${dnsmasq_service}@}
|
||||
+: ${dnsmasq_reload:=/usr/bin/systemctl reload ${dnsmasq_service}}
|
||||
newconf="# Generated by resolvconf$NL"
|
||||
newresolv="$newconf"
|
||||
|
||||
@@ -182,7 +181,7 @@ if $changed; then
|
||||
eval $dnsmasq_restart
|
||||
fi
|
||||
if $dbus; then
|
||||
- $changed || kill -HUP $(cat "$dnsmasq_pid")
|
||||
+ $changed || eval $dnsmasq_reload
|
||||
# Send even if empty so old servers are cleared
|
||||
if $dbus_ex; then
|
||||
method=SetDomainServers
|
||||
diff --git i/resolvconf.conf.5.in w/resolvconf.conf.5.in
|
||||
index 81fe154..9b4f1bd 100644
|
||||
--- i/resolvconf.conf.5.in
|
||||
+++ w/resolvconf.conf.5.in
|
||||
@@ -215,8 +215,8 @@ variables, documented below.
|
||||
Location of the dnsmasq service.
|
||||
.It Sy dnsmasq_restart
|
||||
Command to restart the dnsmasq service.
|
||||
-.It Sy dnsmasq_pid
|
||||
-Location of the dnsmasq pidfile.
|
||||
+.It Sy dnsmasq_reload
|
||||
+Command to reload the dnsmasq service.
|
||||
.It Sy libc_service
|
||||
Location of the libc service.
|
||||
.It Sy libc_restart
|
||||
@@ -229,10 +229,8 @@ Command to restart the named service.
|
||||
Command to restart the pdnsd service.
|
||||
.It Sy unbound_service
|
||||
Location of the unbound service.
|
||||
-.It Sy unbound_restart
|
||||
-Command to restart the unbound service.
|
||||
-.It Sy unbound_pid
|
||||
-Location of the unbound pidfile.
|
||||
+.It Sy unbound_reload
|
||||
+Command to reload the unbound service.
|
||||
.Sh SEE ALSO
|
||||
.Xr resolv.conf 5
|
||||
and
|
||||
diff --git i/unbound.in w/unbound.in
|
||||
index 4ee0da7..5e4a326 100644
|
||||
--- i/unbound.in
|
||||
+++ w/unbound.in
|
||||
@@ -33,9 +33,8 @@
|
||||
NL="
|
||||
"
|
||||
|
||||
-: ${unbound_pid:=/var/run/unbound.pid}
|
||||
: ${unbound_service:=unbound}
|
||||
-: ${unbound_restart:=@RESTARTCMD ${unbound_service}@}
|
||||
+: ${unbound_reload:=/usr/bin/systemctl reload-or-try-restart ${unbound_service}}
|
||||
newconf="# Generated by resolvconf$NL"
|
||||
|
||||
for d in $DOMAINS; do
|
||||
@@ -67,12 +66,5 @@ if [ ! -f "$unbound_conf" ] || \
|
||||
[ "$(cat "$unbound_conf")" != "$(printf %s "$newconf")" ]
|
||||
then
|
||||
printf %s "$newconf" >"$unbound_conf"
|
||||
- # If we can't sent a HUP then force a restart
|
||||
- if [ -s "$unbound_pid" ]; then
|
||||
- if ! kill -HUP $(cat "$unbound_pid") 2>/dev/null; then
|
||||
- eval $unbound_restart
|
||||
- fi
|
||||
- else
|
||||
- eval $unbound_restart
|
||||
- fi
|
||||
+ eval $unbound_reload
|
||||
fi
|
||||
|
||||
223
openresolv/fs33801.patch
Normal file
223
openresolv/fs33801.patch
Normal file
@ -0,0 +1,223 @@
|
||||
diff -u -r openresolv-3.6.1/configure openresolv-3.6.1-arch/configure
|
||||
--- openresolv-3.6.1/configure 2014-10-28 23:03:14.000000000 +0100
|
||||
+++ openresolv-3.6.1-arch/configure 2015-01-01 12:20:34.805786238 +0100
|
||||
@@ -7,6 +7,7 @@
|
||||
HOST=
|
||||
TARGET=
|
||||
RESTARTCMD=
|
||||
+RELOADCMD=
|
||||
RCDIR=
|
||||
|
||||
for x do
|
||||
@@ -33,6 +34,7 @@
|
||||
--target) TARGET=$var;;
|
||||
--libdir) LIBDIR=$var;;
|
||||
--restartcmd) RESTARTCMD=$var;;
|
||||
+ --reloadcmd) RELOADCMD=$var;;
|
||||
--includedir) eval INCLUDEDIR="$INCLUDEDIR${INCLUDEDIR:+ }$var";;
|
||||
--datadir|--infodir) ;; # ignore autotools
|
||||
--disable-maintainer-mode|--disable-dependency-tracking) ;;
|
||||
@@ -60,7 +62,7 @@
|
||||
echo "no"
|
||||
RUNDIR=/var/run
|
||||
fi
|
||||
-fi
|
||||
+fi
|
||||
|
||||
: ${SED:=sed}
|
||||
|
||||
@@ -68,7 +70,6 @@
|
||||
: ${SBINDIR:=$PREFIX/sbin}
|
||||
: ${LIBEXECDIR:=$PREFIX/libexec/resolvconf}
|
||||
: ${STATEDIR:=/var}
|
||||
-: ${RUNDIR:=$STATEDIR/run}
|
||||
: ${MANDIR:=${PREFIX:-/usr}/share/man}
|
||||
|
||||
eval SYSCONFDIR="$SYSCONFDIR"
|
||||
@@ -117,7 +118,7 @@
|
||||
rm -rf $CONFIG_MK
|
||||
echo "# $OS" >$CONFIG_MK
|
||||
|
||||
-for x in SYSCONFDIR SBINDIR LIBEXECDIR VARDIR MANDIR; do
|
||||
+for x in SYSCONFDIR SBINDIR LIBEXECDIR VARDIR MANDIR RUNDIR; do
|
||||
eval v=\$$x
|
||||
# Make files look nice for import
|
||||
l=$((10 - ${#x}))
|
||||
@@ -126,26 +127,30 @@
|
||||
echo "$x=$t $v" >>$CONFIG_MK
|
||||
done
|
||||
|
||||
-if [ -z "$RESTARTCMD" ]; then
|
||||
+if [ -z "$RESTARTCMD" -o -z "$RELOADCMD" ]; then
|
||||
printf "Checking for systemd ... "
|
||||
if [ -x /bin/systemctl ]; then
|
||||
- RESTARTCMD="/bin/systemctl try-restart \1"
|
||||
+ : ${RESTARTCMD:="/bin/systemctl --fail --no-block try-restart \1"}
|
||||
+ : ${RELOADCMD:="/bin/systemctl --fail --no-block reload \1"}
|
||||
echo "yes"
|
||||
elif [ -x /usr/bin/systemctl ]; then
|
||||
- RESTARTCMD="/usr/bin/systemctl try-restart \1"
|
||||
+ : ${RESTARTCMD:="/usr/bin/systemctl --fail --no-block try-restart \1"}
|
||||
+ : ${RELOADCMD:="/usr/bin/systemctl --fail --no-block reload \1"}
|
||||
echo "yes"
|
||||
else
|
||||
echo "no"
|
||||
fi
|
||||
fi
|
||||
|
||||
+: ${RELOADCMD:='[ -s "\2" ] \&\& kill -HUP \\`cat "\2"\\` 2>/dev/null'}
|
||||
+
|
||||
# Arch upgraded to systemd, so this check has to be just after systemd
|
||||
# but higher than the others
|
||||
if [ -z "$RESTARTCMD" ]; then
|
||||
printf "Checking for Arch ... "
|
||||
if [ -e /etc/arch-release -a -d /etc/rc.d ]; then
|
||||
RCDIR=/etc/rc.d
|
||||
- RESTARTCMD="[ -e /var/run/daemons/\1 ] \&\& /etc/rc.d/\1 restart"
|
||||
+ RESTARTCMD="[ -e $RUNDIR/daemons/\1 ] \&\& /etc/rc.d/\1 restart"
|
||||
echo "yes"
|
||||
else
|
||||
echo "no"
|
||||
@@ -203,11 +208,13 @@
|
||||
echo "RCDIR= $RCDIR" >>$CONFIG_MK
|
||||
# Work around bug in the dash shell as "echo 'foo \1'" does bad things
|
||||
printf "%s\n" "RESTARTCMD= $RESTARTCMD" >>$CONFIG_MK
|
||||
+printf "%s\n" "RELOADCMD= $RELOADCMD" >>$CONFIG_MK
|
||||
|
||||
echo
|
||||
echo " SYSCONFDIR = $SYSCONFDIR"
|
||||
echo " SBINDIR = $SBINDIR"
|
||||
echo " LIBEXECDIR = $LIBEXECDIR"
|
||||
-echo " VARDIR = $RUNDIR"
|
||||
+echo " RUNDIR = $RUNDIR"
|
||||
+echo " VARDIR = $VARDIR"
|
||||
echo " MANDIR = $MANDIR"
|
||||
echo
|
||||
diff -u -r openresolv-3.6.1/dnsmasq.in openresolv-3.6.1-arch/dnsmasq.in
|
||||
--- openresolv-3.6.1/dnsmasq.in 2014-10-28 23:03:14.000000000 +0100
|
||||
+++ openresolv-3.6.1-arch/dnsmasq.in 2015-01-01 12:22:47.265204837 +0100
|
||||
@@ -33,11 +33,12 @@
|
||||
NL="
|
||||
"
|
||||
|
||||
-: ${dnsmasq_pid:=/var/run/dnsmasq.pid}
|
||||
-[ -s "$dnsmasq_pid" ] || dnsmasq_pid=/var/run/dnsmasq/dnsmasq.pid
|
||||
+: ${dnsmasq_pid:=@RUNDIR@/dnsmasq.pid}
|
||||
+[ -s "$dnsmasq_pid" ] || : ${dnsmasq_pid:=@RUNDIR@/dnsmasq/dnsmasq.pid}
|
||||
[ -s "$dnsmasq_pid" ] || unset dnsmasq_pid
|
||||
: ${dnsmasq_service:=dnsmasq}
|
||||
: ${dnsmasq_restart:=@RESTARTCMD ${dnsmasq_service}@}
|
||||
+: ${dnsmasq_reload:=@RELOADCMD ${dnsmasq_service} ${dnsmasq_pid}@}
|
||||
newconf="# Generated by resolvconf$NL"
|
||||
newresolv="$newconf"
|
||||
|
||||
@@ -184,7 +185,7 @@
|
||||
fi
|
||||
if $dbus; then
|
||||
if [ -s "$dnsmasq_pid" ]; then
|
||||
- $changed || kill -HUP $(cat "$dnsmasq_pid")
|
||||
+ $changed || eval $dnsmasq_reload
|
||||
fi
|
||||
# Send even if empty so old servers are cleared
|
||||
if $dbus_ex; then
|
||||
diff -u -r openresolv-3.6.1/Makefile openresolv-3.6.1-arch/Makefile
|
||||
--- openresolv-3.6.1/Makefile 2014-10-28 23:03:14.000000000 +0100
|
||||
+++ openresolv-3.6.1-arch/Makefile 2015-01-01 12:20:34.862452655 +0100
|
||||
@@ -10,11 +10,13 @@
|
||||
SBINDIR?= /sbin
|
||||
SYSCONFDIR?= /etc
|
||||
LIBEXECDIR?= /libexec/resolvconf
|
||||
-VARDIR?= /var/run/resolvconf
|
||||
+RUNDIR?= /var/run
|
||||
+VARDIR?= ${RUNDIR}/resolvconf
|
||||
RCDIR?= /etc/rc.d
|
||||
RESTARTCMD?= if ${RCDIR}/\1 status >/dev/null 2>\&1; then \
|
||||
${RCDIR}/\1 restart; \
|
||||
fi
|
||||
+RELOADCMD?= [ -s "\2" ] \&\& kill -HUP \\`cat "\2"\\` 2>/dev/null
|
||||
|
||||
INSTALL?= install
|
||||
SED?= sed
|
||||
@@ -32,17 +34,19 @@
|
||||
SED_SBINDIR= -e 's:@SBINDIR@:${SBINDIR}:g'
|
||||
SED_SYSCONFDIR= -e 's:@SYSCONFDIR@:${SYSCONFDIR}:g'
|
||||
SED_LIBEXECDIR= -e 's:@LIBEXECDIR@:${LIBEXECDIR}:g'
|
||||
+SED_RUNDIR= -e 's:@RUNDIR@:${RUNDIR}:g'
|
||||
SED_VARDIR= -e 's:@VARDIR@:${VARDIR}:g'
|
||||
SED_RCDIR= -e 's:@RCDIR@:${RCDIR}:g'
|
||||
SED_RESTARTCMD= -e 's:@RESTARTCMD \(.*\)@:${RESTARTCMD}:g'
|
||||
+SED_RELOADCMD= -e 's:@RELOADCMD \([^ ]*\) \(.*\)@:${RELOADCMD}:g'
|
||||
|
||||
.SUFFIXES: .in
|
||||
|
||||
all: ${TARGET}
|
||||
|
||||
.in:
|
||||
- ${SED} ${SED_SBINDIR} ${SED_SYSCONFDIR} ${SED_LIBEXECDIR} \
|
||||
- ${SED_VARDIR} ${SED_RCDIR} ${SED_RESTARTCMD} \
|
||||
+ ${SED} ${SED_SBINDIR} ${SED_SYSCONFDIR} ${SED_LIBEXECDIR} ${SED_RUNDIR} \
|
||||
+ ${SED_VARDIR} ${SED_RCDIR} ${SED_RESTARTCMD} ${SED_RELOADCMD} \
|
||||
$< > $@
|
||||
|
||||
clean:
|
||||
diff -u -r openresolv-3.6.1/resolvconf.8.in openresolv-3.6.1-arch/resolvconf.8.in
|
||||
--- openresolv-3.6.1/resolvconf.8.in 2014-10-28 23:03:14.000000000 +0100
|
||||
+++ openresolv-3.6.1-arch/resolvconf.8.in 2015-01-01 12:20:34.882452568 +0100
|
||||
@@ -124,7 +124,7 @@
|
||||
This only needs to be called if the initial system boot sequence does not
|
||||
automatically clean it out; for example the state directory is moved
|
||||
somewhere other than
|
||||
-.Pa /var/run .
|
||||
+.Pa @RUNDIR@ .
|
||||
If used, it should only be called once as early in the system boot sequence
|
||||
as possible and before
|
||||
.Nm
|
||||
diff -u -r openresolv-3.6.1/resolvconf.conf.5.in openresolv-3.6.1-arch/resolvconf.conf.5.in
|
||||
--- openresolv-3.6.1/resolvconf.conf.5.in 2014-10-28 23:03:14.000000000 +0100
|
||||
+++ openresolv-3.6.1-arch/resolvconf.conf.5.in 2015-01-01 12:20:34.882452568 +0100
|
||||
@@ -281,6 +281,8 @@
|
||||
Command to restart the dnsmasq service.
|
||||
.It Sy dnsmasq_pid
|
||||
Location of the dnsmasq pidfile.
|
||||
+.It Sy dnsmasq_reload
|
||||
+Command to reload the dnsmasq service.
|
||||
.It Sy libc_service
|
||||
Location of the libc service.
|
||||
.It Sy libc_restart
|
||||
@@ -297,6 +299,8 @@
|
||||
Command to restart the unbound service.
|
||||
.It Sy unbound_pid
|
||||
Location of the unbound pidfile.
|
||||
+.It Sy unbound_reload
|
||||
+Command to reload the unbound service.
|
||||
.El
|
||||
.Sh SEE ALSO
|
||||
.Xr resolv.conf 5 ,
|
||||
diff -u -r openresolv-3.6.1/unbound.in openresolv-3.6.1-arch/unbound.in
|
||||
--- openresolv-3.6.1/unbound.in 2014-10-28 23:03:14.000000000 +0100
|
||||
+++ openresolv-3.6.1-arch/unbound.in 2015-01-01 12:20:34.882452568 +0100
|
||||
@@ -35,9 +35,10 @@
|
||||
NL="
|
||||
"
|
||||
|
||||
-: ${unbound_pid:=/var/run/unbound.pid}
|
||||
+: ${unbound_pid:=@RUNDIR@/unbound.pid}
|
||||
: ${unbound_service:=unbound}
|
||||
: ${unbound_restart:=@RESTARTCMD ${unbound_service}@}
|
||||
+: ${unbound_reload:=@RELOADCMD ${unbound_service} ${unbound_pid}@}
|
||||
newconf="# Generated by resolvconf$NL"
|
||||
|
||||
for d in $DOMAINS; do
|
||||
@@ -75,11 +76,5 @@
|
||||
then
|
||||
printf %s "$newconf" >"$unbound_conf"
|
||||
# If we can't sent a HUP then force a restart
|
||||
- if [ -s "$unbound_pid" ]; then
|
||||
- if ! kill -HUP $(cat "$unbound_pid") 2>/dev/null; then
|
||||
- eval $unbound_restart
|
||||
- fi
|
||||
- else
|
||||
- eval $unbound_restart
|
||||
- fi
|
||||
+ eval $unbound_reload || eval $unbound_restart
|
||||
fi
|
||||
44
perl-dbd-mysql/PKGBUILD
Normal file
44
perl-dbd-mysql/PKGBUILD
Normal file
@ -0,0 +1,44 @@
|
||||
# $Id$
|
||||
# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
|
||||
# Contributor: kevin <kevin@archlinux.org>
|
||||
# Contributor: Eric Johnson <eric@coding-zone.com>
|
||||
|
||||
pkgname=perl-dbd-mysql
|
||||
_realname=DBD-mysql
|
||||
pkgver=4.029
|
||||
pkgrel=1
|
||||
pkgdesc='Perl/CPAN DBD::mysql module for interacting with MySQL via DBD'
|
||||
arch=('x86_64')
|
||||
license=('GPL' 'PerlArtistic')
|
||||
url="http://search.cpan.org/dist/$_realname/"
|
||||
depends=('libmariadbclient' 'perl-dbi')
|
||||
makedepends=('mariadb')
|
||||
options=('!emptydirs')
|
||||
source=(http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/$_realname-$pkgver.tar.gz)
|
||||
md5sums=('bcb8b105f771c04a8ebf3523eb073db7')
|
||||
|
||||
build() {
|
||||
cd $_realname-$pkgver
|
||||
perl Makefile.PL INSTALLDIRS=vendor --testsocket=/tmp/socket.mysql
|
||||
make
|
||||
}
|
||||
|
||||
check() {
|
||||
cd $_realname-$pkgver
|
||||
mkdir -p /tmp/mysql_test
|
||||
mysql_install_db \
|
||||
--basedir=/usr \
|
||||
--datadir=/tmp/mysql_test
|
||||
mysqld -P 17999 \
|
||||
--socket=/tmp/socket.mysql \
|
||||
--datadir=/tmp/mysql_test &
|
||||
sleep 10
|
||||
DAEMON_PORT=$!
|
||||
make test || true
|
||||
kill -9 $DAEMON_PORT
|
||||
}
|
||||
|
||||
package() {
|
||||
cd $_realname-$pkgver
|
||||
make install DESTDIR="$pkgdir"
|
||||
}
|
||||
33
perl-net-upnp/PKGBUILD
Normal file
33
perl-net-upnp/PKGBUILD
Normal file
@ -0,0 +1,33 @@
|
||||
#
|
||||
# Maintainer: Neo Kolokotronis <tetris4@gmail.com>
|
||||
#
|
||||
|
||||
pkgname=perl-net-upnp
|
||||
_pkgname=Net-UPnP
|
||||
pkgver=1.4.3
|
||||
pkgrel=1
|
||||
pkgdesc="Perl Module UPnP"
|
||||
arch=('x86_64')
|
||||
url="http://search.cpan.org/~skonno/Net-UPnP-1.4.2/"
|
||||
license=('BSD' 'PerlArtistic')
|
||||
depends=('perl')
|
||||
options=('!emptydirs')
|
||||
source=("http://search.cpan.org/CPAN/authors/id/S/SK/SKONNO/$_pkgname-$pkgver.tar.gz")
|
||||
|
||||
md5sums=('a30d7cc54290946aeb028650cfdc9279')
|
||||
|
||||
build() {
|
||||
cd $_pkgname-$pkgver
|
||||
|
||||
# install module in vendor directories.
|
||||
PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
|
||||
make
|
||||
}
|
||||
|
||||
package(){
|
||||
cd $_pkgname-$pkgver
|
||||
make install DESTDIR=$pkgdir
|
||||
|
||||
find ${pkgdir} -name '.packlist' -delete
|
||||
find ${pkgdir} -name '*.pod' -delete
|
||||
}
|
||||
40
qt5/PKGBUILD
40
qt5/PKGBUILD
@ -29,8 +29,8 @@ pkgname=('qt5-base'
|
||||
'qt5-websockets'
|
||||
'qt5-x11extras'
|
||||
'qt5-xmlpatterns')
|
||||
pkgver=5.4.0
|
||||
pkgrel=2
|
||||
pkgver=5.4.1
|
||||
pkgrel=1
|
||||
arch=('x86_64')
|
||||
url='http://qt-project.org/'
|
||||
license=('GPL3' 'LGPL' 'FDL' 'custom')
|
||||
@ -42,7 +42,7 @@ makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb
|
||||
'openal' 'libxkbcommon' 'mtdev' 'harfbuzz' 'libwebp' 'leveldb'
|
||||
'libxcursor' 'libsm' 'libxrandr' 'libxv' 'libxi'
|
||||
'xdg-utils' 'desktop-file-utils' 'libxinerama' 'libxfixes'
|
||||
'pciutils' 'nss'
|
||||
'geoclue' 'pciutils' 'nss'
|
||||
'gstreamer' 'gst-plugins-base' 'gst-plugins-good'
|
||||
'gst-plugins-bad' 'gst-plugins-ugly' 'harfbuzz' 'pkg-config')
|
||||
_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
|
||||
@ -74,8 +74,7 @@ prepare() {
|
||||
# Use python2 for Python 2.x
|
||||
find . -name '*.py' -exec sed -i \
|
||||
's|#![ ]*/usr/bin/python$|&2|;s|#![ ]*/usr/bin/env python$|&2|' {} +
|
||||
|
||||
# There are still a lot of relative calls which need a workaround
|
||||
# in qtwebengine there are still a lot of relative calls which need a workaround
|
||||
mkdir -p "${srcdir}"/python2-path
|
||||
ln -sf /usr/bin/python2 "${srcdir}"/python2-path/python
|
||||
}
|
||||
@ -89,6 +88,7 @@ build() {
|
||||
export LD_LIBRARY_PATH="${QTDIR}"/qtbase/lib:"${QTDIR}"/qttools/lib:"${LD_LIBRARY_PATH}"
|
||||
export QT_PLUGIN_PATH="${QTDIR}"/qtbase/plugins
|
||||
|
||||
# python2 workaround
|
||||
export PATH="${srcdir}/python2-path:$PATH"
|
||||
export _xkbconfigroot=$(pkg-config --variable=xkb_base xkeyboard-config)
|
||||
|
||||
@ -127,12 +127,19 @@ build() {
|
||||
|
||||
make
|
||||
|
||||
# Fix paths
|
||||
find "${QTDIR}" -name Makefile -exec sed -i "s|/usr/lib/qt5/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g" {} +
|
||||
find "${QTDIR}" -name Makefile.qmake-docs -exec sed -i "s|/usr/lib/qt5/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g" {} +
|
||||
find "${QTDIR}" -name Makefile -exec sed -i "s|/usr/lib/qt5/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" {} +
|
||||
find "${QTDIR}" -name Makefile.qmake-docs -exec sed -i "s|/usr/lib/qt5/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" {} +
|
||||
sed -i "s|/usr/lib/qt5/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" qtwebkit/Source/Makefile.api
|
||||
# Fix docs build when qt is not installed
|
||||
sed -i "s|/usr/lib/qt5/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g" \
|
||||
"${QTDIR}"/qtbase/qmake/Makefile.qmake-docs
|
||||
find "${QTDIR}" -name Makefile \
|
||||
-exec sed -i "s|/usr/lib/qt5/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g" {} +
|
||||
sed -i "s|/usr/lib/qt5/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" \
|
||||
"${QTDIR}"/qtbase/qmake/Makefile.qmake-docs
|
||||
find "${QTDIR}" -name Makefile \
|
||||
-exec sed -i "s|/usr/lib/qt5/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" {} +
|
||||
sed -i "s|/usr/lib/qt5/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" \
|
||||
qtwebkit/Source/Makefile.api
|
||||
find "${QTDIR}" -name Makefile \
|
||||
-exec sed -i "s|/usr/lib/qt5/bin/qmlplugindump|${QTDIR}/qtdeclarative/bin/qmlplugindump|g" {} +
|
||||
|
||||
make docs
|
||||
}
|
||||
@ -154,8 +161,8 @@ package_qt5-base() {
|
||||
replaces=('qt5-private-headers')
|
||||
options=("staticlibs")
|
||||
|
||||
cd $_pkgfqn/qtbase
|
||||
make INSTALL_ROOT=$pkgdir install
|
||||
cd ${_pkgfqn}/qtbase
|
||||
make INSTALL_ROOT="${pkgdir}" install
|
||||
|
||||
install -D -m644 LGPL_EXCEPTION.txt \
|
||||
"${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
|
||||
@ -517,3 +524,10 @@ package_qt5-x11extras() {
|
||||
}
|
||||
|
||||
|
||||
sha1sums=('daa3373af8d6656a1066ff23bc9100b5ca004ecf'
|
||||
'981cf376da66c8be7c7ec99866da0299114192f6'
|
||||
'e131a17beda4625f21022981a519b5e8d8c8e6f7'
|
||||
'62806b6696696d4ef69e4c0733fc9f1d761f08cd'
|
||||
'2e0b6245c40c91fbb0a965724450b6d6883f2927'
|
||||
'b0e6c61b8364eb3f7af4dae41fa7738c3181dd96'
|
||||
'6c845b5879d2f443078e25856cf60cf53644c41b')
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
pkgbase=samba
|
||||
pkgname=('libwbclient' 'smbclient' 'samba')
|
||||
pkgver=4.1.16
|
||||
pkgver=4.1.17
|
||||
pkgrel=1
|
||||
arch=('x86_64')
|
||||
url="http://www.samba.org"
|
||||
@ -22,7 +22,7 @@ source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${pkgver}.tar.gz
|
||||
smbd@.service
|
||||
winbindd.service
|
||||
samba.conf)
|
||||
md5sums=('9c3bc2fb98fd3bac9945b911c71fdc66'
|
||||
md5sums=('8fed0f23a672e6a8d0716d96aca88671'
|
||||
'5697da77590ec092cc8a883bae06093c'
|
||||
'96f82c38f3f540b53f3e5144900acf17'
|
||||
'ee4763a656cf00d92bfda31b6bb2c5cb'
|
||||
@ -80,9 +80,6 @@ _samba4_auth_modules=auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,a
|
||||
--with-pammodulesdir=/usr/lib/security \
|
||||
--with-shared-modules=${_samba4_idmap_modules},${_samba4_pdb_modules},${_samba4_auth_modules} \
|
||||
--disable-rpath-install
|
||||
|
||||
# Add this to the options once it's working...
|
||||
#--with-system-mitkrb5 /opt/heimdal
|
||||
make
|
||||
make DESTDIR="${_pkgsrc}/" install
|
||||
|
||||
|
||||
@ -4,10 +4,10 @@
|
||||
pkgname=transcode
|
||||
_sripver=0.3-4
|
||||
pkgver=1.1.7
|
||||
pkgrel=15
|
||||
pkgrel=16
|
||||
pkgdesc="A video/DVD ripper and encoder for the terminal/console"
|
||||
arch=('x86_64')
|
||||
url="http://tcforge.berlios.de/"
|
||||
url="https://bitbucket.org/france/transcode-tcforge/"
|
||||
license=('GPL')
|
||||
depends=('gawk' 'imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools'
|
||||
'libmpeg2' 'libxaw' 'libxml2' 'libxv' 'a52dec' 'faac')
|
||||
|
||||
17
vlc/PKGBUILD
17
vlc/PKGBUILD
@ -2,8 +2,8 @@
|
||||
# Contributions from ArchLinux: https://projects.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/vlc
|
||||
|
||||
pkgname=vlc
|
||||
pkgver=2.1.5
|
||||
pkgrel=4
|
||||
pkgver=2.2.0
|
||||
pkgrel=1
|
||||
arch=('x86_64')
|
||||
url="http://www.videolan.org/vlc/"
|
||||
pkgdesc=('A multimedia player and framework that plays most multimedia files as well as DVD, Audio CD, VCD, and various streaming protocols')
|
||||
@ -47,24 +47,15 @@ backup=('usr/share/vlc/lua/http/.hosts'
|
||||
categories=('multimedia')
|
||||
options=('!emptydirs')
|
||||
install="vlc.install"
|
||||
source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver/.a}/${pkgname}-${pkgver/.a/a}.tar.xz"
|
||||
'vlc-2.1.5-ffmpeg-2.4.patch'
|
||||
'vlc-2.1.5-avformat.patch')
|
||||
sha1sums=('7f1cb6324a04cf393896bbb5976ca9febd7b3efc'
|
||||
'9896793e605b5646a49506796dd2c28307635791'
|
||||
'bd51cbe232adc72697bfd49834b6f31327e90b85')
|
||||
source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver/.a}/${pkgname}-${pkgver/.a/a}.tar.xz")
|
||||
sha1sums=('11f0384980052c7ed73753af2073965f59b27cd2')
|
||||
screenshot='http://images1.videolan.org/vlc/screenshots/0.9.2/screenshot-kde4.jpg'
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver/.a}"
|
||||
|
||||
# VLC: patch for ffmpeg 2.4 compatibility, increment revision to rebuild.
|
||||
# https://trac.macports.org/changeset/125496
|
||||
patch -p1 -i "${srcdir}/vlc-2.1.5-ffmpeg-2.4.patch"
|
||||
patch -p1 -i "${srcdir}/vlc-2.1.5-avformat.patch"
|
||||
autoreconf -fi
|
||||
|
||||
|
||||
sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c
|
||||
sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp
|
||||
}
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
From 1e31a5a18bb0087f9e625919a805d64a2af40bbe Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
|
||||
Date: Wed, 30 Jul 2014 19:05:43 +0300
|
||||
Subject: [PATCH] avformat: initialize probe data (fixes #11851)
|
||||
|
||||
(cherry picked from commit 49bd1c657d960ba107d9db8752f716139a938eee)
|
||||
---
|
||||
modules/demux/avformat/demux.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
|
||||
index bdd77fd..7349db2 100644
|
||||
--- a/modules/demux/avformat/demux.c
|
||||
+++ b/modules/demux/avformat/demux.c
|
||||
@@ -157,7 +157,7 @@ int OpenDemux( vlc_object_t *p_this )
|
||||
{
|
||||
demux_t *p_demux = (demux_t*)p_this;
|
||||
demux_sys_t *p_sys;
|
||||
- AVProbeData pd;
|
||||
+ AVProbeData pd = { };
|
||||
AVInputFormat *fmt = NULL;
|
||||
unsigned int i;
|
||||
int64_t i_start_time = -1;
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index a684338..053713a 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2242,8 +2242,8 @@ AC_ARG_ENABLE(avcodec,
|
||||
[ --enable-avcodec libavcodec codec (default enabled)])
|
||||
AS_IF([test "${enable_avcodec}" != "no"], [
|
||||
PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [
|
||||
- PKG_CHECK_EXISTS([libavcodec < 56],, [
|
||||
- AC_MSG_ERROR([libavcodec versions 56 and later are not supported yet.])
|
||||
+ PKG_CHECK_EXISTS([libavcodec < 57],, [
|
||||
+ AC_MSG_ERROR([libavcodec versions 57 and later are not supported yet.])
|
||||
])
|
||||
VLC_SAVE_FLAGS
|
||||
CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
|
||||
Loading…
Reference in New Issue
Block a user