[SM-Commit] GIT changes to master grimoire by Flavien Bridault (4dc568d6950958ad6537b7e88d240b906a55287f)

Flavien Bridault scm at mail.sourcemage.org
Mon Aug 14 10:56:16 EDT 2006


GIT changes to master grimoire by Flavien Bridault <vlaaad at sourcemage.org>:

 ChangeLog                                            |    3 +
 net/dhcdbd/DETAILS                                   |    2 
 net/dhcdbd/HISTORY                                   |    4 +
 net/gnetswitch/CONFLICTS                             |    1 
 net/gnetswitch/DEPENDS                               |    2 
 net/gnetswitch/DETAILS                               |   14 ++++
 net/gnetswitch/HISTORY                               |    3 +
 net/gnetswitch/gnetswitch-0.3.99beta1.tar.gz.sig     |binary
 net/gswitch/BUILD                                    |    1 
 net/gswitch/DEPENDS                                  |    3 -
 net/gswitch/DETAILS                                  |    9 +--
 net/gswitch/HISTORY                                  |    3 +
 net/gswitch/INSTALL                                  |    1 
 net/gswitch/PRE_BUILD                                |    1 
 net/gswitch/TRIGGERS                                 |    1 
 net/libnetswitch/CONFLICTS                           |    1 
 net/libnetswitch/DEPENDS                             |    2 
 net/libnetswitch/DETAILS                             |   16 +++++
 net/libnetswitch/HISTORY                             |    3 +
 net/libnetswitch/PRE_BUILD                           |    3 +
 net/libnetswitch/init.d/netswitch                    |   38 ++++++++++++
 net/libnetswitch/libnetswitch-0.3.99beta1.tar.gz.sig |binary
 net/libnetswitch/smgl.diff                           |   57 +++++++++++++++++++
 net/libswitch/BUILD                                  |    3 -
 net/libswitch/DEPENDS                                |    3 -
 net/libswitch/DETAILS                                |    9 +--
 net/libswitch/HISTORY                                |    3 +
 net/libswitch/INSTALL                                |    1 
 net/libswitch/PRE_BUILD                              |    1 
 net/libswitch/TRIGGERS                               |    1 
 30 files changed, 172 insertions(+), 17 deletions(-)

New commits:
commit 4ef14b4106ddd767249b4b77f96918c0f05304cd
Author: Flavien Bridault <vlaaad at sourcemage.org>
Commit: Flavien Bridault <vlaaad at sourcemage.org>

    Updated Changelog for deprecation notification

commit 5d0b043bbfaa61226ced8e8a2f59083a0adf6776
Author: Flavien Bridault <vlaaad at sourcemage.org>
Commit: Flavien Bridault <vlaaad at sourcemage.org>

    New spell gswitch (was gnetswitch)

commit 53e7fcf3a670a96a51e090a7681a67e2530c612e
Author: Flavien Bridault <vlaaad at sourcemage.org>
Commit: Flavien Bridault <vlaaad at sourcemage.org>

    New spell libnetswitch (was libswitch)

commit a927b9f0b46f72bda5febf7fff60731cee62cb66
Author: Flavien Bridault <vlaaad at sourcemage.org>
Commit: Flavien Bridault <vlaaad at sourcemage.org>

    Deprecate gswitch

commit 26d8c7246b64bd4d76731ca91d16fdeb61c3886f
Author: Flavien Bridault <vlaaad at sourcemage.org>
Commit: Flavien Bridault <vlaaad at sourcemage.org>

    Deprecate libswitch

commit 89ffae71d524508aaf12a632dca0be7f55449939
Author: Flavien Bridault <vlaaad at sourcemage.org>
Commit: Flavien Bridault <vlaaad at sourcemage.org>

    Fix for dbus 0.9x in dhcdbd

diff --git a/ChangeLog b/ChangeLog
index 0ac7c0a..950847a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2006-08-14 Flavien Bridault <vlaaad at sourcemage.org>
+	* net/libswitch,gswitch: deprecated in favour of libnetswitch and gnetswitch
+
 2006-08-13 Matthew Clark <matthewclark at inlesserterms.net>
 	* x11/xbindkeys: new spell, allows you to launch shell commands with your
 	keyboard or mouse in X
