Various updates I forgot to commit.

git-svn-id: http://svn.telesphoreo.org/trunk@666 514c082c-b64e-11dc-b46d-3d985efe055d

15 files changed, 28 insertions, 12 deletions

diff --git a/data/adv-cmds/_metadata/provides b/data/adv-cmds/_metadata/provides
new file mode 100644
index 000000000..5a5134c04
--- /dev/null
+++ b/data/adv-cmds/_metadata/provides
@@ -0,0 +1 @@
+ps
diff --git a/data/adv-cmds/_metadata/version b/data/adv-cmds/_metadata/version
index 415196e47..078fa0fe5 100644
--- a/data/adv-cmds/_metadata/version
+++ b/data/adv-cmds/_metadata/version
@@ -1 +1 @@
-118
+119
diff --git a/data/adv-cmds/adv_cmds-118.tar.gz b/data/adv-cmds/adv_cmds-118.tar.gz
deleted file mode 100644
index 760601bca..000000000
--- a/data/adv-cmds/adv_cmds-118.tar.gz
+++ /dev/null
diff --git a/data/adv-cmds/adv_cmds-119.tar.gz b/data/adv-cmds/adv_cmds-119.tar.gz
new file mode 100644
index 000000000..e1922036b
--- /dev/null
+++ b/data/adv-cmds/adv_cmds-119.tar.gz
diff --git a/data/adv-cmds/make.sh b/data/adv-cmds/make.sh
index eb439df86..307777e3a 100644
--- a/data/adv-cmds/make.sh
+++ b/data/adv-cmds/make.sh
@@ -1,10 +1,12 @@
 pkg:setup
+"${PKG_TARG}-gcc" -O2 -mthumb -o tabs tabs.tproj/*.c -lncurses
+"${PKG_TARG}-g++" -O2 -mthumb -o locale/locale locale/*.cc
 for tproj in finger fingerd last lsvfs md ps; do
-    "${PKG_TARG}-gcc" -o "${tproj}" "${tproj}.tproj"/*.c -D'__FBSDID(x)='
+    echo "${tproj}"
+    "${PKG_TARG}-gcc" -O2 -mthumb -o "${tproj}" "${tproj}.tproj"/*.c -D'__FBSDID(x)='
 done
-"${PKG_TARG}-gcc" -o tabs tabs.tproj/*.c -lncurses
 pkg: mkdir -p /bin /usr/bin /usr/libexec
 pkg: cp -a ps /bin
-pkg: cp -a finger last lsvfs md tabs /usr/bin
+pkg: cp -a finger last locale/locale lsvfs md tabs /usr/bin
 pkg: cp -a fingerd /usr/libexec
 ldid -S"${PKG_DATA}/ps.xml" "${PKG_DEST}/bin/ps"
diff --git a/data/apt7-key/_metadata/replaces b/data/apt7-key/_metadata/replaces
index 57f43d3dd..bbf263527 100644
--- a/data/apt7-key/_metadata/replaces
+++ b/data/apt7-key/_metadata/replaces
@@ -1 +1 @@
-apt (<< 1:0-1)
+apt (<< 1:0-1), apt7 (<< 0.7.20.2-4)
diff --git a/data/cydia-sources/_metadata/conflicts b/data/cydia-sources/_metadata/conflicts
deleted file mode 100644
index 939f1ea73..000000000
--- a/data/cydia-sources/_metadata/conflicts
+++ /dev/null
@@ -1 +0,0 @@
-iphonesurge
diff --git a/data/libxml2-lib/_metadata/replaces b/data/libxml2-lib/_metadata/replaces
new file mode 100644
index 000000000..8ddfc3137
--- /dev/null
+++ b/data/libxml2-lib/_metadata/replaces
@@ -0,0 +1 @@
+libxml2 (<= 2.6.32-5)
diff --git a/data/network-cmds/_metadata/provides b/data/network-cmds/_metadata/provides
new file mode 100644
index 000000000..0273413f0
--- /dev/null
+++ b/data/network-cmds/_metadata/provides
@@ -0,0 +1 @@
+arp, ifconfig, netstat, route, traceroute
diff --git a/data/network-cmds/_metadata/version b/data/network-cmds/_metadata/version
index cd307095a..83270bea3 100644
--- a/data/network-cmds/_metadata/version
+++ b/data/network-cmds/_metadata/version
@@ -1 +1 @@
-306
+307.0.1
diff --git a/data/network-cmds/make.sh b/data/network-cmds/make.sh
index aa20f9d38..f4d4a4d60 100644
--- a/data/network-cmds/make.sh
+++ b/data/network-cmds/make.sh
@@ -1,9 +1,22 @@
 shopt -s extglob
 pkg:setup
+
 for tproj in !(natd|ping|rarpd|spray).tproj; do
     tproj=$(basename "${tproj}" .tproj)
-    "${PKG_TARG}-gcc" -o "${tproj}" "${tproj}.tproj"/*.c -DPRIVATE -Dether_ntohost=_old_ether_ntohost
-    pkg:usrbin "${tproj}"
+    echo "${tproj}"
+    "${PKG_TARG}-gcc" -O2 -mthumb -o "${tproj}" "${tproj}.tproj"/!(ns).c -DPRIVATE -Dether_ntohost=_old_ether_ntohost
 done
-"${PKG_TARG}-gcc" -Ialias -o natd natd.tproj/*.c alias/*.c -DPRIVATE
-pkg:usrbin natd
+
+echo natd
+"${PKG_TARG}-gcc" -Ialias -O2 -mthumb -o natd natd.tproj/*.c alias/*.c -DPRIVATE
+
+pkg: mkdir -p {,/usr}/{,s}bin /usr/libexec
+
+# XXX: what /is/ ip6conf? where is ip6conf/ig/?
+pkg: cp -a ip6conf /usr/bin
+
+pkg: cp -a kdumpd /usr/libexec
+pkg: cp -a ifconfig ip6fw ipfw netstat ping6 route routed rtsol slattach /sbin
+pkg: cp -a arp natd ndp rtadvd traceroute traceroute6 trpt /usr/sbin
+
+ln -s /sbin/ping6 "${PKG_DEST}"/bin
diff --git a/data/network-cmds/network_cmds-306.tar.gz b/data/network-cmds/network_cmds-306.tar.gz
deleted file mode 100644
index a3e30a72a..000000000
--- a/data/network-cmds/network_cmds-306.tar.gz
+++ /dev/null
diff --git a/data/network-cmds/network_cmds-307.0.1.tar.gz b/data/network-cmds/network_cmds-307.0.1.tar.gz
new file mode 100644
index 000000000..00ca2b9a7
--- /dev/null
+++ b/data/network-cmds/network_cmds-307.0.1.tar.gz
diff --git a/data/pam-modules/_metadata/depends b/data/pam-modules/_metadata/depends
deleted file mode 100644
index d91809320..000000000
--- a/data/pam-modules/_metadata/depends
+++ /dev/null
@@ -1 +0,0 @@
-system-cmds
diff --git a/data/pam-modules/_metadata/depends_ b/data/pam-modules/_metadata/depends_
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/data/pam-modules/_metadata/depends_