Merge branch '2.5' into 2.6
Conflicts: ruby/.md5sum ruby/Pkgfile
This commit is contained in:
commit
88278bfab9
@ -77,7 +77,6 @@ drwxr-xr-x root/root usr/lib/cups/filter/
|
||||
-rwxr-xr-x root/root usr/lib/cups/filter/hpgltops
|
||||
-rwxr-xr-x root/root usr/lib/cups/filter/imagetops
|
||||
-rwxr-xr-x root/root usr/lib/cups/filter/imagetoraster
|
||||
-rwxr-xr-x root/root usr/lib/cups/filter/pdftops
|
||||
-rwxr-xr-x root/root usr/lib/cups/filter/pstops
|
||||
lrwxrwxrwx root/root usr/lib/cups/filter/rastertodymo -> rastertolabel
|
||||
-rwxr-xr-x root/root usr/lib/cups/filter/rastertoepson
|
||||
|
@ -5,7 +5,7 @@
|
||||
|
||||
name=cups
|
||||
version=1.3.10
|
||||
release=1
|
||||
release=2
|
||||
source=(http://ftp.easysw.com/pub/cups/$version/$name-$version-source.tar.bz2 \
|
||||
cups-config.patch cups)
|
||||
|
||||
@ -27,7 +27,8 @@ build () {
|
||||
--enable-ssl \
|
||||
--enable-gnutls=no \
|
||||
--enable-openssl=yes \
|
||||
--enable-pam=no
|
||||
--enable-pam=no \
|
||||
--enable-pdftops=no
|
||||
|
||||
make
|
||||
make BUILDROOT=$PKG DBUSDIR=/usr/etc/dbus-1 install
|
||||
|
@ -1 +1 @@
|
||||
1eb7d972a19159035892e7d132602726 fakeroot_1.12.2.tar.gz
|
||||
5b482b106e7417a9d7aa5b03a37911cc fakeroot_1.12.3.tar.gz
|
||||
|
@ -3,7 +3,7 @@
|
||||
# Maintainer: Juergen Daubert, juergen dot daubert at t-online dot de
|
||||
|
||||
name=fakeroot
|
||||
version=1.12.2
|
||||
version=1.12.3
|
||||
release=1
|
||||
source=(http://ftp.de.debian.org/debian/pool/main/f/$name/${name}_$version.tar.gz)
|
||||
|
||||
|
@ -5,9 +5,9 @@ drwxr-xr-x root/root usr/include/
|
||||
-rw-r--r-- root/root usr/include/mpg123.h
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
-rwxr-xr-x root/root usr/lib/libmpg123.la
|
||||
lrwxrwxrwx root/root usr/lib/libmpg123.so -> libmpg123.so.0.18.11
|
||||
lrwxrwxrwx root/root usr/lib/libmpg123.so.0 -> libmpg123.so.0.18.11
|
||||
-rwxr-xr-x root/root usr/lib/libmpg123.so.0.18.11
|
||||
lrwxrwxrwx root/root usr/lib/libmpg123.so -> libmpg123.so.0.18.12
|
||||
lrwxrwxrwx root/root usr/lib/libmpg123.so.0 -> libmpg123.so.0.18.12
|
||||
-rwxr-xr-x root/root usr/lib/libmpg123.so.0.18.12
|
||||
drwxr-xr-x root/root usr/lib/mpg123/
|
||||
-rwxr-xr-x root/root usr/lib/mpg123/output_alsa.la
|
||||
-rwxr-xr-x root/root usr/lib/mpg123/output_alsa.so
|
||||
|
@ -1 +1 @@
|
||||
641c433a3ee5319fce7bd64606ab7c04 mpg123-1.8.0.tar.bz2
|
||||
856893f14b29b1cddf4aba32469860b4 mpg123-1.8.1.tar.bz2
|
||||
|
@ -4,7 +4,7 @@
|
||||
# Depends on: libtool, alsa-lib
|
||||
|
||||
name=mpg123
|
||||
version=1.8.0
|
||||
version=1.8.1
|
||||
release=1
|
||||
source=(http://www.mpg123.de/download/$name-$version.tar.bz2)
|
||||
|
||||
|
@ -1 +1 @@
|
||||
73b3747bc7f7c805921e8d24ebac693f mutt-1.5.19.tar.gz
|
||||
027cdd9959203de0c3c64149a7ee351c mutt-1.5.20.tar.gz
|
||||
|
@ -4,7 +4,7 @@
|
||||
# Depends on: gdbm ncurses openssl zlib
|
||||
|
||||
name=mutt
|
||||
version=1.5.19
|
||||
version=1.5.20
|
||||
release=1
|
||||
source=(ftp://ftp.mutt.org/mutt/devel/$name-$version.tar.gz)
|
||||
|
||||
|
@ -1 +1 @@
|
||||
bf297efaa24ec6cdb74963c0f608f6f1 ruby-1.8.7-p173.tar.bz2
|
||||
88c45aaf627b4404e5e4273cb03ba2ee ruby-1.8.7-p174.tar.bz2
|
||||
|
@ -4,7 +4,7 @@
|
||||
# Depends on: ruby
|
||||
|
||||
name=ruby-doc
|
||||
version=1.8.7-p173
|
||||
version=1.8.7-p174
|
||||
release=1
|
||||
source=(ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-$version.tar.bz2)
|
||||
|
||||
|
@ -1 +1 @@
|
||||
2b8be73a13f5e0c191f74a83970f600e sqlite-amalgamation-3.6.14.2.tar.gz
|
||||
82952637b9d8d38024916af85ebab42f sqlite-amalgamation-3.6.15.tar.gz
|
||||
|
@ -4,7 +4,7 @@
|
||||
# Depends on: ncurses, readline
|
||||
|
||||
name=sqlite3
|
||||
version=3.6.14.2
|
||||
version=3.6.15
|
||||
release=1
|
||||
|
||||
source=(http://www.sqlite.org/sqlite-amalgamation-$version.tar.gz)
|
||||
|
@ -1,3 +1,3 @@
|
||||
9ce54d2a0a7959df4470178e7aac5e27 squid
|
||||
5830a3c8e8d64f3483b38093da2a96fa squid-3.0.STABLE15.tar.bz2
|
||||
aa039a2c75404a496f0e99a278599e00 squid-3.0.STABLE16.tar.bz2
|
||||
6cdb98d3b46feceb841b1d5cc2d93b62 squid-config.patch
|
||||
|
@ -3,7 +3,7 @@
|
||||
# Maintainer: Juergen Daubert, juergen dot daubert at t-online dot de
|
||||
|
||||
name=squid
|
||||
version=3.0.STABLE15
|
||||
version=3.0.STABLE16
|
||||
release=1
|
||||
source=(http://www.squid-cache.org/Versions/v3/3.0/$name-$version.tar.bz2 \
|
||||
squid squid-config.patch)
|
||||
|
@ -1 +1,2 @@
|
||||
397b35faad32d5246b6d44b142f8304f tightvnc-1.3.10_unixsrc.tar.bz2
|
||||
dbb48bbb986025b17bf980109977597e tightvnc-config.patch
|
||||
|
@ -1,16 +1,18 @@
|
||||
# Description: enhanced version of the VNC client/server protocol
|
||||
# URL: http://www.tightvnc.org
|
||||
# Maintainer: Jose V Beneyto, sepen at users dot sourceforge dot net
|
||||
# Maintainer: Jose V Beneyto, sepen at crux dot nu
|
||||
# Packager: sten, nick dot steeves at shaw dot ca
|
||||
# Depends on: libjpeg xorg-libxaw xorg-gccmakedep,xorg-imake
|
||||
|
||||
name=tightvnc
|
||||
version=1.3.10
|
||||
release=1
|
||||
source=(http://dl.sourceforge.net/sourceforge/vnc-tight/$name-${version}_unixsrc.tar.bz2)
|
||||
release=2
|
||||
source=(http://dl.sourceforge.net/sourceforge/vnc-tight/$name-${version}_unixsrc.tar.bz2 \
|
||||
$name-config.patch)
|
||||
|
||||
build() {
|
||||
cd vnc_unixsrc
|
||||
patch -p0 -i $SRC/$name-config.patch
|
||||
|
||||
xmkmf -a
|
||||
|
||||
|
@ -1,7 +1,6 @@
|
||||
diff -Nru vnc_unixsrc/vncserver vnc_unixsrc-new/vncserver
|
||||
--- vnc_unixsrc/vncserver 2007-04-26 12:57:06.000000000 +0200
|
||||
+++ vnc_unixsrc-new/vncserver 2007-10-03 19:20:06.000000000 +0200
|
||||
@@ -36,16 +36,16 @@
|
||||
--- vncserver.orig 2009-06-15 20:56:51.840286743 +0200
|
||||
+++ vncserver 2009-06-15 21:14:49.627829365 +0200
|
||||
@@ -32,10 +32,11 @@
|
||||
$geometry = "1024x768";
|
||||
$depth = 24;
|
||||
$desktopName = "X";
|
||||
@ -11,14 +10,7 @@ diff -Nru vnc_unixsrc/vncserver vnc_unixsrc-new/vncserver
|
||||
-$fontPath = "unix/:7100";
|
||||
+$fontPath = "/usr/lib/X11/fonts/misc,/usr/lib/X11/fonts/100dpi,/usr/lib/X11/fonts/75dpi";
|
||||
$authType = "-rfbauth $vncUserDir/passwd";
|
||||
+$colorPath = "/usr/share/X11/rgb";
|
||||
|
||||
# Here is another example of setting the font path:
|
||||
-# $fontPath = "/usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/75dpi/";
|
||||
+# $fontPath = "unix/:7100";
|
||||
# Read configuration from the system-wide and user files if present.
|
||||
|
||||
# X colors database path is optional, uncomment and edit to use:
|
||||
-# $colorPath = "/usr/lib/X11/rgb";
|
||||
+# $colorPath = "/usr/share/X11/rgb";
|
||||
|
||||
# You might wish to make your vnc directory under /tmp, to make sure
|
||||
# passwords are always kept on the local filesystem. To do that, just
|
||||
|
@ -20,64 +20,44 @@ lrwxrwxrwx root/root usr/lib/libwireshark.so.0 -> libwireshark.so.0.0.1
|
||||
lrwxrwxrwx root/root usr/lib/libwiretap.so -> libwiretap.so.0.0.1
|
||||
lrwxrwxrwx root/root usr/lib/libwiretap.so.0 -> libwiretap.so.0.0.1
|
||||
-rwxr-xr-x root/root usr/lib/libwiretap.so.0.0.1
|
||||
-rwxr-xr-x root/root usr/lib/libwsutil.la
|
||||
lrwxrwxrwx root/root usr/lib/libwsutil.so -> libwsutil.so.0.0.0
|
||||
lrwxrwxrwx root/root usr/lib/libwsutil.so.0 -> libwsutil.so.0.0.0
|
||||
-rwxr-xr-x root/root usr/lib/libwsutil.so.0.0.0
|
||||
drwxr-xr-x root/root usr/lib/wireshark/
|
||||
drwxr-xr-x root/root usr/lib/wireshark/plugins/
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/agentx.la
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/agentx.so
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/artnet.la
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/artnet.so
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/asn1.la
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/asn1.so
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/ciscosm.la
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/ciscosm.so
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/coseventcomm.la
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/coseventcomm.so
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/cosnaming.la
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/cosnaming.so
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/docsis.la
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/docsis.so
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/enttec.la
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/enttec.so
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/ethercat.la
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/ethercat.so
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/gryphon.la
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/gryphon.so
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/infiniband.la
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/infiniband.so
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/irda.la
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/irda.so
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/lwres.la
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/lwres.so
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/m2m.la
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/m2m.so
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/mate.la
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/mate.so
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/opcua.la
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/opcua.so
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/opsi.la
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/opsi.so
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/parlay.la
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/parlay.so
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/pcli.la
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/pcli.so
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/profinet.la
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/profinet.so
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/rlm.la
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/rlm.so
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/rtnet.la
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/rtnet.so
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/rudp.la
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/rudp.so
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/sbus.la
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/sbus.so
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/sercosiii.la
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/sercosiii.so
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/stats_tree.la
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/stats_tree.so
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/tango.la
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/tango.so
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/unistim.la
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/unistim.so
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/v5ua.la
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/v5ua.so
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/wimax.la
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/wimax.so
|
||||
-rwxr-xr-x root/root usr/lib/wireshark/plugins/wimaxasncp.la
|
||||
@ -142,6 +122,7 @@ drwxr-xr-x root/root usr/share/wireshark/help/
|
||||
-rw-r--r-- root/root usr/share/wireshark/help/overview.txt
|
||||
-rw-r--r-- root/root usr/share/wireshark/help/toc
|
||||
-rw-r--r-- root/root usr/share/wireshark/idl2wrs.html
|
||||
-rw-r--r-- root/root usr/share/wireshark/ipmap.html
|
||||
-rw-r--r-- root/root usr/share/wireshark/manuf
|
||||
-rw-r--r-- root/root usr/share/wireshark/mergecap.html
|
||||
drwxr-xr-x root/root usr/share/wireshark/pixmaps/
|
||||
@ -204,6 +185,7 @@ drwxr-xr-x root/root usr/share/wireshark/radius/
|
||||
-rw-r--r-- root/root usr/share/wireshark/radius/dictionary.shiva
|
||||
-rw-r--r-- root/root usr/share/wireshark/radius/dictionary.sonicwall
|
||||
-rw-r--r-- root/root usr/share/wireshark/radius/dictionary.springtide
|
||||
-rw-r--r-- root/root usr/share/wireshark/radius/dictionary.starent
|
||||
-rw-r--r-- root/root usr/share/wireshark/radius/dictionary.t_systems_nova
|
||||
-rw-r--r-- root/root usr/share/wireshark/radius/dictionary.telebit
|
||||
-rw-r--r-- root/root usr/share/wireshark/radius/dictionary.trapeze
|
||||
@ -213,6 +195,7 @@ drwxr-xr-x root/root usr/share/wireshark/radius/
|
||||
-rw-r--r-- root/root usr/share/wireshark/radius/dictionary.usr
|
||||
-rw-r--r-- root/root usr/share/wireshark/radius/dictionary.valemount
|
||||
-rw-r--r-- root/root usr/share/wireshark/radius/dictionary.versanet
|
||||
-rw-r--r-- root/root usr/share/wireshark/radius/dictionary.wimax
|
||||
-rw-r--r-- root/root usr/share/wireshark/radius/dictionary.wispr
|
||||
-rw-r--r-- root/root usr/share/wireshark/radius/dictionary.xedia
|
||||
-rw-r--r-- root/root usr/share/wireshark/rawshark.html
|
||||
|
@ -1 +1 @@
|
||||
09d895f111ee768cc0d7c7e2c427c496 wireshark-1.0.8.tar.bz2
|
||||
d3f799e0ae7953cd3426d9e0b6e2708d wireshark-1.2.0.tar.bz2
|
||||
|
@ -5,9 +5,9 @@
|
||||
# Depends on: gtk libpcap libpcre
|
||||
|
||||
name=wireshark
|
||||
version=1.0.8
|
||||
version=1.2.0
|
||||
release=1
|
||||
source=(http://www.$name.org/download/src/$name-$version.tar.bz2)
|
||||
source=(http://www.$name.org/download/src/all-versions/$name-$version.tar.bz2)
|
||||
|
||||
build() {
|
||||
cd $name-$version
|
||||
|
Loading…
Reference in New Issue
Block a user