Commits

Uelsk8s committed bef9a28

update networkmanager

Comments (0)

Files changed (4)

var/vabs/NetworkManager/src/55NetworkManager

-#!/bin/sh
-# If we are running NetworkManager, tell it we are going to sleep.
-# TODO: Make NetworkManager smarter about how to handle sleep/resume
-#       If we are asleep for less time than it takes for TCP to reset a
-#       connection, and we are assigned the same IP on resume, we should
-#       not break established connections.  Apple can do this, and it is
-#       rather nifty.
-
-. "${PM_FUNCTIONS}"
-
-suspend_nm()
-{
-	# Tell NetworkManager to shut down networking
-        printf "Having NetworkManager put all interaces to sleep..."
-	dbus_send --system                         \
-		--dest=org.freedesktop.NetworkManager  \
-		/org/freedesktop/NetworkManager        \
-		org.freedesktop.NetworkManager.sleep && \
-	    echo Done. || echo Failed.
-}
-
-resume_nm()
-{
-	# Wake up NetworkManager and make it do a new connection
-	printf "Having NetworkManager wake interfaces back up..."
-        dbus_send --system                        \
-		--dest=org.freedesktop.NetworkManager \
-		/org/freedesktop/NetworkManager       \
-		org.freedesktop.NetworkManager.wake && \
-	    echo Done. || echo Failed.
-}
-
-case "$1" in
-	hibernate|suspend)
-		suspend_nm
-		;;
-	thaw|resume)
-		resume_nm
-		;;
-	*) exit $NA
-		;;
-esac

var/vabs/NetworkManager/src/NetworkManager.SlackBuild

 #!/usr/bin/bash
 # This script assumes it will be launched within "/NAME/VERSION/src" dir.
-# With all sources in "src" Your Vector Linux .tlz package, slack-desc,
+# With all sources in "src" Your Vector Linux .txz package, slack-desc,
 # and slack-required will be found in "VERSION" dir. The extraction and
 # build will be in a temp dir created in "NAME" dir, and then removed on exit.
 # Comment out second to last line to keep this dir intact.
 # Linux forum at http://forum.vectorlinux.com and from tidbits collected 
 # from all over the internet. 
 #
-# Generated by sbbuilder-0.4.12.3, written by Rodrigo Bistolfi 
+# Generated by sbbuilder-0.4.14.1, written by Rodrigo Bistolfi 
 # (rbistolfi) and Raimon Grau Cuscó (Kidd) for VectorLinux.
 #
 # Please put your name below if you add some original scripting lines.
 # AUTHORS = 
 
 NAME="NetworkManager"            #Enter package Name!
-VERSION=${VERSION:-"0.8.5.92"}      #Enter package Version!
+VERSION=${VERSION:-"0.9.6.0"}      #Enter package Version!
 VER=$(echo $VERSION|sed 's/-/_/') #this fixes - in version
 VL_PACKAGER=${VL_PACKAGER:-"hata_ph"}   #Enter your Name!
-LINK=${LINK:-"http://ftp.acc.umu.se/pub/GNOME/sources/$NAME/0.8/$NAME-$VERSION.tar.xz"}  
-#Enter URL for package here!
+LINK=${LINK:-"http://ftp.gnome.org/pub/GNOME/sources/$NAME/0.9/$NAME-$VERSION.tar.xz"}  #Enter URL for package here!
 
 
 #SYSTEM VARIABLES
 LDFLAG_OPTIONS=${LDFLAG_OPTIONS:-""}
 ADDRB=${ADDRB:-""} #Add deps that need to be added to the slack-required file here
 EXRB=${EXRB:-""} #Add deps that need to be excluded from the slack-required file here
-MAKEDEPENDS=${MAKEDEPENDS:-"iptables"} # Add compile-time dependencies
+MAKEDEPENDS=${MAKEDEPENDS:-""} #Add deps needed TO BUILD this package here.
 #----------------------------------------------------------------------------
 
