Merge branch '2.2' into 2.3

This commit is contained in:
Juergen Daubert 2007-02-05 19:14:48 +01:00
commit 1574f76fea
13 changed files with 26 additions and 26 deletions

View File

@ -1,3 +1,3 @@
90efed52fc4fab31022bd8e1f8d69eb5 dnsmasq
392bf22dbff84eae010e149f15cd4136 dnsmasq-2.36.tar.gz
81846e3123d2714b0530ebd01017efe4 dnsmasq-config.patch
e105a41cdf5adb8b615f0a06eb17ecb9 dnsmasq-2.37.tar.gz
3ad6e7e46d2e903a2142a57fcbb34af9 dnsmasq-config.patch

View File

@ -3,7 +3,7 @@
# Maintainer: Jürgen Daubert, juergen dot daubert at t-online dot de
name=dnsmasq
version=2.36
version=2.37
release=1
source=(http://www.thekelleys.org.uk/$name/$name-$version.tar.gz \
$name-config.patch dnsmasq)

View File

@ -1,6 +1,6 @@
diff -Nru dnsmasq-2.36.orig/Makefile dnsmasq-2.36/Makefile
--- dnsmasq-2.36.orig/Makefile 2007-01-22 15:04:04.000000000 +0100
+++ dnsmasq-2.36/Makefile 2007-01-22 15:04:19.000000000 +0100
diff -Nru dnsmasq-2.37.orig/Makefile dnsmasq-2.37/Makefile
--- dnsmasq-2.37.orig/Makefile 2007-02-05 17:26:49.000000000 +0100
+++ dnsmasq-2.37/Makefile 2007-02-05 17:27:02.000000000 +0100
@@ -1,6 +1,6 @@
PREFIX?=/usr/local
BINDIR = ${PREFIX}/sbin
@ -9,9 +9,9 @@ diff -Nru dnsmasq-2.36.orig/Makefile dnsmasq-2.36/Makefile
LOCALEDIR = ${PREFIX}/share/locale
SRC = src
diff -Nru dnsmasq-2.36.orig/dnsmasq.conf.example dnsmasq-2.36/dnsmasq.conf.example
--- dnsmasq-2.36.orig/dnsmasq.conf.example 2007-01-22 15:04:04.000000000 +0100
+++ dnsmasq-2.36/dnsmasq.conf.example 2007-01-22 15:04:19.000000000 +0100
diff -Nru dnsmasq-2.37.orig/dnsmasq.conf.example dnsmasq-2.37/dnsmasq.conf.example
--- dnsmasq-2.37.orig/dnsmasq.conf.example 2007-02-05 17:26:49.000000000 +0100
+++ dnsmasq-2.37/dnsmasq.conf.example 2007-02-05 17:27:02.000000000 +0100
@@ -59,8 +59,8 @@
# If you want dnsmasq to change uid and gid to something other
@ -23,7 +23,7 @@ diff -Nru dnsmasq-2.36.orig/dnsmasq.conf.example dnsmasq-2.36/dnsmasq.conf.examp
# If you want dnsmasq to listen for DHCP and DNS requests only on
# specified interfaces (and the loopback) give the name of the
@@ -298,7 +298,7 @@
@@ -305,7 +305,7 @@
# The DHCP server needs somewhere on disk to keep its lease database.
# This defaults to a sane location, but if you want to change it, use
# the line below.
@ -32,9 +32,9 @@ diff -Nru dnsmasq-2.36.orig/dnsmasq.conf.example dnsmasq-2.36/dnsmasq.conf.examp
# Set the DHCP server to authoritative mode. In this mode it will barge in
# and take over the lease for any client which broadcasts on the network,
diff -Nru dnsmasq-2.36.orig/src/config.h dnsmasq-2.36/src/config.h
--- dnsmasq-2.36.orig/src/config.h 2007-01-22 15:04:04.000000000 +0100
+++ dnsmasq-2.36/src/config.h 2007-01-22 15:04:19.000000000 +0100
diff -Nru dnsmasq-2.37.orig/src/config.h dnsmasq-2.37/src/config.h
--- dnsmasq-2.37.orig/src/config.h 2007-02-05 17:26:49.000000000 +0100
+++ dnsmasq-2.37/src/config.h 2007-02-05 17:27:02.000000000 +0100
@@ -36,7 +36,7 @@
#if defined(__FreeBSD__) || defined (__OpenBSD__) || defined(__DragonFly__)
# define LEASEFILE "/var/db/dnsmasq.leases"