diff --git a/net/dhcdbd/DETAILS b/net/dhcdbd/DETAILS
index 4707022..d4ba92a 100755
--- a/net/dhcdbd/DETAILS
+++ b/net/dhcdbd/DETAILS
@@ -5,10 +5,10 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
    SOURCE_URL[0]=http://people.redhat.com/jvdias/dhcdbd/$SOURCE
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
       LICENSE[0]=GPL
-       BUILD_API=2
         KEYWORDS="net"
         WEB_SITE=http://people.redhat.com/jvdias/dhcdbd/
          ENTERED=20060424
+       PATCHLVEL=1
            SHORT='DHCP D-BUS Daemon'
 cat << EOF
 Red Hat's DHCP D-BUS Daemon.
diff --git a/net/dhcdbd/HISTORY b/net/dhcdbd/HISTORY
index 39e4be4..ab3c42e 100644
--- a/net/dhcdbd/HISTORY
+++ b/net/dhcdbd/HISTORY
@@ -1,3 +1,7 @@
+2006-08-14 Flavien Bridault <vlaaad at sourcemage.org>
+	* DETAILS: PATCHLEVEL++
+	* PRE_BUILD: added, fix for dbus 0.9X
+
 2006-04-24 Eric Sandall <eric at sandall.us>
 	* DETAILS,DEPENDS,BUILD,init.d/dhcdbd: Created
 
diff --git a/net/gnetswitch/CONFLICTS b/net/gnetswitch/CONFLICTS
new file mode 100755
index 0000000..d510f15
--- /dev/null
+++ b/net/gnetswitch/CONFLICTS
@@ -0,0 +1 @@
+conflicts gswitch y
diff --git a/net/gnetswitch/DEPENDS b/net/gnetswitch/DEPENDS
new file mode 100755
index 0000000..1e9127f
--- /dev/null
+++ b/net/gnetswitch/DEPENDS
@@ -0,0 +1,2 @@
+depends gtk+2		&&
+depends libnetswitch
diff --git a/net/gnetswitch/DETAILS b/net/gnetswitch/DETAILS
new file mode 100755
index 0000000..ad7b037
--- /dev/null
+++ b/net/gnetswitch/DETAILS
@@ -0,0 +1,14 @@
+           SPELL=gnetswitch
+         VERSION=0.3.99beta1
+          SOURCE=$SPELL-$VERSION.tar.gz
+   SOURCE_URL[0]=http://netswitch.tuxfamily.org/files/$SOURCE
+      SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+        WEB_SITE=http://netswitch.tuxfamily.org/
+         ENTERED=20060117
+      LICENSE[0]=GPL
+        KEYWORDS="net"
+           SHORT="GTK+ GUI for Netswitch library"
+cat << EOF
+GSwitch is a GTK+ GUI for Netswitch library.
+EOF
diff --git a/net/gnetswitch/HISTORY b/net/gnetswitch/HISTORY
new file mode 100644
index 0000000..6faaa40
--- /dev/null
+++ b/net/gnetswitch/HISTORY
@@ -0,0 +1,3 @@
+2006-08-14 Flavien Bridault <vlaaad at sourcemage.org>
+	* DETAILS, DEPENDS, CONFLICTS, HISTORY: created spell
+
diff --git a/net/gnetswitch/gnetswitch-0.3.99beta1.tar.gz.sig b/net/gnetswitch/gnetswitch-0.3.99beta1.tar.gz.sig
new file mode 100644
index 0000000..8932b7f
Binary files /dev/null and b/net/gnetswitch/gnetswitch-0.3.99beta1.tar.gz.sig differ
diff --git a/net/gswitch/BUILD b/net/gswitch/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/net/gswitch/BUILD
@@ -0,0 +1 @@
+true
diff --git a/net/gswitch/DEPENDS b/net/gswitch/DEPENDS
index c53412e..03eb0e3 100755
--- a/net/gswitch/DEPENDS
+++ b/net/gswitch/DEPENDS
@@ -1,2 +1 @@
-depends gtk+2		&&
-depends libswitch
+depends gnetswitch
diff --git a/net/gswitch/DETAILS b/net/gswitch/DETAILS
index 3954812..f1c89d5 100755
--- a/net/gswitch/DETAILS
+++ b/net/gswitch/DETAILS
@@ -1,15 +1,14 @@
            SPELL=gswitch
          VERSION=0.3.1