+# DO NOT EXECUTE if NORUN is set to 1
+if [ "$NORUN" != "1" ]; then
 
 #SETUP PACKAGING ENVIRONMENT
 #--------------------------------------------
 mkdir -p $RELEASEDIR/tmp
 TMP=$RELEASEDIR/tmp
 PKG=$TMP/package-$NAME
-
 #--------------------------------------------
 
 
   LIBDIRSUFFIX=""
 fi
 
-# On vlocity-7.0 RC1, the ip tables package needs to be re-installed from slapt-get 
-# for this package to work
-if [ "$ARCH" = "x86_64" ]; then
-	slapt-get -i iptables --reinstall --no-prompt || exit 1
-fi
-
 export CFLAGS="$SLKCFLAGS $CFLAG_OPTIONS"
 export CXXFLAGS=$CFLAGS
 export LDFLAGS="$LDFLAGS $LDFLAG_OPTIONS"
 for SRC in $(echo $LINK);do
 if [ ! -f $CWD/$(basename $SRC) ]
 then
-        wget -c $SRC
+        wget --no-check-certificate -c $SRC
 fi
 done
 #--------------------------------------------
 
 
 rm -rf $PKG
-mkdir -p $PKG
 cd $TMP
 rm -rf $NAME-$VERSION
 
 #-----------------------------------------------------
 echo "Extracting source..."
 tar xvf $CWD/$NAME-$VERSION.tar.* || exit 1
+#this moves whatever was extracted to the std dirname we are expecting
+mv * $NAME-$VERSION &> /dev/null 2>&1
+mkdir -p $PKG
 #-----------------------------------------------------
 
 
 cd $TMP/$NAME-$VERSION
 
-# Put any Patches into a patches folder in the src dir
+
+#PATCHES
 #-----------------------------------------------------
-#for i in $CWD/patches/*;do
-#	patch -p1 <$i
-#done
+# Put any Patches here *NOTE this only works if all 
+# your patches use the -p1 strip option!
 #-----------------------------------------------------