View File

@ -29,9 +29,9 @@ drwxr-xr-x root/root usr/include/fuse/
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libfuse.a
-rwxr-xr-x root/root usr/lib/libfuse.la
lrwxrwxrwx root/root usr/lib/libfuse.so -> libfuse.so.2.6.2
lrwxrwxrwx root/root usr/lib/libfuse.so.2 -> libfuse.so.2.6.2
-rwxr-xr-x root/root usr/lib/libfuse.so.2.6.2
lrwxrwxrwx root/root usr/lib/libfuse.so -> libfuse.so.2.6.3
lrwxrwxrwx root/root usr/lib/libfuse.so.2 -> libfuse.so.2.6.3
-rwxr-xr-x root/root usr/lib/libfuse.so.2.6.3
-rw-r--r-- root/root usr/lib/libulockmgr.a
-rwxr-xr-x root/root usr/lib/libulockmgr.la
lrwxrwxrwx root/root usr/lib/libulockmgr.so -> libulockmgr.so.1.0.1

View File

@ -1 +1 @@
fa3837fa6bc920303b02fb3820606964 fuse-2.6.2.tar.gz
3f4f5d07d12dedc0a3fd23472171fe94 fuse-2.6.3.tar.gz

View File

@ -4,7 +4,7 @@
# Packager: Jukka Heino, jukka dot heino at gmail dot com
name=fuse
version=2.6.2
version=2.6.3
release=1
source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.gz)

View File

@ -1,2 +1,2 @@
448caca4745aef1a842f4fdb1aa62e1e samba
afe6923d05fed5b5ccab593c7a407cd1 samba-3.0.23d.tar.gz
89273f67a6d8067cbbecefaa13747153 samba-3.0.24.tar.gz

View File

@ -4,7 +4,7 @@
# Depends on: ncurses, readline
name=samba
version=3.0.23d
version=3.0.24
release=1
source=(http://www.samba.org/samba/ftp/stable/$name-$version.tar.gz \
samba)

View File

@ -1 +1 @@
de3f68da0c8b7fc72b8fded95a9aebbc valgrind-3.2.2.tar.bz2
978847992b136c8d8cb5c6559a91df1c valgrind-3.2.3.tar.bz2

View File

@ -3,7 +3,7 @@
# Maintainer: Tilman Sauerbeck, tilman at crux dot nu
name=valgrind
version=3.2.2
version=3.2.3
release=1
source=(http://$name.org/downloads/$name-$version.tar.bz2)

View File

@ -21,8 +21,6 @@ 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
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/acn.la
-rwxr-xr-x root/root usr/lib/wireshark/plugins/acn.so
-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
@ -103,10 +101,12 @@ drwxr-xr-x root/root usr/share/wireshark/diameter/
-rw-r--r-- root/root usr/share/wireshark/diameter/imscxdx.xml
-rw-r--r-- root/root usr/share/wireshark/diameter/mobileipv4.xml
-rw-r--r-- root/root usr/share/wireshark/diameter/nasreq.xml
-rw-r--r-- root/root usr/share/wireshark/diameter/sip.xml
-rw-r--r-- root/root usr/share/wireshark/diameter/sunping.xml
drwxr-xr-x root/root usr/share/wireshark/dtds/
-rw-r--r-- root/root usr/share/wireshark/dtds/dc.dtd
-rw-r--r-- root/root usr/share/wireshark/dtds/itunes.dtd
-rw-r--r-- root/root usr/share/wireshark/dtds/mscml.dtd
-rw-r--r-- root/root usr/share/wireshark/dtds/pocsettings.dtd
-rw-r--r-- root/root usr/share/wireshark/dtds/presence.dtd
-rw-r--r-- root/root usr/share/wireshark/dtds/reginfo.dtd

View File

@ -1 +1 @@
05fada181e12bfa94b52f0b10395b28c wireshark-0.99.4.tar.bz2
ff067e0f2a0e0e53362bc6a943ff8622 wireshark-0.99.5.tar.bz2

View File

@ -6,7 +6,7 @@
# Nice to have: libpcre
name=wireshark
version=0.99.4
version=0.99.5
release=1
source=(http://www.$name.org/download/src/$name-$version.tar.bz2)