-          SOURCE=$SPELL-$VERSION.tar.gz
-   SOURCE_URL[0]=http://netswitch.tuxfamily.org/files/$SOURCE
-     SOURCE_HASH=sha512:d0225e9b9f21a76c120801381a4f1fcb955751266ade3f057acc5f2359279c8eedbc04ea04ce561d4968c46ca3ed290c36a379bf8a1250c622d38b482ca64a42
+#          SOURCE=$SPELL-$VERSION.tar.gz
+#   SOURCE_URL[0]=http://netswitch.tuxfamily.org/files/$SOURCE
+#     SOURCE_HASH=sha512:d0225e9b9f21a76c120801381a4f1fcb955751266ade3f057acc5f2359279c8eedbc04ea04ce561d4968c46ca3ed290c36a379bf8a1250c622d38b482ca64a42
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
         WEB_SITE=http://netswitch.tuxfamily.org/
          ENTERED=20060117
-         UPDATED=20060117
       LICENSE[0]=GPL
-       BUILD_API=2
         KEYWORDS="net"
+      PATCHLEVEL=1
            SHORT="GTK+ GUI for Netswitch library"
 cat << EOF
 GSwitch is a GTK+ GUI for Netswitch library.
diff --git a/net/gswitch/HISTORY b/net/gswitch/HISTORY
index 8471d05..f7da764 100644
--- a/net/gswitch/HISTORY
+++ b/net/gswitch/HISTORY
@@ -1,3 +1,6 @@
+2006-08-14 Flavien Bridault <vlaaad at sourcemage.org>
+	* Deprecation because the software name has changed into gnetswitch
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 
diff --git a/net/gswitch/INSTALL b/net/gswitch/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/net/gswitch/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/net/gswitch/PRE_BUILD b/net/gswitch/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/net/gswitch/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/net/gswitch/TRIGGERS b/net/gswitch/TRIGGERS
new file mode 100755
index 0000000..4ea078e
--- /dev/null
+++ b/net/gswitch/TRIGGERS
@@ -0,0 +1 @@
+on_cast gswitch dispel_self
diff --git a/net/libnetswitch/CONFLICTS b/net/libnetswitch/CONFLICTS
new file mode 100755
index 0000000..02dc275
--- /dev/null
+++ b/net/libnetswitch/CONFLICTS
@@ -0,0 +1 @@
+conflicts libswitch y
diff --git a/net/libnetswitch/DEPENDS b/net/libnetswitch/DEPENDS
new file mode 100755
index 0000000..da0c5a0
--- /dev/null
+++ b/net/libnetswitch/DEPENDS
@@ -0,0 +1,2 @@
+depends gamin		&&
+depends libgtop2
diff --git a/net/libnetswitch/DETAILS b/net/libnetswitch/DETAILS
new file mode 100755
index 0000000..cd19128
--- /dev/null
+++ b/net/libnetswitch/DETAILS
@@ -0,0 +1,16 @@
+           SPELL=libnetswitch
+         VERSION=0.3.99beta1
+          SOURCE=$SPELL-$VERSION.tar.gz
+   SOURCE_URL[0]=http://netswitch.tuxfamily.org/files/$SOURCE
+      SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
+        WEB_SITE=http://netswitch.tuxfamily.org/
+         ENTERED=20060117
+      LICENSE[0]=GPL
+        KEYWORDS="net"
+           SHORT="Distribution independant tools to manage various network profiles"
+cat << EOF
+Netswitch is a set of tools to manage your network profiles in an independant
+way from your Linux Distribution tools. It also aims to enable a lot of
+interfaces (Console based, X based).
+EOF
diff --git a/net/libnetswitch/HISTORY b/net/libnetswitch/HISTORY
new file mode 100644
index 0000000..9c7adbf
--- /dev/null
+++ b/net/libnetswitch/HISTORY
@@ -0,0 +1,3 @@
+2006-08-14 Flavien Bridault <vlaaad at sourcemage.org>
+	* Created spell 
+
diff --git a/net/libnetswitch/PRE_BUILD b/net/libnetswitch/PRE_BUILD
new file mode 100755
index 0000000..b0c089e
--- /dev/null
+++ b/net/libnetswitch/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build  &&
+cd $SOURCE_DIRECTORY  &&
+patch -p0 < $SCRIPT_DIRECTORY/smgl.diff
diff --git a/net/libnetswitch/init.d/netswitch b/net/libnetswitch/init.d/netswitch
new file mode 100644
index 0000000..efe5a0c
--- /dev/null
+++ b/net/libnetswitch/init.d/netswitch
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+PROGRAM=/usr/bin/netswitch
+RUNLEVEL=3
+
+. /etc/init.d/smgl_init
+
+start() {
+  # Find the profile to activate from Kernel command line
+  PROFILE=`cat /proc/cmdline|sed 's/.*netswitch=\([^ ]*\).*/\1/'`
+  if [ -n "`netswitch list|grep \"$PROFILE\"`" ]; then
+    loadproc $PROGRAM profile on $PROFILE
+    evaluate_retval
+  fi
+}
+
+stop() {
+  loadproc $PROGRAM profile off
+  evaluate_retval
+}
+
+restart() {
+  echo "Restarting netswitch..."
+  if [ -f $PIDFILE ]; then
+    $0 stop
+    sleep 2
+  fi
+  $0 start
+}
+
+status() { exit 3; }
+
+reload() { exit 3; }
+force_reload() { exit 3; }
+
+usage() {
+  echo "Usage: $0 {start|stop|restart|status}"
+}
diff --git a/net/libnetswitch/libnetswitch-0.3.99beta1.tar.gz.sig b/net/libnetswitch/libnetswitch-0.3.99beta1.tar.gz.sig
new file mode 100644
index 0000000..c8d7fb3
Binary files /dev/null and b/net/libnetswitch/libnetswitch-0.3.99beta1.tar.gz.sig differ
diff --git a/net/libnetswitch/smgl.diff b/net/libnetswitch/smgl.diff
new file mode 100644
index 0000000..b2758f8
--- /dev/null
+++ b/net/libnetswitch/smgl.diff
@@ -0,0 +1,57 @@
+--- etc.old/switch.conf	2006-08-14 16:24:03.000000000 +0200
++++ etc/switch.conf	2006-08-14 16:28:42.000000000 +0200
+@@ -1,4 +1,4 @@
+-ALLOWED="@adm"
++ALLOWED="@wheel"
+ # La ligne suivante permet de définir le répertoire contenant les 
+ # profils réseaux
+ CONFIG_PREFIX="/etc/netswitch/profiles"
+@@ -11,19 +11,19 @@
+ SMTPDIR="/etc/nullmailer"
+ SMTP_SCRIPT="/etc/init.d/svscan"
+ 
+-IWBIN="/sbin/iwconfig"
+-IWLIST="/sbin/iwlist"
++IWBIN="/usr/sbin/iwconfig"
++IWLIST="/usr/sbin/iwlist"
+ 
+ WPABIN="/usr/sbin/wpa_supplicant"
+ WPA_PASSPHRASE="/usr/sbin/wpa_passphrase"
+ WPA_CONF="/etc/netswitch/wpa.conf"
+ WPA_PRECONF="/etc/netswitch/wpa.tmpl"
+ 
+-IPBIN="/sbin/ip"
++IPBIN="/usr/sbin/ip"
+ IFBIN="/sbin/ifconfig"
+ PPPBIN="/usr/sbin/pppd"
+ ROUTEBIN="/sbin/route"
+-INITDIR="/etc/xinit.d"
++INITDIR="/etc/init.d"
+ 
+ DHCP_CLIENT="/sbin/dhcpcd"
+ if [ ! -x "$DHCP_CLIENT" ]; then
+--- Makefile.in.old	2006-08-14 16:54:52.000000000 +0200
++++ Makefile.in	2006-08-14 16:55:05.000000000 +0200
+@@ -211,7 +211,7 @@
+ pcdata_DATA = netswitch.pc
+ pcdatadir = $(libdir)/pkgconfig
+ man_MANS = netswitch.1
+-EXTRA_DIST = netswitch.png netswitch-16x16.png netswitch.1 etc/switch etc/switch.conf init.d
++EXTRA_DIST = netswitch.png netswitch-16x16.png netswitch.1 etc/switch etc/switch.conf 
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
+@@ -728,13 +728,11 @@
+ 	$(INSTALL_DATA) -D netswitch-16x16.png $(DESTDIR)$(datadir)/icons/hicolor/24x24/apps/netswitch.png
+ 	$(INSTALL_DATA) -D etc/switch.conf $(DESTDIR)$(sysconfdir)/netswitch/switch.conf
+ 	$(INSTALL_SCRIPT) -D etc/switch $(DESTDIR)$(bindir)/netswitch
+-	$(INSTALL_SCRIPT) -D init.d $(DESTDIR)$(sysconfdir)/init.d/netswitch
+ 
+ uninstall-local:
+ 	@$(NORMAL_UNINSTALL)
+ 	rm -f $(DESTDIR)$(datadir)/pixmaps/netswitch.png
+ 	rm -f $(DESTDIR)$(bindir)/netswitch
+-	rm -f $(DESTDIR)$(sysconfdir)/init.d/netswitch
+ 	rm -rf $(DESTDIR)$(syscondif)/netswitch
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/net/libswitch/BUILD b/net/libswitch/BUILD
index a23a8e8..27ba77d 100755
--- a/net/libswitch/BUILD
+++ b/net/libswitch/BUILD
@@ -1,2 +1 @@
-./configure --prefix=/usr &&
-make
+true
diff --git a/net/libswitch/DEPENDS b/net/libswitch/DEPENDS
index da0c5a0..b3f9fe1 100755
--- a/net/libswitch/DEPENDS
+++ b/net/libswitch/DEPENDS
@@ -1,2 +1 @@
-depends gamin		&&
-depends libgtop2
+depends libnetswitch
diff --git a/net/libswitch/DETAILS b/net/libswitch/DETAILS
index a8b6dbb..0c4b971 100755
--- a/net/libswitch/DETAILS
+++ b/net/libswitch/DETAILS
@@ -1,14 +1,13 @@
            SPELL=libswitch
          VERSION=0.3.1
