diff --git a/config/rootfiles/core/28/filelists/dnsmasq b/config/rootfiles/core/28/filelists/dnsmasq new file mode 120000 index 000000000..d469c7463 --- /dev/null +++ b/config/rootfiles/core/28/filelists/dnsmasq @@ -0,0 +1 @@ +../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/packages/traceroute b/config/rootfiles/packages/traceroute index 3d93281d4..155a82fc9 100644 --- a/config/rootfiles/packages/traceroute +++ b/config/rootfiles/packages/traceroute @@ -1,2 +1,2 @@ -#usr/man/man8/traceroute.8 usr/sbin/traceroute +#usr/share/man/man8/traceroute.8 diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 950c6c89f..14cc59d10 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -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 @@ -293,7 +293,7 @@ * 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 diff --git a/lfs/dnsmasq b/lfs/dnsmasq index 4804c1d94..e3b710115 100644 --- a/lfs/dnsmasq +++ b/lfs/dnsmasq @@ -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) diff --git a/lfs/traceroute b/lfs/traceroute index 0c4b154c8..fec18a4ce 100644 --- a/lfs/traceroute +++ b/lfs/traceroute @@ -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) diff --git a/src/initscripts/init.d/net-snmp b/src/initscripts/init.d/net-snmp index d45d0d1e5..cadb54824 100755 --- a/src/initscripts/init.d/net-snmp +++ b/src/initscripts/init.d/net-snmp @@ -18,13 +18,13 @@ 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 ;; *)