Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbiltesting.git;a=commitdiff;h=20b6983d3ab0686efb8daef39de8a105a871b6f1
commit 20b6983d3ab0686efb8daef39de8a105a871b6f1 Author: bouleetbil <[email protected]> Date: Sun Oct 25 23:50:06 2009 +0100 networkmanager-0.7.1.997-1-i686 *version bump *no needed patch for add Frugalware *pacth of alextreme is in upstream diff --git a/source/network-extra/networkmanager/FrugalBuild b/source/network-extra/networkmanager/FrugalBuild index e936a6d..81f70b5 100644 --- a/source/network-extra/networkmanager/FrugalBuild +++ b/source/network-extra/networkmanager/FrugalBuild @@ -3,35 +3,38 @@ pkgname=networkmanager _F_gnome_name=NetworkManager -pkgver=0.6.6 -pkgrel=3 +pkgver=0.7.1.997 +pkgrel=1 pkgdesc="Network Management daemon" -depends=('wireless_tools' 'hal' 'iproute2' 'dhcdbd' \ - 'libnl' 'ppp' 'wpa_supplicant' 'iptables') -makedepends=('perl-xml-parser' 'intltool' \ - 'gconf' 'gtk+2' 'libglade' 'gnome-keyring' 'libgnomeui') +depends=('wireless_tools' 'hal' 'iproute2' 'dhcpcd' 'nss' \ + 'libnl' 'ppp' 'wpa_supplicant' 'iptables' 'policykit') +makedepends=('perl-xml-parser' 'intltool') groups=('network-extra') archs=('i686') +_F_gnome_devel="y" Finclude gnome backup=('etc/NetworkManager/nm-system-settings.conf') -source=(http://people.redhat.com/dcbw/$_F_gnome_name/$pkgver/$_F_gnome_name-$pkgver.tar.gz \ - nm-system-settings.conf networkmanager-resolvconf-perms.patch \ - Frugalware.diff dbus-acces.diff) -sha1sums=('c5d0bcf7d262e1b600df6dad9f6f4baada293634' \ +source=($source \ + nm-system-settings.conf README.Frugalware \ + dbus-acces.diff rc.networkmanager) +sha1sums=('ae72fc0482a1d4175d4c026fff5d58676a11073d' \ '49ba558d20f5ca5a201e027e13b878dd5ac3569c' \ - 'a81be4e9c9bac854e092b82529c4ae2c12cdf91c' \ - '873a665fd954b951b5f19983d1385030fab63951' \ - 'de85f4b83115170e6554c469ca421fb31f75acee') + '493e33f57fe82525309a728f7df46c5e4346abca' \ + 'de85f4b83115170e6554c469ca421fb31f75acee' \ + '955eed2eb78903fb06b33a1bc85f444c8085757d') _F_cd_path=$_F_gnome_name-$pkgver build() { Fpatchall Fautoreconf - Fmake --with-distro=frugalware + Fmake --with-distro=frugalware --with-crypto=nss --with-dhcp-client=dhcpcd Fmakeinstall + Fmkdir etc/NetworkManager/system-connections Fmkdir var/run/NetworkManager + Fmkdir etc/NetworkManager/dispatcher.d Fmkdir etc/NetworkManager Fcp nm-system-settings.conf etc/NetworkManager/nm-system-settings.conf + Frcd2 networkmanager } # optimization OK diff --git a/source/network-extra/networkmanager/Frugalware.diff b/source/network-extra/networkmanager/Frugalware.diff deleted file mode 100644 index 0a6e8ce..0000000 --- a/source/network-extra/networkmanager/Frugalware.diff +++ /dev/null @@ -1,1359 +0,0 @@ -diff -urN NetworkManager-0.6.5/configure.in NetworkManager-Frugalware/configure.in ---- NetworkManager-0.6.5/configure.in 2007-04-18 20:13:10.000000000 +0200 -+++ NetworkManager-Frugalware/configure.in 2009-10-23 23:30:53.000000000 +0200 -@@ -55,7 +55,7 @@ - dnl - AC_C_BIGENDIAN - --AC_ARG_WITH(distro, AC_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, arch or slackware])) -+AC_ARG_WITH(distro, AC_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, arch slackware or frugalware])) - if test "z$with_distro" = "z"; then - AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat") - AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse") -@@ -64,6 +64,7 @@ - AC_CHECK_FILE(/etc/debian_version,with_distro="debian") - AC_CHECK_FILE(/etc/arch-release,with_distro="arch") - AC_CHECK_FILE(/etc/slackware-version,with_distro="slackware") -+ AC_CHECK_FILE(/etc/frugalware-release,with_distro="frugalware") - fi - with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]' ` - -@@ -72,7 +73,7 @@ - exit 1 - else - case $with_distro in -- redhat|suse|gentoo|debian|slackware|arch) ;; -+ redhat|suse|gentoo|debian|slackware|arch|frugalware) ;; - *) - echo "Your distribution (${with_distro}) is not yet supported! (patches welcome)" - exit 1 -@@ -84,6 +85,7 @@ - AM_CONDITIONAL(TARGET_GENTOO, test x"$with_distro" = xgentoo) - AM_CONDITIONAL(TARGET_DEBIAN, test x"$with_distro" = xdebian) - AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware) -+AM_CONDITIONAL(TARGET_FRUGALWARE, test x"$with_distro" = xfrugalware) - AM_CONDITIONAL(TARGET_ARCH, test x"$with_distro" = xarch) - - AC_MSG_CHECKING([for wireless-tools >= 28pre9]) -@@ -340,6 +342,9 @@ - initscript/Arch/Makefile - initscript/Arch/networkmanager - initscript/Arch/networkmanager-dispatcher -+initscript/Frugalware/Makefile -+initscript/Frugalware/rc.networkmanager -+initscript/Frugalware/rc.networkmanager-dispatcher - man/Makefile - man/NetworkManager.1 - man/NetworkManagerDispatcher.1 -diff -urN NetworkManager-0.6.5/initscript/Frugalware/Makefile.am NetworkManager-Frugalware/initscript/Frugalware/Makefile.am ---- NetworkManager-0.6.5/initscript/Frugalware/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ NetworkManager-Frugalware/initscript/Frugalware/Makefile.am 2009-10-23 23:18:43.000000000 +0200 -@@ -0,0 +1,4 @@ -+EXTRA_DIST = rc.networkmanager rc.networkmanager-dispatcher -+ -+initddir = $(sysconfdir)/rc.d -+initd_SCRIPTS = rc.networkmanager rc.networkmanager-dispatcher -diff -urN NetworkManager-0.6.5/initscript/Frugalware/Makefile.in NetworkManager-Frugalware/initscript/Frugalware/Makefile.in ---- NetworkManager-0.6.5/initscript/Frugalware/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ NetworkManager-Frugalware/initscript/Frugalware/Makefile.in 2009-10-23 23:17:54.000000000 +0200 -@@ -0,0 +1,417 @@ -+# Makefile.in generated by automake 1.7.9 from Makefile.am. -+# @configure_input@ -+ -+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# Free Software Foundation, Inc. -+# This Makefile.in is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -+# PARTICULAR PURPOSE. -+ -...@set_make@ -+ -+srcdir = @srcdir@ -+top_srcdir = @top_srcdir@ -+VPATH = @srcdir@ -+pkgdatadir = $(datadir)/@PACKAGE@ -+pkglibdir = $(libdir)/@PACKAGE@ -+pkgincludedir = $(includedir)/@PACKAGE@ -+top_builddir = ../.. -+ -+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -+INSTALL = @INSTALL@ -+install_sh_DATA = $(install_sh) -c -m 644 -+install_sh_PROGRAM = $(install_sh) -c -+install_sh_SCRIPT = $(install_sh) -c -+INSTALL_HEADER = $(INSTALL_DATA) -+transform = $(program_transform_name) -+NORMAL_INSTALL = : -+PRE_INSTALL = : -+POST_INSTALL = : -+NORMAL_UNINSTALL = : -+PRE_UNINSTALL = : -+POST_UNINSTALL = : -+host_triplet = @host@ -+ACLOCAL = @ACLOCAL@ -+ALL_LINGUAS = @ALL_LINGUAS@ -+AMDEP_FALSE = @AMDEP_FALSE@ -+AMDEP_TRUE = @AMDEP_TRUE@ -+AMTAR = @AMTAR@ -+AR = @AR@ -+AUTOCONF = @AUTOCONF@ -+AUTOHEADER = @AUTOHEADER@ -+AUTOMAKE = @AUTOMAKE@ -+AWK = @AWK@ -+CATALOGS = @CATALOGS@ -+CATOBJEXT = @CATOBJEXT@ -+CC = @CC@ -+CCDEPMODE = @CCDEPMODE@ -+CFLAGS = @CFLAGS@ -+CPP = @CPP@ -+CPPFLAGS = @CPPFLAGS@ -+CXX = @CXX@ -+CXXCPP = @CXXCPP@ -+CXXDEPMODE = @CXXDEPMODE@ -+CXXFLAGS = @CXXFLAGS@ -+CYGPATH_W = @CYGPATH_W@ -+DATADIRNAME = @DATADIRNAME@ -+DBUS_CFLAGS = @DBUS_CFLAGS@ -+DBUS_LIBS = @DBUS_LIBS@ -+DBUS_SYS_DIR = @DBUS_SYS_DIR@ -+DEFS = @DEFS@ -+DEPDIR = @DEPDIR@ -+DHCDBD_BINARY_PATH = @DHCDBD_BINARY_PATH@ -+ECHO = @ECHO@ -+ECHO_C = @ECHO_C@ -+ECHO_N = @ECHO_N@ -+ECHO_T = @ECHO_T@ -+EGREP = @EGREP@ -+EXEEXT = @EXEEXT@ -+EXPANDED_BINDIR = @EXPANDED_BINDIR@ -+F77 = @F77@ -+FFLAGS = @FFLAGS@ -+GCONF_CFLAGS = @GCONF_CFLAGS@ -+GCONF_LIBS = @GCONF_LIBS@ -+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -+GLADE_CFLAGS = @GLADE_CFLAGS@ -+GLADE_LIBS = @GLADE_LIBS@ -+GLIB_CFLAGS = @GLIB_CFLAGS@ -+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -+GLIB_LIBS = @GLIB_LIBS@ -+GMODULE_CFLAGS = @GMODULE_CFLAGS@ -+GMODULE_LIBS = @GMODULE_LIBS@ -+GMOFILES = @GMOFILES@ -+GMSGFMT = @GMSGFMT@ -+GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -+GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ -+GOBJECT_CFLAGS = @GOBJECT_CFLAGS@ -+GOBJECT_LIBS = @GOBJECT_LIBS@ -+GREP = @GREP@ -+GTHREAD_CFLAGS = @GTHREAD_CFLAGS@ -+GTHREAD_LIBS = @GTHREAD_LIBS@ -+GTK_CFLAGS = @GTK_CFLAGS@ -+GTK_LIBS = @GTK_LIBS@ -+HAL_CFLAGS = @HAL_CFLAGS@ -+HAL_LIBS = @HAL_LIBS@ -+INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+INSTOBJEXT = @INSTOBJEXT@ -+INTLLIBS = @INTLLIBS@ -+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ -+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -+INTLTOOL_ICONV = @INTLTOOL_ICONV@ -+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ -+INTLTOOL_MERGE = @INTLTOOL_MERGE@ -+INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@ -+INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@ -+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ -+INTLTOOL_PERL = @INTLTOOL_PERL@ -+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ -+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -+INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@ -+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ -+IP_BINARY_PATH = @IP_BINARY_PATH@ -+IWLIB = @IWLIB@ -+LDFLAGS = @LDFLAGS@ -+LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ -+LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ -+LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ -+LIBGNOMEUI_CFLAGS = @LIBGNOMEUI_CFLAGS@ -+LIBGNOMEUI_LIBS = @LIBGNOMEUI_LIBS@ -+LIBNL_CFLAGS = @LIBNL_CFLAGS@ -+LIBNL_LIBS = @LIBNL_LIBS@ -+LIBOBJS = @LIBOBJS@ -+LIBS = @LIBS@ -+LIBTOOL = @LIBTOOL@ -+LN_S = @LN_S@ -+LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ -+MAKEINFO = @MAKEINFO@ -+MKINSTALLDIRS = @MKINSTALLDIRS@ -+MSGFMT = @MSGFMT@ -+MSGFMT_OPTS = @MSGFMT_OPTS@ -+OBJEXT = @OBJEXT@ -+PACKAGE = @PACKAGE@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+PACKAGE_NAME = @PACKAGE_NAME@ -+PACKAGE_STRING = @PACKAGE_STRING@ -+PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_VERSION = @PACKAGE_VERSION@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ -+PKG_CONFIG = @PKG_CONFIG@ -+POFILES = @POFILES@ -+POSUB = @POSUB@ -+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ -+RANLIB = @RANLIB@ -+SED = @SED@ -+SET_MAKE = @SET_MAKE@ -+SHELL = @SHELL@ -+STRIP = @STRIP@ -+TARGET_ARCH_FALSE = @TARGET_ARCH_FALSE@ -+TARGET_ARCH_TRUE = @TARGET_ARCH_TRUE@ -+TARGET_DEBIAN_FALSE = @TARGET_DEBIAN_FALSE@ -+TARGET_DEBIAN_TRUE = @TARGET_DEBIAN_TRUE@ -+TARGET_GENTOO_FALSE = @TARGET_GENTOO_FALSE@ -+TARGET_GENTOO_TRUE = @TARGET_GENTOO_TRUE@ -+TARGET_REDHAT_FALSE = @TARGET_REDHAT_FALSE@ -+TARGET_REDHAT_TRUE = @TARGET_REDHAT_TRUE@ -+TARGET_SLACKWARE_FALSE = @TARGET_SLACKWARE_FALSE@ -+TARGET_SLACKWARE_TRUE = @TARGET_SLACKWARE_TRUE@ -+TARGET_SUSE_FALSE = @TARGET_SUSE_FALSE@ -+TARGET_SUSE_TRUE = @TARGET_SUSE_TRUE@ -+USE_NLS = @USE_NLS@ -+VERSION = @VERSION@ -+WITH_GCRYPT_FALSE = @WITH_GCRYPT_FALSE@ -+WITH_GCRYPT_TRUE = @WITH_GCRYPT_TRUE@ -+WITH_GNOME_FALSE = @WITH_GNOME_FALSE@ -+WITH_GNOME_TRUE = @WITH_GNOME_TRUE@ -+WPA_SUPPLICANT_BINARY_PATH = @WPA_SUPPLICANT_BINARY_PATH@ -+XGETTEXT = @XGETTEXT@ -+ac_ct_CC = @ac_ct_CC@ -+ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_F77 = @ac_ct_F77@ -+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -+am__include = @am__include@ -+am__leading_dot = @am__leading_dot@ -+am__quote = @am__quote@ -+bindir = @bindir@ -+build = @build@ -+build_alias = @build_alias@ -+build_cpu = @build_cpu@ -+build_os = @build_os@ -+build_vendor = @build_vendor@ -+datadir = @datadir@ -+datarootdir = @datarootdir@ -+docdir = @docdir@ -+dvidir = @dvidir@ -+exec_prefix = @exec_prefix@ -+host = @host@ -+host_alias = @host_alias@ -+host_cpu = @host_cpu@ -+host_os = @host_os@ -+host_vendor = @host_vendor@ -+htmldir = @htmldir@ -+includedir = @includedir@ -+infodir = @infodir@ -+install_sh = @install_sh@ -+libdir = @libdir@ -+libexecdir = @libexecdir@ -+localedir = @localedir@ -+localstatedir = @localstatedir@ -+mandir = @mandir@ -+oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ -+prefix = @prefix@ -+program_transform_name = @program_transform_name@ -+psdir = @psdir@ -+sbindir = @sbindir@ -+sharedstatedir = @sharedstatedir@ -+sysconfdir = @sysconfdir@ -+target_alias = @target_alias@ -+EXTRA_DIST = networkmanager networkmanager-dispatcher -+ -+initddir = $(sysconfdir)/rc.d -+initd_SCRIPTS = networkmanager networkmanager-dispatcher -+subdir = initscript/Arch -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = networkmanager networkmanager-dispatcher -+SCRIPTS = $(initd_SCRIPTS) -+ -+DIST_SOURCES = -+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am \ -+ rc.networkmanager.in \ -+ rc.networkmanager-dispatcher.in -+all: all-am -+ -+.SUFFIXES: -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+ cd $(top_srcdir) && \ -+ $(AUTOMAKE) --gnu initscript/Arch/Makefile -+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -+networkmanager: $(top_builddir)/config.status networkmanager.in -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -+networkmanager-dispatcher: $(top_builddir)/config.status networkmanager-dispatcher.in -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -+initdSCRIPT_INSTALL = $(INSTALL_SCRIPT) -+install-initdSCRIPTS: $(initd_SCRIPTS) -+ @$(NORMAL_INSTALL) -+ $(mkinstalldirs) $(DESTDIR)$(initddir) -+ @list='$(initd_SCRIPTS)'; for p in $$list; do \ -+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -+ if test -f $$d$$p; then \ -+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ -+ echo " $(initdSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(initddir)/$$f"; \ -+ $(initdSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(initddir)/$$f; \ -+ else :; fi; \ -+ done -+ -+uninstall-initdSCRIPTS: -+ @$(NORMAL_UNINSTALL) -+ @list='$(initd_SCRIPTS)'; for p in $$list; do \ -+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ -+ echo " rm -f $(DESTDIR)$(initddir)/$$f"; \ -+ rm -f $(DESTDIR)$(initddir)/$$f; \ -+ done -+ -+mostlyclean-libtool: -+ -rm -f *.lo -+ -+clean-libtool: -+ -rm -rf .libs _libs -+ -+distclean-libtool: -+ -rm -f libtool -+uninstall-info-am: -+tags: TAGS -+TAGS: -+ -+ctags: CTAGS -+CTAGS: -+ -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ -+top_distdir = ../.. -+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) -+ -+distdir: $(DISTFILES) -+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -+ list='$(DISTFILES)'; for file in $$list; do \ -+ case $$file in \ -+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ -+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ -+ esac; \ -+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ -+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ -+ dir="/$$dir"; \ -+ $(mkinstalldirs) "$(distdir)$$dir"; \ -+ else \ -+ dir=''; \ -+ fi; \ -+ if test -d $$d/$$file; then \ -+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ -+ fi; \ -+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ -+ else \ -+ test -f $(distdir)/$$file \ -+ || cp -p $$d/$$file $(distdir)/$$file \ -+ || exit 1; \ -+ fi; \ -+ done -+check-am: all-am -+check: check-am -+all-am: Makefile $(SCRIPTS) -+ -+installdirs: -+ $(mkinstalldirs) $(DESTDIR)$(initddir) -+install: install-am -+install-exec: install-exec-am -+install-data: install-data-am -+uninstall: uninstall-am -+ -+install-am: all-am -+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -+ -+installcheck: installcheck-am -+install-strip: -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+mostlyclean-generic: -+ -+clean-generic: -+ -+distclean-generic: -+ -rm -f $(CONFIG_CLEAN_FILES) -+ -+maintainer-clean-generic: -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+clean: clean-am -+ -+clean-am: clean-generic clean-libtool mostlyclean-am -+ -+distclean: distclean-am -+ -rm -f Makefile -+distclean-am: clean-am distclean-generic distclean-libtool -+ -+dvi: dvi-am -+ -+dvi-am: -+ -+info: info-am -+ -+info-am: -+ -+install-data-am: install-initdSCRIPTS -+ -+install-exec-am: -+ -+install-info: install-info-am -+ -+install-man: -+ -+installcheck-am: -+ -+maintainer-clean: maintainer-clean-am -+ -rm -f Makefile -+maintainer-clean-am: distclean-am maintainer-clean-generic -+ -+mostlyclean: mostlyclean-am -+ -+mostlyclean-am: mostlyclean-generic mostlyclean-libtool -+ -+pdf: pdf-am -+ -+pdf-am: -+ -+ps: ps-am -+ -+ps-am: -+ -+uninstall-am: uninstall-info-am uninstall-initdSCRIPTS -+ -+.PHONY: all all-am check check-am clean clean-generic clean-libtool \ -+ distclean distclean-generic distclean-libtool distdir dvi \ -+ dvi-am info info-am install install-am install-data \ -+ install-data-am install-exec install-exec-am install-info \ -+ install-info-am install-initdSCRIPTS install-man install-strip \ -+ installcheck installcheck-am installdirs maintainer-clean \ -+ maintainer-clean-generic mostlyclean mostlyclean-generic \ -+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ -+ uninstall-info-am uninstall-initdSCRIPTS -+ -+# 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. -+.NOEXPORT: -diff -urN NetworkManager-0.6.5/initscript/Frugalware/rc.networkmanager NetworkManager-Frugalware/initscript/Frugalware/rc.networkmanager ---- NetworkManager-0.6.5/initscript/Frugalware/rc.networkmanager 1970-01-01 01:00:00.000000000 +0100 -+++ NetworkManager-Frugalware/initscript/Frugalware/rc.networkmanager 2009-10-23 15:20:44.000000000 +0200 -@@ -0,0 +1,43 @@ -+#!/bin/bash -+ -+# (c) 2009 bouleetbil <[email protected]> -+# rc.networkmanager for FrugalWare -+# distributed under GPL License -+ -+# chkconfig: 2345 99 02 -+# description: Network Manager. -+ -+source /lib/initscripts/functions -+TEXTDOMAIN=networkmanager -+TEXTDOMAINDIR=/lib/initscripts/messages -+daemon="networkmanager" -+ -+actions=(restart start status stop) -+ -+pid="pidof /usr/sbin/NetworkManager 2> /dev/null" -+ -+ -+ -+rc_start() -+{ -+ start_msg -+ if [ -z "$(eval $pid)" ]; then -+ /usr/sbin/NetworkManager -- 2>/dev/null 1>/dev/null -+ ok $? -+ else -+ ok 999 -+ fi -+} -+ -+rc_stop() -+{ -+ stop_msg -+ if [ ! -z "$(eval $pid)" ] ;then -+ killall /usr/sbin/NetworkManager -+ ok $? -+ else -+ ok 999 -+ fi -+} -+ -+rc_exec $1 -diff -urN NetworkManager-0.6.5/initscript/Frugalware/rc.networkmanager-dispatcher NetworkManager-Frugalware/initscript/Frugalware/rc.networkmanager-dispatcher ---- NetworkManager-0.6.5/initscript/Frugalware/rc.networkmanager-dispatcher 1970-01-01 01:00:00.000000000 +0100 -+++ NetworkManager-Frugalware/initscript/Frugalware/rc.networkmanager-dispatcher 2009-10-23 23:20:25.000000000 +0200 -@@ -0,0 +1,43 @@ -+#!/bin/bash -+ -+# (c) 2009 bouleetbil <[email protected]> -+# rc.networkmanager-dispatcher for FrugalWare -+# distributed under GPL License -+ -+# chkconfig: 2345 99 02 -+# description: Network Manager. -+ -+source /lib/initscripts/functions -+TEXTDOMAIN=networkmanagerdispatcher -+TEXTDOMAINDIR=/lib/initscripts/messages -+daemon="networkmanager" -+ -+actions=(restart start status stop) -+ -+pid="pidof /usr/sbin/NetworkManagerDispatcher 2> /dev/null" -+ -+ -+ -+rc_start() -+{ -+ start_msg -+ if [ -z "$(eval $pid)" ]; then -+ /usr/sbin/NetworkManagerDispatcher -- 2>/dev/null 1>/dev/null -+ ok $? -+ else -+ ok 999 -+ fi -+} -+ -+rc_stop() -+{ -+ stop_msg -+ if [ ! -z "$(eval $pid)" ] ;then -+ killall /usr/sbin/NetworkManagerDispatcher -+ ok $? -+ else -+ ok 999 -+ fi -+} -+ -+rc_exec $1 -diff -urN NetworkManager-0.6.5/initscript/Frugalware/rc.networkmanager-dispatcher.in NetworkManager-Frugalware/initscript/Frugalware/rc.networkmanager-dispatcher.in ---- NetworkManager-0.6.5/initscript/Frugalware/rc.networkmanager-dispatcher.in 1970-01-01 01:00:00.000000000 +0100 -+++ NetworkManager-Frugalware/initscript/Frugalware/rc.networkmanager-dispatcher.in 2009-10-23 23:21:18.000000000 +0200 -@@ -0,0 +1,43 @@ -+#!/bin/bash -+ -+# (c) 2009 bouleetbil <[email protected]> -+# rc.networkmanager-dispatcher for FrugalWare -+# distributed under GPL License -+ -+# chkconfig: 2345 99 02 -+# description: Network Manager. -+ -+source /lib/initscripts/functions -+TEXTDOMAIN=networkmanagerdispatcher -+TEXTDOMAINDIR=/lib/initscripts/messages -+daemon="networkmanager" -+ -+actions=(restart start status stop) -+ -+pid="pidof /usr/sbin/NetworkManagerDispatcher 2> /dev/null" -+ -+ -+ -+rc_start() -+{ -+ start_msg -+ if [ -z "$(eval $pid)" ]; then -+ /usr/sbin/NetworkManagerDispatcher -- 2>/dev/null 1>/dev/null -+ ok $? -+ else -+ ok 999 -+ fi -+} -+ -+rc_stop() -+{ -+ stop_msg -+ if [ ! -z "$(eval $pid)" ] ;then -+ killall /usr/sbin/NetworkManagerDispatcher -+ ok $? -+ else -+ ok 999 -+ fi -+} -+ -+rc_exec $1 -diff -urN NetworkManager-0.6.5/initscript/Frugalware/rc.networkmanager.in NetworkManager-Frugalware/initscript/Frugalware/rc.networkmanager.in ---- NetworkManager-0.6.5/initscript/Frugalware/rc.networkmanager.in 1970-01-01 01:00:00.000000000 +0100 -+++ NetworkManager-Frugalware/initscript/Frugalware/rc.networkmanager.in 2009-10-23 15:21:06.000000000 +0200 -@@ -0,0 +1,43 @@ -+#!/bin/bash -+ -+# (c) 2009 bouleetbil <[email protected]> -+# rc.networkmanager for FrugalWare -+# distributed under GPL License -+ -+# chkconfig: 2345 99 02 -+# description: Network Manager. -+ -+source /lib/initscripts/functions -+TEXTDOMAIN=networkmanager -+TEXTDOMAINDIR=/lib/initscripts/messages -+daemon="networkmanager" -+ -+actions=(restart start status stop) -+ -+pid="pidof /usr/sbin/NetworkManager 2> /dev/null" -+ -+ -+ -+rc_start() -+{ -+ start_msg -+ if [ -z "$(eval $pid)" ]; then -+ /usr/sbin/NetworkManager -- 2>/dev/null 1>/dev/null -+ ok $? -+ else -+ ok 999 -+ fi -+} -+ -+rc_stop() -+{ -+ stop_msg -+ if [ ! -z "$(eval $pid)" ] ;then -+ killall /usr/sbin/NetworkManager -+ ok $? -+ else -+ ok 999 -+ fi -+} -+ -+rc_exec $1 - -diff -urN NetworkManager-0.6.5/src/backends/NetworkManagerFrugalware.c NetworkManager-Frugalware/src/backends/NetworkManagerFrugalware.c ---- NetworkManager-0.6.5/src/backends/NetworkManagerFrugalware.c 1970-01-01 01:00:00.000000000 +0100 -+++ NetworkManager-Frugalware/src/backends/NetworkManagerFrugalware.c 2009-10-23 16:57:36.000000000 +0200 -@@ -0,0 +1,615 @@ -+/* NetworkManager -- Network link manager -+ * -+ * Backend implementation for the Frugalware Linux distribution http://www.frugalware.org -+ * -+ * Heavily based on NetworkManagerArch.c by Krill <[email protected]> and Will Rea <[email protected]> -+ * -+ * Heavily based on NetworkManagerDebian.c by Matthew Garrett <[email protected]> -+ * -+ * Heavily based on NetworkManagerRedhat.c by Dan Williams <[email protected]> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ * -+ * (C) Copyright 2004 Tom Parker -+ * (C) Copyright 2004 Matthew Garrett -+ * (C) Copyright 2004 Red Hat, Inc. -+ */ -+ -+#ifdef HAVE_CONFIG_H -+#include <config.h> -+#endif -+ -+#include <stdio.h> -+#include <sys/types.h> -+#include <sys/socket.h> -+#include <signal.h> -+#include <arpa/inet.h> -+#include <glib/gprintf.h> -+#include <glib/gfileutils.h> -+#include "NetworkManagerSystem.h" -+#include "NetworkManagerUtils.h" -+#include "nm-device.h" -+#include "nm-device-802-3-ethernet.h" -+#include "nm-device-802-11-wireless.h" -+#include "NetworkManagerDialup.h" -+#include "interface_parser.h" -+#include "nm-utils.h" -+ -+#define ARPING "/usr/sbin/arping" -+ -+/* -+ * nm_system_init -+ * -+ * Initializes the distribution-specific system backend -+ * -+ */ -+void nm_system_init (void) -+{ -+} -+ -+/* -+ * nm_system_device_add_default_route_via_device -+ * -+ * Add default route to the given device -+ * -+ */ -+void nm_system_device_add_default_route_via_device (NMDevice *dev) -+{ -+ g_return_if_fail (dev != NULL); -+ -+ /* Not really applicable for test devices */ -+ if (nm_device_is_test_device (dev)) -+ return; -+ -+ nm_system_device_add_default_route_via_device_with_iface (nm_device_get_iface (dev)); -+} -+ -+ -+/* -+ * nm_system_device_add_default_route_via_device_with_iface -+ * -+ * Add default route to the given device -+ * -+ */ -+void nm_system_device_add_default_route_via_device_with_iface (const char *iface) -+{ -+ char *buf; -+ -+ g_return_if_fail (iface != NULL); -+ -+ /* Add default gateway */ -+ buf = g_strdup_printf (IP_BINARY_PATH " route add default dev %s", iface); -+ nm_spawn_process (buf); -+ g_free (buf); -+} -+ -+/* -+ * nm_system_device_add_route_via_device_with_iface -+ * -+ * Add route to the given device -+ * -+ */ -+void nm_system_device_add_route_via_device_with_iface (const char *iface, const char *route) -+{ -+ char *buf; -+ -+ g_return_if_fail (iface != NULL); -+ -+ /* Add default gateway */ -+ buf = g_strdup_printf (IP_BINARY_PATH " route add %s dev %s", route, iface); -+ nm_spawn_process (buf); -+ g_free (buf); -+} -+ -+ -+/* -+ * nm_system_device_flush_addresses -+ * -+ * Flush all network addresses associated with a network device -+ * -+ */ -+void nm_system_device_flush_routes (NMDevice *dev) -+{ -+ -+ g_return_if_fail (dev != NULL); -+ -+ /* Not really applicable for test devices */ -+ if (nm_device_is_test_device (dev)) -+ return; -+ -+ nm_system_device_flush_routes_with_iface (nm_device_get_iface (dev)); -+} -+ -+/* -+ * nm_system_device_flush_routes_with_iface -+ * -+ * Flush all routes associated with a network device -+ * -+ */ -+void nm_system_device_flush_routes_with_iface (const char *iface) -+{ -+ char *buf; -+ -+ g_return_if_fail (iface != NULL); -+ -+ /* Remove routing table entries */ -+ buf = g_strdup_printf (IP_BINARY_PATH " route flush dev %s", iface); -+ nm_spawn_process (buf); -+ g_free (buf); -+} -+ -+/* -+ * nm_system_device_flush_addresses -+ * -+ * Flush all network addresses associated with a network device -+ * -+ */ -+void nm_system_device_flush_addresses (NMDevice *dev) -+{ -+ g_return_if_fail (dev != NULL); -+ -+ /* Not really applicable for test devices */ -+ if (nm_device_is_test_device (dev)) -+ return; -+ -+ nm_system_device_flush_addresses_with_iface (nm_device_get_iface (dev)); -+} -+ -+ -+/* -+ * nm_system_device_flush_addresses_with_iface -+ * -+ * Flush all network addresses associated with a network device -+ * -+ */ -+void nm_system_device_flush_addresses_with_iface (const char *iface) -+{ -+ char *buf; -+ -+ g_return_if_fail (iface != NULL); -+ -+ /* Remove all IP addresses for a device */ -+ buf = g_strdup_printf (IP_BINARY_PATH " addr flush dev %s", iface); -+ nm_spawn_process (buf); -+ g_free (buf); -+} -+ -+/* -+ * nm_system_device_setup_static_ip4_config -+ * -+ * Set up the device with a particular IPv4 address/netmask/gateway. -+ * -+ * Returns: TRUE on success -+ * FALSE on error -+ * -+ */ -+#if 0 -+gboolean nm_system_device_setup_static_ip4_config (NMDevice *dev) -+{ -+#define IPBITS (sizeof (guint32) * 8) -+ struct in_addr temp_addr; -+ struct in_addr temp_addr2; -+ char *s_tmp; -+ char *s_tmp2; -+ int i; -+ guint32 addr; -+ guint32 netmask; -+ guint32 prefix = IPBITS; /* initialize with # bits in ipv4 address */ -+ guint32 broadcast; -+ char *buf; -+ int err; -+ const char *iface; -+ -+ g_return_val_if_fail (dev != NULL, FALSE); -+ g_return_val_if_fail (!nm_device_config_get_use_dhcp (dev), FALSE); -+ -+ addr = nm_device_config_get_ip4_address (dev); -+ netmask = nm_device_config_get_ip4_netmask (dev); -+ iface = nm_device_get_iface (dev); -+ broadcast = nm_device_config_get_ip4_broadcast (dev); -+ -+ /* get the prefix from the netmask */ -+ for (i = 0; i < IPBITS; i++) -+ { -+ if (!(ntohl (netmask) & ((2 << i) - 1))) -+ prefix--; -+ } -+ -+ /* Calculate the broadcast address if the user didn't specify one */ -+ if (!broadcast) -+ broadcast = ((addr & (int)netmask) | ~(int)netmask); -+ -+ /* -+ * Try and work out if someone else has our IP -+ * using RFC 2131 Duplicate Address Detection -+ */ -+ temp_addr.s_addr = addr; -+ buf = g_strdup_printf ("%s -q -D -c 1 -I %s %s",ARPING, -+ iface, inet_ntoa (temp_addr)); -+ if ((err = nm_spawn_process (buf))) -+ { -+ nm_warning ("Error: Duplicate address '%s' detected for " -+ "device '%s' \n", iface, inet_ntoa (temp_addr)); -+ goto error; -+ } -+ g_free (buf); -+ -+ /* set our IP address */ -+ temp_addr.s_addr = addr; -+ temp_addr2.s_addr = broadcast; -+ s_tmp = g_strdup (inet_ntoa (temp_addr)); -+ s_tmp2 = g_strdup (inet_ntoa (temp_addr2)); -+ buf = g_strdup_printf ("/sbin/ip addr add %s/%d brd %s dev %s label %s", -+ s_tmp, prefix, s_tmp2, iface, iface); -+ g_free (s_tmp); -+ g_free (s_tmp2); -+ if ((err = nm_spawn_process (buf))) -+ { -+ nm_warning ("Error: could not set network configuration for " -+ "device '%s' using command:\n '%s'", -+ iface, buf); -+ goto error; -+ } -+ g_free (buf); -+ -+ /* Alert other computers of our new address */ -+ temp_addr.s_addr = addr; -+ buf = g_strdup_printf ("%s -q -A -c 1 -I %s %s", ARPING,iface, -+ inet_ntoa (temp_addr)); -+ nm_spawn_process (buf); -+ g_free (buf); -+ g_usleep (G_USEC_PER_SEC * 2); -+ buf = g_strdup_printf ("%s -q -U -c 1 -I %s %s", ARPING, iface, -+ inet_ntoa (temp_addr)); -+ nm_spawn_process (buf); -+ g_free (buf); -+ -+ /* set the default route to be this device's gateway */ -+ temp_addr.s_addr = nm_device_config_get_ip4_gateway (dev); -+ buf = g_strdup_printf ("/sbin/ip route replace default via %s dev %s", -+ inet_ntoa (temp_addr), iface); -+ if ((err = nm_spawn_process (buf))) -+ { -+ nm_warning ("Error: could not set default route using " -+ "command:\n '%s'", buf); -+ goto error; -+ } -+ g_free (buf); -+ return(TRUE); -+ -+ error: -+ g_free (buf); -+ nm_system_device_flush_addresses (dev); -+ nm_system_device_flush_routes (dev); -+ return(FALSE); -+} -+#endif -+ -+/* -+ * nm_system_enable_loopback -+ * -+ * Bring up the loopback interface -+ * -+ */ -+void nm_system_enable_loopback (void) -+{ -+ nm_system_device_set_up_down_with_iface ("lo", TRUE); -+} -+ -+ -+/* -+ * nm_system_flush_loopback_routes -+ * -+ * Flush all routes associated with the loopback device, because it -+ * sometimes gets the first route for ZeroConf/Link-Local traffic. -+ * -+ */ -+void nm_system_flush_loopback_routes (void) -+{ -+ nm_system_device_flush_routes_with_iface ("lo"); -+} -+ -+ -+/* -+ * nm_system_delete_default_route -+ * -+ * Remove the old default route in preparation for a new one -+ * -+ */ -+void nm_system_delete_default_route (void) -+{ -+ nm_spawn_process (IP_BINARY_PATH " route del default"); -+} -+ -+ -+/* -+ * nm_system_flush_arp_cache -+ * -+ * Flush all entries in the arp cache. -+ * -+ */ -+void nm_system_flush_arp_cache (void) -+{ -+ nm_spawn_process (IP_BINARY_PATH " neigh flush all"); -+} -+ -+ -+/* -+ * nm_system_kill_all_dhcp_daemons -+ * -+ * Kill all DHCP daemons currently running, done at startup. -+ * -+ */ -+void nm_system_kill_all_dhcp_daemons (void) -+{ -+ nm_spawn_process ("/usr/bin/killall -q dhclient"); -+} -+ -+ -+/* -+ * nm_system_update_dns -+ * -+ * Make glibc/nscd aware of any changes to the resolv.conf file by -+ * restarting nscd. -+ * -+ */ -+void nm_system_update_dns (void) -+{ -+ /* I'm not running nscd */ -+} -+ -+ -+/* -+ * nm_system_restart_mdns_responder -+ * -+ * Restart the multicast DNS responder so that it knows about new -+ * network interfaces and IP addresses. -+ * -+ */ -+void nm_system_restart_mdns_responder (void) -+{ -+ /* Check if the daemon was already running - do not start a new instance */ -+ if (g_file_test("/var/run/avahi-daemon/pid", G_FILE_TEST_EXISTS)) -+ { -+ nm_spawn_process ("service avahi-daemon restart"); -+ } -+} -+ -+ -+/* -+ * nm_system_device_add_ip6_link_address -+ * -+ * Add a default link-local IPv6 address to a device. -+ * -+ */ -+void nm_system_device_add_ip6_link_address (NMDevice *dev) -+{ -+ char *buf; -+ char *addr; -+ struct ether_addr hw_addr; -+ unsigned char eui[8]; -+ -+ nm_device_get_hw_address (dev, &hw_addr); -+ memcpy (eui, &(hw_addr.ether_addr_octet), sizeof (hw_addr.ether_addr_octet)); -+ memmove(eui+5, eui+3, 3); -+ eui[3] = 0xff; -+ eui[4] = 0xfe; -+ eui[0] ^= 2; -+ -+ /* Add the default link-local IPv6 address to a device */ -+ buf = g_strdup_printf (IP_BINARY_PATH " -6 addr add fe80::%x%02x:%x%02x:%x%02x:%x%02x/64 dev %s", -+ eui[0], eui[1], eui[2], eui[3], -+ eui[4], eui[5], -+ eui[6], eui[7], nm_device_get_iface (dev)); -+ nm_spawn_process (buf); -+ g_free (buf); -+} -+ -+/* -+ * set_ip4_config_from_resolv_conf -+ * -+ * Add nameservers and search names from a resolv.conf format file. -+ * -+ */ -+static void set_ip4_config_from_resolv_conf (const char *filename, NMIP4Config *ip4_config) -+{ -+ char * contents = NULL; -+ char ** split_contents = NULL; -+ int i, len; -+ -+ g_return_if_fail (filename != NULL); -+ g_return_if_fail (ip4_config != NULL); -+ -+ if (!g_file_get_contents (filename, &contents, NULL, NULL) || (contents == NULL)) -+ return; -+ -+ if (!(split_contents = g_strsplit (contents, "\n", 0))) -+ goto out; -+ -+ len = g_strv_length (split_contents); -+ for (i = 0; i < len; i++) -+ { -+ char *line = split_contents[i]; -+ -+ /* Ignore comments */ -+ if (!line || (line[0] == ';') || (line[0] == '#')) -+ continue; -+ -+ line = g_strstrip (line); -+ if ((strncmp (line, "search", 6) == 0) && (strlen (line) > 6)) -+ { -+ char *searches = g_strdup (line + 7); -+ char **split_searches = NULL; -+ -+ if (!searches || !strlen (searches)) -+ continue; -+ -+ /* Allow space-separated search domains */ -+ if ((split_searches = g_strsplit (searches, " ", 0))) -+ { -+ int m, srch_len; -+ -+ srch_len = g_strv_length (split_searches); -+ for (m = 0; m < srch_len; m++) -+ { -+ if (split_searches[m]) -+ nm_ip4_config_add_domain (ip4_config, split_searches[m]); -+ } -+ g_strfreev (split_searches); -+ } -+ else -+ { -+ /* Only 1 item, add the whole line */ -+ nm_ip4_config_add_domain (ip4_config, searches); -+ } -+ -+ g_free (searches); -+ } -+ else if ((strncmp (line, "nameserver", 10) == 0) && (strlen (line) > 10)) -+ { -+ guint32 addr = (guint32) (inet_addr (line + 11)); -+ -+ if (addr != (guint32) -1) -+ nm_ip4_config_add_nameserver (ip4_config, addr); -+ } -+ } -+ -+ g_strfreev (split_contents); -+ -+ out: -+ g_free (contents); -+} -+ -+/* -+ * nm_system_device_get_system_config -+ * -+ * Retrieve any relevant configuration info for a particular device -+ * from the system network configuration information. Clear out existing -+ * info before setting stuff too. -+ * -+ */ -+void *nm_system_device_get_system_config (NMDevice *dev, NMData *app_data) -+{ -+ return NULL; -+} -+ -+/* -+ * nm_system_device_free_system_config -+ */ -+void nm_system_device_free_system_config (NMDevice *dev, void *system_config_data) -+{ -+} -+ -+ -+gboolean nm_system_device_get_use_dhcp (NMDevice *dev) -+{ -+ return TRUE; -+} -+/* -+ * nm_system_device_get_disabled -+ * -+ * Return whether the distro-specific system config tells us to use -+ * dhcp for this device. -+ * -+ */ -+gboolean nm_system_device_get_disabled (NMDevice *dev) -+{ -+ return FALSE; -+} -+ -+ -+NMIP4Config *nm_system_device_new_ip4_system_config (NMDevice *dev) -+{ -+ return NULL; -+} -+ -+void nm_system_deactivate_all_dialup (GSList *list) -+{ -+ -+} -+ -+gboolean nm_system_deactivate_dialup (GSList *list, const char *dialup) -+{ -+ return FALSE; -+} -+ -+gboolean nm_system_activate_dialup (GSList *list, const char *dialup) -+{ -+ return FALSE; -+} -+ -+/* -+ * nm_system_get_dialup_config -+ * -+ * Enumerate dial up options on this system, allocate NMDialUpConfig's, -+ * fill them out, and return. -+ * -+ */ -+GSList * nm_system_get_dialup_config (void) -+{ -+ return NULL; -+} -+ -+/* -+ * nm_system_activate_nis -+ * -+ * set up the nis domain and write a yp.conf -+ * -+ */ -+void nm_system_activate_nis (NMIP4Config *config) -+{ -+} -+ -+/* -+ * nm_system_should_modify_resolv_conf -+ * -+ * Can NM update resolv.conf, or is it locked down? -+ */ -+gboolean nm_system_should_modify_resolv_conf (void) -+{ -+ return TRUE; -+} -+ -+/* -+ * nm_system_shutdown_nis -+ * -+ * shutdown ypbind -+ * -+ */ -+void nm_system_shutdown_nis (void) -+{ -+} -+ -+/* -+ * nm_system_set_hostname -+ * -+ * set the hostname -+ * -+ */ -+void nm_system_set_hostname (NMIP4Config *config) -+{ -+} -+ -+ -+/* -+ * nm_system_get_mtu -+ * -+ * Return a user-provided or system-mandated MTU for this device or zero if -+ * no such MTU is provided. -+ */ -+guint32 nm_system_get_mtu (NMDevice *dev) -+{ -+ return 0; -+} ---- src/initscript/Makefile.am~ 2008-03-06 21:22:35.000000000 +0100 -+++ src/initscript/Makefile.am 2009-10-24 21:20:19.000000000 +0200 -@@ -17,3 +17,6 @@ - if TARGET_ARCH - SUBDIRS += Arch - endif -+if TARGET_FRUGALWARE -+SUBDIRS += Frugalware -+endif ---- src/src/backends/Makefile.in~ 2008-03-06 21:54:11.000000000 +0100 -+++ src/src/backends/Makefile.in 2009-10-24 22:18:23.000000000 +0200 -@@ -50,6 +50,7 @@ - - @target_slackware_t...@am__append_5 = NetworkManagerSlackware.c - @target_arch_t...@am__append_6 = NetworkManagerArch.c -...@target_frugalware_true@am__append_7 = NetworkManagerFrugalware.c - subdir = src/backends - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -66,7 +67,7 @@ - am__libnmbackend_la_SOURCES_DIST = NetworkManagerRedHat.c shvar.c \ - shvar.h NetworkManagerSuSE.c NetworkManagerGentoo.c \ - NetworkManagerDebian.c interface_parser.c interface_parser.h \ -- NetworkManagerSlackware.c NetworkManagerArch.c -+ NetworkManagerSlackware.c NetworkManagerArch.c NetworkManagerFrugalware.c - @target_redhat_t...@am__objects_1 = \ - @TARGET_REDHAT_TRUE@ libnmbackend_la-NetworkManagerRedHat.lo \ - @TARGET_REDHAT_TRUE@ libnmbackend_la-shvar.lo -@@ -82,6 +83,8 @@ - @target_slackware_t...@am__objects_5 = libnmbackend_la-NetworkManagerSlackware.lo - @target_arch_t...@am__objects_6 = \ - @TARGET_ARCH_TRUE@ libnmbackend_la-NetworkManagerArch.lo -...@target_frugalware_true@am__objects_7 = \ -...@target_frugalware_true@ libnmbackend_la-NetworkManagerFrugalware.lo - am_libnmbackend_la_OBJECTS = $(am__objects_1) $(am__objects_2) \ - $(am__objects_3) $(am__objects_4) $(am__objects_5) \ - $(am__objects_6) -@@ -364,7 +367,8 @@ - distclean-compile: - -rm -f *.tab.c - -...@amdep_true@@am__include@ @am__qu...@./$(DEPDIR)/libnmbackend_la-networkmanagerarch....@am__quote@ -...@amdep_true@@am__include@ @am__qu...@./$(DEPDIR)/libnmbackend_la-networkmanagerfrugalware....@am__quote@ -...@amdep_true@@am__include@ @am__qu...@./$(DEPDIR)/libnmbackend_la-networkmanagerfrugalwarearch....@am__quote@ - @AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/libnmbackend_la-networkmanagerdebian....@am__quote@ - @AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/libnmbackend_la-networkmanagergentoo....@am__quote@ - @AMDEP_TRUE@@am__include@ @am__qu...@./$(DEPDIR)/libnmbackend_la-networkmanagerredhat....@am__quote@ -@@ -453,6 +457,14 @@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnmbackend_la-NetworkManagerArch.lo `test -f 'NetworkManagerArch.c' || echo '$(srcdir)/'`NetworkManagerArch.c - -+libnmbackend_la-NetworkManagerFrugalware.lo: NetworkManagerFrugalware.c -...@am__fastdepcc_true@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnmbackend_la-NetworkManagerFrugalware.lo -MD -MP -MF $(DEPDIR)/libnmbackend_la-NetworkManagerFrugalware.Tpo -c -o libnmbackend_la-NetworkManagerFrugalware.lo `test -f 'NetworkManagerFrugalware.c' || echo '$(srcdir)/'`NetworkManagerFrugalware.c -...@am__fastdepcc_true@ mv -f $(DEPDIR)/libnmbackend_la-NetworkManagerFrugalware.Tpo $(DEPDIR)/libnmbackend_la-NetworkManagerFrugalware.Plo -...@amdep_true@@am__fastdepCC_FALSE@ source='NetworkManagerFrugalware.c' object='libnmbackend_la-NetworkManagerFrugalware.lo' libtool=yes @AMDEPBACKSLASH@ -...@amdep_true@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -...@am__fastdepcc_false@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnmbackend_la-NetworkManagerFrugalware.lo `test -f 'NetworkManagerFrugalware.c' || echo '$(srcdir)/'`NetworkManagerFrugalware.c -+ -+ - mostlyclean-libtool: - -rm -f *.lo - ---- src/src/backends/Makefile.am~ 2008-03-06 21:14:39.000000000 +0100 -+++ src/src/backends/Makefile.am 2009-10-24 22:39:57.000000000 +0200 -@@ -42,6 +42,10 @@ - libnmbackend_la_SOURCES += NetworkManagerArch.c - endif - -+if TARGET_FRUGALWARE -+libnmbackend_la_SOURCES += NetworkManagerFrugalware.c -+endif -+ - libnmbackend_la_LIBADD = $(DBUS_LIBS) $(GTHREAD_LIBS) - libnmbackend_la_CPPFLAGS = $(DBUS_CFLAGS) \ - $(GTHREAD_CFLAGS) \ diff --git a/source/network-extra/networkmanager/README.Frugalware b/source/network-extra/networkmanager/README.Frugalware new file mode 100644 index 0000000..8b4cedf --- /dev/null +++ b/source/network-extra/networkmanager/README.Frugalware @@ -0,0 +1,5 @@ +You will need to restart DBUS if this is your first time +installing NetworkManager. +To save system-wide settings as a user, that user needs to have the +right policykit privileges. You can add them by running: +polkit-auth --grant org.freedesktop.network-manager-settings.system.modify --user "USERNAME" diff --git a/source/network-extra/networkmanager/rc.networkmanager b/source/network-extra/networkmanager/rc.networkmanager new file mode 100644 index 0000000..3e0f566 --- /dev/null +++ b/source/network-extra/networkmanager/rc.networkmanager @@ -0,0 +1,43 @@ +#!/bin/bash + +# (c) 2009 bouleetbil <[email protected]> +# rc.networkmanager for FrugalWare +# distributed under GPL License + +# chkconfig: 2345 99 02 +# description: Network Manager. + +source /lib/initscripts/functions +TEXTDOMAIN=networkmanager +TEXTDOMAINDIR=/lib/initscripts/messages +daemon="networkmanager" + +actions=(restart start status stop) + +pid="pidof /usr/sbin/NetworkManager 2> /dev/null" + + +rc_start() +{ + start_msg + if [ -z "$(eval $pid)" ]; then + /usr/sbin/NetworkManager -- 2>/dev/null 1>/dev/null + ok $? + else + ok 999 + fi +} + +rc_stop() +{ + stop_msg + if [ ! -z "$(eval $pid)" ] ;then + killall /usr/sbin/NetworkManager + ok $? + else + ok 999 + fi +} + +rc_exec $1 + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