-
+for i in $CWD/patches/*;do
+  patch -p1 <$i
+  mkdir -p $PKG/usr/doc/$NAME-$VERSION/patches/
+  cp $i $PKG/usr/doc/$NAME-$VERSION/patches/
+done
+#-----------------------------------------------------
+ 
+ 
 
 #SET PERMISSIONS
 #-----------------------------------------
   --without-resolvconf \
   --with-dhcpcd=/sbin/dhcpcd \
   --with-dhclient=yes \
+  --with-included-gettext \
+  --disable-debug \
   --program-prefix="" \
   --program-suffix="" \
   --build=$CONFIGURE_TRIPLET \
 
 make || exit 1
 
-make install DESTDIR=$PKG || exit
+make install DESTDIR=$PKG || exit 1
 
 
 #######################################################################
 #Miscellenious tweaks and things outside a normal ./configure go here #
 #######################################################################
 
+
 # Don't clobber existing rc.networkmanager
 mv $PKG/etc/rc.d/rc.networkmanager $PKG/etc/rc.d/rc.networkmanager.new
 
 chmod 0755 $PKG/usr/lib${LIBDIRSUFFIX}/pm-utils/sleep.d/55NetworkManager
 
 mkdir -p $PKG/usr/doc/$NAME-$VERSION
-cp -a ANNOUNCE* AUTHORS* BUGS* COPYING* ChangeLog* CHANGELOG* Credits* DEVELOPERS \
-LICENSE* MANIFEST PROVENANCE README* TODO* Exception_to_GPL_for_Qt.txt \
+cp -a AUTHORS COPYING ChangeLog Credits MANIFEST README TODO \
 $PKG/usr/doc/$NAME-$VERSION
 cat $CWD/$NAME.SlackBuild > $PKG/usr/doc/$NAME-$VERSION/$NAME.SlackBuild
 
 #----------------------------------------------------------------------
 
-if [ -d $PKG/usr/share/man ] ; then
+if [ -d $PKG/usr/share/man ];then
 mkdir -p $PKG/usr/man
 mv $PKG/usr/share/man/* $PKG/usr/man
 rm -rf $PKG/usr/share/man
 fi
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
-if [ -d $PKG/usr/share/info ] ; then
+if [ -d $PKG/usr/share/info ];then
 mkdir -p $PKG/usr/info
 mv $PKG/usr/share/info/* $PKG/usr/info
 rm -rf $PKG/usr/share/info
 fi 
-
 find $PKG/usr/info -type f -exec gzip -9 {} \;
+
 mkdir -p $PKG/install
-cp $CWD/doinst.sh $PKG/install/doinst.sh
-if [ -d $PKG/usr/info ] ; then
+if [ -d $PKG/usr/info ];then
 cat >> $PKG/install/doinst.sh << EOF
 CWD=\$(pwd)
 cd usr/info
     rm dir.gz
 fi
 for i in *.info.gz;do
-        install-info \$i dir
+    install-info \$i dir
 done
 cd \$CWD
 EOF
 fi
 
 # Add schemas install to the doinst.sh if schemas are found.
-[ -d $PKG/etc/gconf/schemas ] && {
+if [ -d $PKG/etc/gconf/schemas ];then
 # Make sure we have gconftool installed
 echo "if [ -x usr/bin/gconftool-2 ]; then" >> $PKG/install/doinst.sh
 ( cd $PKG/etc/gconf/schemas
 )
 # Finish off gconf block
 echo "fi" >> $PKG/install/doinst.sh
-}
-
-mkdir -p $PKG/install
-cat >> $PKG/install/doinst.sh << EOF
-# update rarian database
-if [ -x usr/bin/rarian-sk-update ]; then
-  usr/bin/rarian-sk-update 1> /dev/null 2> /dev/null
-fi
-
-# update mime database
-if [ -x usr/bin/update-mime-database ]; then
-  usr/bin/update-mime-database usr/share/mime 1> /dev/null 2> /dev/null
 fi
 
-# update desktop entries
-if [ -x usr/bin/update-desktop-database ]; then
-  usr/bin/update-desktop-database 1> /dev/null 2> /dev/null
-fi
-
-# update hicolor icons
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
-	rm -f usr/share/icons/hicolor/icon-theme.cache
-fi
-usr/bin/gtk-update-icon-cache -f -q usr/share/icons/hicolor 1>/dev/null 2>/dev/null
-
-if [ -x /usr/bin/glib-compile-schemas ]; then
-  /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas/ >/dev/null 2>&1
-fi
-
-# Restart gconfd-2 if running to reload new gconf settings
-if ps acx | grep -q gconfd-2 ; then
-        killall -HUP gconfd-2 ;
-fi
-EOF
 
 #if there is a slack-desc in src dir use it
 if test -f $CWD/slack-desc; then
 DISTRO:    $(cat /etc/vector-version)
 CFLAGS:    $CFLAGS
 LDFLAGS:   $LDFLAGS
-CONFIGURE: $(awk "/\.\/configure\ /" $TMP/$NAME-$VERSION/config.log)
+CONFIGURE: $(awk "/\\$\ \.\/configure\ /" $TMP/$DIRNAME/config.log)
 
 EOF
 
 cd $CWD
 echo "Cleaning up temp files..." && rm -rf $TMP
 echo "Package Complete"
+fi
 #--------------------------------------------------------------
 
 # vim: set tabstop=4 shiftwidth=4 foldmethod=marker : ##

var/vabs/NetworkManager/src/patches/.gitignore

Empty file removed.

var/vabs/NetworkManager/src/slack-desc

-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
-
-              |-----handy-ruler------------------------------------------------------|
-NetworkManager: NetworkManager (Networking that Just Works)
-NetworkManager:
-NetworkManager: NetworkManager attempts to keep an active network connection 
-NetworkManager: available at all times.  The point of NetworkManager is to make 
-NetworkManager: networking configuration and setup as painless and automatic as 
-NetworkManager: possible.  NetworkManager is intended to replace default route, 
-NetworkManager: replace other routes, set IP addresses, and in general configure 
-NetworkManager: networking as NM sees fit (with the possibility of manual override 
-NetworkManager: as necessary).  
-NetworkManager:
-NetworkManager: