Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authormaniacikarus <maniacikarus@ipfire.org>
Thu, 2 Apr 2009 16:33:17 +0000 (18:33 +0200)
committermaniacikarus <maniacikarus@ipfire.org>
Thu, 2 Apr 2009 16:33:17 +0000 (18:33 +0200)
config/rootfiles/core/28/filelists/dnsmasq [new symlink]
config/rootfiles/packages/traceroute
doc/packages-list.txt
lfs/dnsmasq
lfs/traceroute
src/initscripts/init.d/net-snmp

diff --git a/config/rootfiles/core/28/filelists/dnsmasq b/config/rootfiles/core/28/filelists/dnsmasq
new file mode 120000 (symlink)
index 0000000..d469c74
--- /dev/null
@@ -0,0 +1 @@
+../../../common/dnsmasq
\ No newline at end of file
index 3d93281d4e8e07d28c4d0fbd1228fafd0ca9d488..155a82fc9b82de040306fcf8bcbe16403737c067 100644 (file)
@@ -1,2 +1,2 @@
-#usr/man/man8/traceroute.8
 usr/sbin/traceroute
+#usr/share/man/man8/traceroute.8
index 950c6c89f8a4edf7c6464d2d3f8cdd9d5ad7d428..14cc59d107723f1e8d970d9cd76cbb48bb8f60d6 100644 (file)
@@ -78,7 +78,7 @@
 * dhcp-3.1.0
 * dhcpcd-2.0.8
 * diffutils-2.8.1
-* dnsmasq-2.45
+* dnsmasq-2.47
 * dosfstools-2.11
 * e2fsprogs-1.39
 * ebtables-v2.0.8-2
 * texinfo-4.8
 * tftp-hpa-0.48
 * tiff-3.8.2
-* traceroute-1.4a12
+* traceroute-2.0.12
 * tripwire-2.4.1.2
 * tunctl
 * udev-096
index 4804c1d9465956c78f51dc28106609e8b0f3f088..e3b710115e5ffcf5eafc1ecf306d157185560cee 100644 (file)
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.45
+VER        = 2.47
 
 THISAPP    = dnsmasq-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b7956e15c9766e05b3eca3ce88fdb616
+$(DL_FILE)_MD5 = 4524081e56d0b935717d493e8e8d3e11
 
 install : $(TARGET)
 
index 0c4b154c8ab509b6cd6ca0bb5b5634b53d7c8e29..fec18a4ceac8e896ecaffcc584d541de8d1cef9e 100644 (file)
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.4a12
+VER        = 2.0.12
 
 THISAPP    = traceroute-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = traceroute
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 964d599ef696efccdeebe7721cd4828d
+$(DL_FILE)_MD5 = 2262a9d30ae85f12b759a38ef827f8f7
 
 install : $(TARGET)
 
@@ -77,11 +77,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && sed -i 's|@prefix@|/usr|' Makefile.in
-       cd $(DIR_APP) && ./configure
-       cd $(DIR_APP) && make $(MAKETUNING)
-       cd $(DIR_APP) && make install
-       cd $(DIR_APP) && make install-man
+       cd $(DIR_APP) && sed -i 's|hints.ai_flags = AI_IDN;|/* hints.ai_flags = AI_IDN; */|g' traceroute/traceroute.c
+       cd $(DIR_APP) && make 
+       cd $(DIR_APP) && make install prefix=/usr bindir=/usr/sbin
        chmod u-s /usr/sbin/traceroute
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
index d45d0d1e5811a1c31351a2918005856efe9dfc35..cadb54824a5e825218d83be4cb02ed34651ea5f0 100755 (executable)
 case "${1}" in
        start)
                boot_mesg "Starting net-snmp - SNMPD..."
-               loadproc /usr/local/sbin/snmpd -c /etc/snmpd.conf > /dev/null
+               loadproc /usr/sbin/snmpd -c /etc/snmpd.conf > /dev/null
                evaluate_retval
                ;;
                
        stop)
                boot_mesg "Stopping net-snmp - SNMPD..."
-               killproc /usr/local/sbin/snmpd
+               killproc /usr/sbin/snmpd
                ;;
 
        restart)
@@ -34,7 +34,7 @@ case "${1}" in
                ;;
 
        status)
-               statusproc /usr/local/sbin/snmpd
+               statusproc /usr/sbin/snmpd
                ;;
 
        *)