-          SOURCE=$SPELL-$VERSION.tar.gz
-   SOURCE_URL[0]=http://netswitch.tuxfamily.org/files/$SOURCE
-     SOURCE_HASH=sha512:d24df8919ea17c2d273d557d1a502e94fb5b3faf97c8b7af20aba41f1f01bf906467542ec492c60d3bb98b86604e1564f3ee9e7f0b2352e876480f38e4fa01cc
+#          SOURCE=$SPELL-$VERSION.tar.gz
+#   SOURCE_URL[0]=http://netswitch.tuxfamily.org/files/$SOURCE
+#     SOURCE_HASH=sha512:d24df8919ea17c2d273d557d1a502e94fb5b3faf97c8b7af20aba41f1f01bf906467542ec492c60d3bb98b86604e1564f3ee9e7f0b2352e876480f38e4fa01cc
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
         WEB_SITE=http://netswitch.tuxfamily.org/
          ENTERED=20060117
-         UPDATED=20060117
       LICENSE[0]=GPL
-       BUILD_API=2
+      PATCHLEVEL=1
         KEYWORDS="net"
            SHORT="Distribution independant tools to manage various network profiles"
 cat << EOF
diff --git a/net/libswitch/HISTORY b/net/libswitch/HISTORY
index 8471d05..659e2ec 100644
--- a/net/libswitch/HISTORY
+++ b/net/libswitch/HISTORY
@@ -1,3 +1,6 @@
+2006-08-14 Flavien Bridault <vlaaad at sourcemage.org>
+	* Deprecation because the software name has changed into libnetswitch
+
 2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
 	* DETAILS: (automated) Add KEYWORDS
 
diff --git a/net/libswitch/INSTALL b/net/libswitch/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/net/libswitch/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/net/libswitch/PRE_BUILD b/net/libswitch/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/net/libswitch/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/net/libswitch/TRIGGERS b/net/libswitch/TRIGGERS
new file mode 100755
index 0000000..2e6c066
--- /dev/null
+++ b/net/libswitch/TRIGGERS
@@ -0,0 +1 @@
+on_cast libswitch dispel_self



More information about the SM-Commit mailing list