Merge branch '3.0' into 3.1

Conflicts:
	samba/.md5sum
	samba/Pkgfile
This commit is contained in:
Juergen Daubert 2014-03-12 08:51:20 +01:00
commit 94856404ed
12 changed files with 21 additions and 14 deletions

View File

@ -76,6 +76,7 @@ drwxr-xr-x root/root usr/share/cups/
drwxr-xr-x root/root usr/share/cups/banners/
-rw-r--r-- root/root usr/share/cups/banners/classified
-rw-r--r-- root/root usr/share/cups/banners/confidential
-rw-r--r-- root/root usr/share/cups/banners/form
-rw-r--r-- root/root usr/share/cups/banners/secret
-rw-r--r-- root/root usr/share/cups/banners/standard
-rw-r--r-- root/root usr/share/cups/banners/topsecret
@ -87,6 +88,10 @@ lrwxrwxrwx root/root usr/share/cups/charsets/pdf.utf-8 -> pdf.utf-8.simple
drwxr-xr-x root/root usr/share/cups/data/
-rw-r--r-- root/root usr/share/cups/data/default-testpage.pdf
-rw-r--r-- root/root usr/share/cups/data/default.pdf
-rw-r--r-- root/root usr/share/cups/data/form_english.pdf
-rw-r--r-- root/root usr/share/cups/data/form_english_in.odt
-rw-r--r-- root/root usr/share/cups/data/form_russian.pdf
-rw-r--r-- root/root usr/share/cups/data/form_russian_in.odt
-rw-r--r-- root/root usr/share/cups/data/testprint
drwxr-xr-x root/root usr/share/cups/drv/
-rw-r--r-- root/root usr/share/cups/drv/cupsfilters.drv

View File

@ -1,2 +1,2 @@
f182d7717ed0a939a4f50e572939afdd cups-browsed
d4642e5050222cf85a4bf6bd82cf45f8 cups-filters-1.0.46.tar.xz
c1baecc8996c97af1ffe58b5f2046e86 cups-filters-1.0.47.tar.xz

View File

@ -4,7 +4,7 @@
# Depends on: cups ghostscript poppler qpdf
name=cups-filters
version=1.0.46
version=1.0.47
release=1
source=(http://www.openprinting.org/download/$name/$name-$version.tar.xz
cups-browsed)

View File

@ -1,3 +1,3 @@
448caca4745aef1a842f4fdb1aa62e1e samba
9e89abfcfe519a74a2606c3a513902ea samba-4.1.5-readline-6.3.patch
71658f34cfdcffe3f48c0df5f4b08d79 samba-4.1.5.tar.gz
9dc64658c0cc81e7637f9b975c19638c samba-4.1.6.tar.gz

View File

@ -4,15 +4,15 @@
# Depends on: ncurses openssl readline zlib tdb talloc libcap acl libaio popt
name=samba
version=4.1.5
release=2
version=4.1.6
release=1
source=(http://www.samba.org/samba/ftp/stable/$name-$version.tar.gz \
samba $name-$version-readline-6.3.patch)
samba $name-4.1.5-readline-6.3.patch)
build () {
cd $name-$version
patch -p1 -i $SRC/$name-$version-readline-6.3.patch
patch -p1 -i $SRC/$name-4.1.5-readline-6.3.patch
local JOBS=$(awk 'BEGIN{RS="-j|--jobs="} NR==2 {print $1}' <<< $MAKEFLAGS)
test -n "$JOBS" && export JOBS="$JOBS"

View File

@ -1 +1 @@
75008d8baf7c6c9e27aa7afb34a622de socat-1.7.2.3.tar.bz2
69b8155dd442a6f24e28ef5407d868eb socat-1.7.2.4.tar.bz2

View File

@ -4,7 +4,7 @@
# Depends on: ncurses openssl readline tcp_wrappers
name=socat
version=1.7.2.3
version=1.7.2.4
release=1
source=(http://www.dest-unreach.org/socat/download/$name-$version.tar.bz2)

View File

@ -1 +1 @@
509ff98d8dc9729b618b7e96612079c6 sqlite-autoconf-3080301.tar.gz
6b8cb7b9063a1d97f7b5dc517e8ee0c4 sqlite-autoconf-3080401.tar.gz

View File

@ -4,7 +4,7 @@
# Depends on: ncurses, readline
name=sqlite3
version=3.8.3.1
version=3.8.4.1
release=1
_version=$(printf "%i%.2i%.2i%.2i" ${version//./ })

View File

@ -45,6 +45,7 @@ drwxr-xr-x root/root usr/lib/squid/
-rwxr-xr-x root/root usr/lib/squid/negotiate_wrapper_auth
-rwxr-xr-x root/root usr/lib/squid/ntlm_fake_auth
-rwxr-xr-x root/root usr/lib/squid/ntlm_smb_lm_auth
-rwxr-xr-x root/root usr/lib/squid/storeid_file_rewrite
-rwxr-xr-x root/root usr/lib/squid/unlinkd
-rwxr-xr-x root/root usr/lib/squid/url_fake_rewrite
-rwxr-xr-x root/root usr/lib/squid/url_fake_rewrite.sh
@ -66,6 +67,7 @@ drwxr-xr-x root/root usr/man/man8/
-rw-r--r-- root/root usr/man/man8/ext_wbinfo_group_acl.8.gz
-rw-r--r-- root/root usr/man/man8/log_db_daemon.8.gz
-rw-r--r-- root/root usr/man/man8/squid.8.gz
-rw-r--r-- root/root usr/man/man8/storeid_file_rewrite.8.gz
drwxr-xr-x root/root usr/sbin/
-rwxr-xr-x root/root usr/sbin/squid
drwxr-xr-x root/root usr/share/

View File

@ -1,2 +1,2 @@
dd94bf3ea23e552153b5ee03fc523a4e squid
dd016ff5f14b2548083b3882207914f6 squid-3.3.11.tar.xz
dc2bcb967fc6b15bbbc6b961010c0c00 squid-3.4.4.tar.xz

View File

@ -3,9 +3,9 @@
# Maintainer: Juergen Daubert, jue at crux dot nu
name=squid
version=3.3.11
version=3.4.4
release=1
source=(http://www.squid-cache.org/Versions/v3/3.3/$name-$version.tar.xz
source=(http://www.squid-cache.org/Versions/v3/3.4/$name-$version.tar.xz
squid)
build () {