Update some upstream URIs.

BKrev: 3fbf0ddcKa1Xea1ZrURxtxqG_150rQ

11 files changed, 72 insertions, 12 deletions

diff --git a/base-passwd/base-passwd_3.5.4.oe b/base-passwd/base-passwd_3.5.4.oe
index 004793b382..afe0972dd6 100644
--- a/base-passwd/base-passwd_3.5.4.oe
+++ b/base-passwd/base-passwd_3.5.4.oe
@@ -43,15 +43,9 @@ do_install () {
 pkg_postinst () {
 	set -e
 
-	if [ X"$1" != Xconfigure ]; then
-		exit 0
-	fi
-
-	if ! [ -x ${sbindir}/update-passwd ]; then
-		echo >&2 "`dirname $0`: ${sbindir}/update-passwd does not exist,"
-		echo >&2 "or is not executable"
-		exit 1
-	fi
+#	if [ X"$1" != Xconfigure ]; then
+#		exit 0
+#	fi
 
 	if [ ! -e ${D}/${sysconfdir}/passwd ] ; then
 		cp ${D}/${datadir}/base-passwd/passwd.master ${D}/${sysconfdir}/passwd
@@ -61,6 +55,11 @@ pkg_postinst () {
 		cp ${D}/${datadir}/base-passwd/group.master ${D}/${sysconfdir}/group
 	fi
 	
+#	if ! [ -x ${sbindir}/update-passwd ]; then
+#		echo >&2 "`dirname $0`: ${sbindir}/update-passwd does not exist,"
+#		echo >&2 "or is not executable"
+#		exit 1
+#	fi
 #	update-passwd -p ${D}/${datadir}/base-passwd/passwd.master \
 #		      -g ${D}/${datadir}/base-passwd/group.master \
 #		      -P ${D}/${sysconfdir}/passwd \
diff --git a/base-files/base-files_3.0.10.oe b/bootmenu/bootmenu_0.7.oe
index e69de29bb2..e69de29bb2 100644
--- a/base-files/base-files_3.0.10.oe
+++ b/bootmenu/bootmenu_0.7.oe
diff --git a/centericq/centericq_4.9.7.oe b/centericq/centericq_4.9.7.oe
index 03917c8fde..ddee2cc330 100644
--- a/centericq/centericq_4.9.7.oe
+++ b/centericq/centericq_4.9.7.oe
@@ -1,7 +1,7 @@
 DEPENDS = virtual/libc openssl ncurses
 RDEPENDS = libc6 openssl ncurses
 
-SRC_URI = http://thekonst.net/download/centericq-4.9.7.tar.bz2 \
+SRC_URI = http://centericq.de/archive/source/releases/centericq-${PV}.tar.bz2 \
 	  file://${FILESDIR}/configure.patch;patch=1 \
 	  file://${FILESDIR}/m4.patch;patch=1
 
diff --git a/cups/cups_1.1.20rc1.oe b/cups/cups_1.1.19.oe
index e69de29bb2..e69de29bb2 100644
--- a/cups/cups_1.1.20rc1.oe
+++ b/cups/cups_1.1.19.oe
diff --git a/netbase/netbase-4.13/busybox.patch b/cups/cups_1.1.20rc6.oe
index e69de29bb2..e69de29bb2 100644
--- a/netbase/netbase-4.13/busybox.patch
+++ b/cups/cups_1.1.20rc6.oe
diff --git a/diethotplug/diethotplug_0.4.oe b/diethotplug/diethotplug_0.4.oe
index e69de29bb2..336b14146d 100644
--- a/diethotplug/diethotplug_0.4.oe
+++ b/diethotplug/diethotplug_0.4.oe
@@ -0,0 +1,17 @@
+DEPENDS = virtual/libc
+RDEPENDS = libc6
+
+SRC_URI = http://www.us.kernel.org/pub/linux/utils/kernel/hotplug/diethotplug-${PV}.tar.gz
+
+export KLIBC=
+do_compile () {
+	perl convert_usb.pl ${FILESDIR}/modules.usbmap > usb_modules.h
+	perl convert_pci.pl ${FILESDIR}/modules.pcimap > pci_modules.h
+	perl convert_ieee1394.pl ${FILESDIR}/modules.ieee1394map > ieee1394_modules.h
+	oe_runmake
+}
+
+do_install () {
+	install -d ${D}/${sbindir}
+	install -m 0755 hotplug ${D}/${sbindir}/
+}
diff --git a/netbase/netbase-4.13/init b/netbase/netbase-4.14/busybox.patch
index e69de29bb2..e69de29bb2 100644
--- a/netbase/netbase-4.13/init
+++ b/netbase/netbase-4.14/busybox.patch
diff --git a/netbase/netbase_4.13.oe b/netbase/netbase-4.14/init
index e69de29bb2..e69de29bb2 100644
--- a/netbase/netbase_4.13.oe
+++ b/netbase/netbase-4.14/init
diff --git a/resolvconf/resolvconf_1.0.oe b/netbase/netbase_4.14.oe
index e69de29bb2..e69de29bb2 100644
--- a/resolvconf/resolvconf_1.0.oe
+++ b/netbase/netbase_4.14.oe
diff --git a/nmap/nmap_3.45.oe b/nmap/nmap_3.45.oe
index db94220cb2..a75d5af1b7 100644
--- a/nmap/nmap_3.45.oe
+++ b/nmap/nmap_3.45.oe
@@ -2,8 +2,7 @@ DEPENDS = virtual/libc libpcap
 RDEPENDS = libc6 libpcap
 DESCRIPTION = Nmap is a command line portscanner.
 
-SRC_URI = http://download.insecure.org/nmap/dist/nmap-${PV}.tgz \
-	${DEBIAN_MIRROR}/main/n/nmap/nmap_${PV}-1.diff.gz
+SRC_URI = http://download.insecure.org/nmap/dist/nmap-${PV}.tgz
 
 inherit autotools
 
diff --git a/nmap/nmap_3.48.oe b/nmap/nmap_3.48.oe
index e69de29bb2..a75d5af1b7 100644
--- a/nmap/nmap_3.48.oe
+++ b/nmap/nmap_3.48.oe
@@ -0,0 +1,45 @@
+DEPENDS = virtual/libc libpcap
+RDEPENDS = libc6 libpcap
+DESCRIPTION = Nmap is a command line portscanner.
+
+SRC_URI = http://download.insecure.org/nmap/dist/nmap-${PV}.tgz
+
+inherit autotools
+
+EXTRA_OECONF = --with-pcap=linux --with-libpcap=${STAGING_DIR} --without-nmapfe
+EXTRA_OEMAKE = "STRIPPROG=arm-linux-strip"
+
+CXXFLAGS_append = " -fpermissive"
+# Ugly hack follows -- their configure.ac doesnt match their configure .. 
+# doesnt include a check for the length type in recvfrom, so we hack it here
+CPPFLAGS_append = " -Drecvfrom6_t=socklen_t"
+
+#do_configure_prepend () {
+#	if [ ! -e libpcap-possiblymodified/acinclude.m4 ]; then
+#		cat libpcap-possiblymodified/aclocal.m4 > libpcap-possiblymodified/acinclude.m4
+#	fi
+#}
+
+do_compile_prepend () {
+	${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} libpcre/dftables.c -o libpcre/dftables
+	touch libpcre/dftables.o
+	libpcre/dftables > libpcre/chartables.c
+}
+
+do_configure () {
+# override this function to avoid the autoconf/automake/aclocal/autoheader
+# calls for now
+	oe_runconf
+}
+
+
+do_install () {
+	oe_runmake 'prefix=${D}/${prefix}' \
+		   'exec_prefix=${D}/${exec_prefix}' \
+		   'bindir=${D}/${bindir}' \
+		   'sbindir=${D}/${sbindir}' \
+		   'mandir=${D}/${mandir}' \
+		   'datadir=${D}/${datadir}' \
+		   'nmapdatadir=${D}/${datadir}/nmap' \
+		   install
+}