diff options
113 files changed, 2064 insertions, 962 deletions
diff --git a/ABOUT-NLS b/ABOUT-NLS new file mode 100644 index 00000000..83bc72ec --- /dev/null +++ b/ABOUT-NLS @@ -0,0 +1,1068 @@ +1 Notes on the Free Translation Project +*************************************** + +Free software is going international! The Free Translation Project is +a way to get maintainers of free software, translators, and users all +together, so that free software will gradually become able to speak many +languages. A few packages already provide translations for their +messages. + + If you found this `ABOUT-NLS' file inside a distribution, you may +assume that the distributed package does use GNU `gettext' internally, +itself available at your nearest GNU archive site. But you do _not_ +need to install GNU `gettext' prior to configuring, installing or using +this package with messages translated. + + Installers will find here some useful hints. These notes also +explain how users should proceed for getting the programs to use the +available translations. They tell how people wanting to contribute and +work on translations can contact the appropriate team. + + When reporting bugs in the `intl/' directory or bugs which may be +related to internationalization, you should tell about the version of +`gettext' which is used. The information can be found in the +`intl/VERSION' file, in internationalized packages. + +1.1 Quick configuration advice +============================== + +If you want to exploit the full power of internationalization, you +should configure it using + + ./configure --with-included-gettext + +to force usage of internationalizing routines provided within this +package, despite the existence of internationalizing capabilities in the +operating system where this package is being installed. So far, only +the `gettext' implementation in the GNU C library version 2 provides as +many features (such as locale alias, message inheritance, automatic +charset conversion or plural form handling) as the implementation here. +It is also not possible to offer this additional functionality on top +of a `catgets' implementation. Future versions of GNU `gettext' will +very likely convey even more functionality. So it might be a good idea +to change to GNU `gettext' as soon as possible. + + So you need _not_ provide this option if you are using GNU libc 2 or +you have installed a recent copy of the GNU gettext package with the +included `libintl'. + +1.2 INSTALL Matters +=================== + +Some packages are "localizable" when properly installed; the programs +they contain can be made to speak your own native language. Most such +packages use GNU `gettext'. Other packages have their own ways to +internationalization, predating GNU `gettext'. + + By default, this package will be installed to allow translation of +messages. It will automatically detect whether the system already +provides the GNU `gettext' functions. If not, the included GNU +`gettext' library will be used. This library is wholly contained +within this package, usually in the `intl/' subdirectory, so prior +installation of the GNU `gettext' package is _not_ required. +Installers may use special options at configuration time for changing +the default behaviour. The commands: + + ./configure --with-included-gettext + ./configure --disable-nls + +will, respectively, bypass any pre-existing `gettext' to use the +internationalizing routines provided within this package, or else, +_totally_ disable translation of messages. + + When you already have GNU `gettext' installed on your system and run +configure without an option for your new package, `configure' will +probably detect the previously built and installed `libintl.a' file and +will decide to use this. This might not be desirable. You should use +the more recent version of the GNU `gettext' library. I.e. if the file +`intl/VERSION' shows that the library which comes with this package is +more recent, you should use + + ./configure --with-included-gettext + +to prevent auto-detection. + + The configuration process will not test for the `catgets' function +and therefore it will not be used. The reason is that even an +emulation of `gettext' on top of `catgets' could not provide all the +extensions of the GNU `gettext' library. + + Internationalized packages usually have many `po/LL.po' files, where +LL gives an ISO 639 two-letter code identifying the language. Unless +translations have been forbidden at `configure' time by using the +`--disable-nls' switch, all available translations are installed +together with the package. However, the environment variable `LINGUAS' +may be set, prior to configuration, to limit the installed set. +`LINGUAS' should then contain a space separated list of two-letter +codes, stating which languages are allowed. + +1.3 Using This Package +====================== + +As a user, if your language has been installed for this package, you +only have to set the `LANG' environment variable to the appropriate +`LL_CC' combination. If you happen to have the `LC_ALL' or some other +`LC_xxx' environment variables set, you should unset them before +setting `LANG', otherwise the setting of `LANG' will not have the +desired effect. Here `LL' is an ISO 639 two-letter language code, and +`CC' is an ISO 3166 two-letter country code. For example, let's +suppose that you speak German and live in Germany. At the shell +prompt, merely execute `setenv LANG de_DE' (in `csh'), +`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash'). +This can be done from your `.login' or `.profile' file, once and for +all. + + You might think that the country code specification is redundant. +But in fact, some languages have dialects in different countries. For +example, `de_AT' is used for Austria, and `pt_BR' for Brazil. The +country code serves to distinguish the dialects. + + The locale naming convention of `LL_CC', with `LL' denoting the +language and `CC' denoting the country, is the one use on systems based +on GNU libc. On other systems, some variations of this scheme are +used, such as `LL' or `LL_CC.ENCODING'. You can get the list of +locales supported by your system for your language by running the +command `locale -a | grep '^LL''. + + Not all programs have translations for all languages. By default, an +English message is shown in place of a nonexistent translation. If you +understand other languages, you can set up a priority list of languages. +This is done through a different environment variable, called +`LANGUAGE'. GNU `gettext' gives preference to `LANGUAGE' over `LANG' +for the purpose of message handling, but you still need to have `LANG' +set to the primary language; this is required by other parts of the +system libraries. For example, some Swedish users who would rather +read translations in German than English for when Swedish is not +available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'. + + Special advice for Norwegian users: The language code for Norwegian +bokma*l changed from `no' to `nb' recently (in 2003). During the +transition period, while some message catalogs for this language are +installed under `nb' and some older ones under `no', it's recommended +for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and +older translations are used. + + In the `LANGUAGE' environment variable, but not in the `LANG' +environment variable, `LL_CC' combinations can be abbreviated as `LL' +to denote the language's main dialect. For example, `de' is equivalent +to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT' +(Portuguese as spoken in Portugal) in this context. + +1.4 Translating Teams +===================== + +For the Free Translation Project to be a success, we need interested +people who like their own language and write it well, and who are also +able to synergize with other translators speaking the same language. +Each translation team has its own mailing list. The up-to-date list of +teams can be found at the Free Translation Project's homepage, +`http://translationproject.org/', in the "Teams" area. + + If you'd like to volunteer to _work_ at translating messages, you +should become a member of the translating team for your own language. +The subscribing address is _not_ the same as the list itself, it has +`-request' appended. For example, speakers of Swedish can send a +message to `sv-request@li.org', having this message body: + + subscribe + + Keep in mind that team members are expected to participate +_actively_ in translations, or at solving translational difficulties, +rather than merely lurking around. If your team does not exist yet and +you want to start one, or if you are unsure about what to do or how to +get started, please write to `coordinator@translationproject.org' to +reach the coordinator for all translator teams. + + The English team is special. It works at improving and uniformizing +the terminology in use. Proven linguistic skills are praised more than +programming skills, here. + +1.5 Available Packages +====================== + +Languages are not equally supported in all packages. The following +matrix shows the current state of internationalization, as of November +2007. The matrix shows, in regard of each package, for which languages +PO files have been submitted to translation coordination, with a +translation percentage of at least 50%. + + Ready PO files af am ar az be bg bs ca cs cy da de el en en_GB eo + +----------------------------------------------------+ + Compendium | [] [] [] [] | + a2ps | [] [] [] [] [] | + aegis | () | + ant-phone | () | + anubis | [] | + ap-utils | | + aspell | [] [] [] [] [] | + bash | [] | + bfd | | + bibshelf | [] | + binutils | | + bison | [] [] | + bison-runtime | [] | + bluez-pin | [] [] [] [] [] | + cflow | [] | + clisp | [] [] [] | + console-tools | [] [] | + coreutils | [] [] [] [] | + cpio | | + cpplib | [] [] [] | + cryptonit | [] | + dialog | | + diffutils | [] [] [] [] [] [] | + doodle | [] | + e2fsprogs | [] [] | + enscript | [] [] [] [] | + fetchmail | [] [] () [] [] | + findutils | [] | + findutils_stable | [] [] [] | + flex | [] [] [] | + fslint | | + gas | | + gawk | [] [] [] | + gcal | [] | + gcc | [] | + gettext-examples | [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] | + gettext-tools | [] [] | + gip | [] | + gliv | [] [] | + glunarclock | [] | + gmult | [] [] | + gnubiff | () | + gnucash | [] [] () () [] | + gnuedu | | + gnulib | [] | + gnunet | | + gnunet-gtk | | + gnutls | [] | + gpe-aerial | [] [] | + gpe-beam | [] [] | + gpe-calendar | | + gpe-clock | [] [] | + gpe-conf | [] [] | + gpe-contacts | | + gpe-edit | [] | + gpe-filemanager | | + gpe-go | [] | + gpe-login | [] [] | + gpe-ownerinfo | [] [] | + gpe-package | | + gpe-sketchbook | [] [] | + gpe-su | [] [] | + gpe-taskmanager | [] [] | + gpe-timesheet | [] | + gpe-today | [] [] | + gpe-todo | | + gphoto2 | [] [] [] [] | + gprof | [] [] | + gpsdrive | | + gramadoir | [] [] | + grep | [] [] | + gretl | () | + gsasl | | + gss | | + gst-plugins-bad | [] [] | + gst-plugins-base | [] [] | + gst-plugins-good | [] [] [] | + gst-plugins-ugly | [] [] | + gstreamer | [] [] [] [] [] [] [] | + gtick | () | + gtkam | [] [] [] [] | + gtkorphan | [] [] | + gtkspell | [] [] [] [] | + gutenprint | [] | + hello | [] [] [] [] [] | + herrie | [] | + hylafax | | + idutils | [] [] | + indent | [] [] [] [] | + iso_15924 | | + iso_3166 | [] [] [] [] [] [] [] [] [] [] [] | + iso_3166_2 | | + iso_4217 | [] [] [] | + iso_639 | [] [] [] [] | + jpilot | [] | + jtag | | + jwhois | | + kbd | [] [] [] [] | + keytouch | [] [] | + keytouch-editor | [] | + keytouch-keyboa... | [] | + latrine | () | + ld | [] | + leafpad | [] [] [] [] [] | + libc | [] [] [] [] | + libexif | [] | + libextractor | [] | + libgpewidget | [] [] [] | + libgpg-error | [] | + libgphoto2 | [] [] | + libgphoto2_port | [] [] | + libgsasl | | + libiconv | [] [] | + libidn | [] [] [] | + lifelines | [] () | + lilypond | [] | + lingoteach | | + lprng | | + lynx | [] [] [] [] | + m4 | [] [] [] [] | + mailfromd | | + mailutils | [] | + make | [] [] | + man-db | [] [] [] | + minicom | [] [] [] | + nano | [] [] [] | + opcodes | [] | + parted | [] [] | + pilot-qof | | + popt | [] [] [] | + psmisc | [] | + pwdutils | | + qof | | + radius | [] | + recode | [] [] [] [] [] [] | + rpm | [] | + screem | | + scrollkeeper | [] [] [] [] [] [] [] [] | + sed | [] [] [] | + shared-mime-info | [] [] [] [] () [] [] [] | + sharutils | [] [] [] [] [] [] | + shishi | | + skencil | [] () | + solfege | | + soundtracker | [] [] | + sp | [] | + system-tools-ba... | [] [] [] [] [] [] [] [] [] | + tar | [] [] | + texinfo | [] [] [] | + tin | () () | + tuxpaint | [] [] [] [] [] [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux | [] [] [] [] | + util-linux-ng | [] [] [] [] | + vorbis-tools | [] | + wastesedge | () | + wdiff | [] [] [] [] | + wget | [] [] [] | + xchat | [] [] [] [] [] [] [] | + xkeyboard-config | [] | + xpad | [] [] [] | + +----------------------------------------------------+ + af am ar az be bg bs ca cs cy da de el en en_GB eo + 6 0 2 1 8 26 2 40 48 2 56 88 15 1 15 18 + + es et eu fa fi fr ga gl gu he hi hr hu id is it + +--------------------------------------------------+ + Compendium | [] [] [] [] [] | + a2ps | [] [] [] () | + aegis | | + ant-phone | [] | + anubis | [] | + ap-utils | [] [] | + aspell | [] [] [] | + bash | [] | + bfd | [] [] | + bibshelf | [] [] [] | + binutils | [] [] [] | + bison | [] [] [] [] [] [] | + bison-runtime | [] [] [] [] [] | + bluez-pin | [] [] [] [] [] | + cflow | [] | + clisp | [] [] | + console-tools | | + coreutils | [] [] [] [] [] [] | + cpio | [] [] [] | + cpplib | [] [] | + cryptonit | [] | + dialog | [] [] [] | + diffutils | [] [] [] [] [] [] [] [] [] | + doodle | [] [] | + e2fsprogs | [] [] [] | + enscript | [] [] [] | + fetchmail | [] | + findutils | [] [] [] | + findutils_stable | [] [] [] [] | + flex | [] [] [] | + fslint | | + gas | [] [] | + gawk | [] [] [] [] () | + gcal | [] [] | + gcc | [] | + gettext-examples | [] [] [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] [] | + gettext-tools | [] [] [] [] | + gip | [] [] [] [] | + gliv | () | + glunarclock | [] [] [] | + gmult | [] [] [] | + gnubiff | () () | + gnucash | () () () | + gnuedu | [] | + gnulib | [] [] [] | + gnunet | | + gnunet-gtk | | + gnutls | | + gpe-aerial | [] [] | + gpe-beam | [] [] | + gpe-calendar | | + gpe-clock | [] [] [] [] | + gpe-conf | [] | + gpe-contacts | [] [] | + gpe-edit | [] [] [] [] | + gpe-filemanager | [] | + gpe-go | [] [] [] | + gpe-login | [] [] [] | + gpe-ownerinfo | [] [] [] [] [] | + gpe-package | [] | + gpe-sketchbook | [] [] | + gpe-su | [] [] [] [] | + gpe-taskmanager | [] [] [] | + gpe-timesheet | [] [] [] [] | + gpe-today | [] [] [] [] | + gpe-todo | [] | + gphoto2 | [] [] [] [] [] | + gprof | [] [] [] [] [] | + gpsdrive | [] | + gramadoir | [] [] | + grep | [] [] [] | + gretl | [] [] [] () | + gsasl | [] [] | + gss | [] [] | + gst-plugins-bad | [] [] [] [] | + gst-plugins-base | [] [] [] [] | + gst-plugins-good | [] [] [] [] [] | + gst-plugins-ugly | [] [] [] [] | + gstreamer | [] [] [] | + gtick | [] [] [] | + gtkam | [] [] [] [] | + gtkorphan | [] [] | + gtkspell | [] [] [] [] [] [] [] | + gutenprint | [] | + hello | [] [] [] [] [] [] [] [] [] [] [] [] [] | + herrie | [] | + hylafax | | + idutils | [] [] [] [] [] | + indent | [] [] [] [] [] [] [] [] [] [] | + iso_15924 | [] | + iso_3166 | [] [] [] [] [] [] [] [] [] [] [] [] [] | + iso_3166_2 | [] | + iso_4217 | [] [] [] [] [] [] | + iso_639 | [] [] [] [] [] [] | + jpilot | [] [] | + jtag | [] | + jwhois | [] [] [] [] [] | + kbd | [] [] | + keytouch | [] [] [] | + keytouch-editor | [] | + keytouch-keyboa... | [] [] | + latrine | [] [] | + ld | [] [] [] [] | + leafpad | [] [] [] [] [] [] | + libc | [] [] [] [] [] | + libexif | [] | + libextractor | [] | + libgpewidget | [] [] [] [] [] | + libgpg-error | [] | + libgphoto2 | [] [] [] | + libgphoto2_port | [] [] | + libgsasl | [] [] | + libiconv | [] [] [] | + libidn | [] [] | + lifelines | () | + lilypond | [] [] [] | + lingoteach | [] [] [] | + lprng | | + lynx | [] [] [] | + m4 | [] [] [] [] | + mailfromd | | + mailutils | [] [] | + make | [] [] [] [] [] [] [] [] | + man-db | [] | + minicom | [] [] [] [] | + nano | [] [] [] [] [] [] [] | + opcodes | [] [] [] [] | + parted | [] [] [] | + pilot-qof | | + popt | [] [] [] [] | + psmisc | [] [] | + pwdutils | | + qof | [] | + radius | [] [] | + recode | [] [] [] [] [] [] [] [] | + rpm | [] [] | + screem | | + scrollkeeper | [] [] [] | + sed | [] [] [] [] [] | + shared-mime-info | [] [] [] [] [] [] | + sharutils | [] [] [] [] [] [] [] [] | + shishi | [] | + skencil | [] [] | + solfege | [] | + soundtracker | [] [] [] | + sp | [] | + system-tools-ba... | [] [] [] [] [] [] [] [] [] | + tar | [] [] [] [] [] | + texinfo | [] [] [] | + tin | [] () | + tuxpaint | [] [] | + unicode-han-tra... | | + unicode-transla... | [] [] | + util-linux | [] [] [] [] [] [] [] | + util-linux-ng | [] [] [] [] [] [] [] | + vorbis-tools | | + wastesedge | () | + wdiff | [] [] [] [] [] [] [] [] | + wget | [] [] [] [] [] [] [] [] | + xchat | [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] [] | + xpad | [] [] [] | + +--------------------------------------------------+ + es et eu fa fi fr ga gl gu he hi hr hu id is it + 85 22 14 2 48 101 61 12 2 8 2 6 53 29 1 52 + + ja ka ko ku ky lg lt lv mk mn ms mt nb ne nl nn + +--------------------------------------------------+ + Compendium | [] | + a2ps | () [] [] | + aegis | () | + ant-phone | [] | + anubis | [] [] [] | + ap-utils | [] | + aspell | [] [] | + bash | [] | + bfd | | + bibshelf | [] | + binutils | | + bison | [] [] [] | + bison-runtime | [] [] [] | + bluez-pin | [] [] [] | + cflow | | + clisp | [] | + console-tools | | + coreutils | [] | + cpio | [] | + cpplib | [] | + cryptonit | [] | + dialog | [] [] | + diffutils | [] [] [] | + doodle | | + e2fsprogs | [] | + enscript | [] | + fetchmail | [] [] | + findutils | [] | + findutils_stable | [] | + flex | [] [] | + fslint | | + gas | | + gawk | [] [] | + gcal | | + gcc | | + gettext-examples | [] [] [] | + gettext-runtime | [] [] [] | + gettext-tools | [] [] | + gip | [] [] | + gliv | [] | + glunarclock | [] [] | + gmult | [] [] [] | + gnubiff | | + gnucash | () () () | + gnuedu | | + gnulib | [] [] | + gnunet | | + gnunet-gtk | | + gnutls | [] | + gpe-aerial | [] | + gpe-beam | [] | + gpe-calendar | [] | + gpe-clock | [] [] [] | + gpe-conf | [] [] [] | + gpe-contacts | [] | + gpe-edit | [] [] [] | + gpe-filemanager | [] [] | + gpe-go | [] [] [] | + gpe-login | [] [] [] | + gpe-ownerinfo | [] [] | + gpe-package | [] [] | + gpe-sketchbook | [] [] | + gpe-su | [] [] [] | + gpe-taskmanager | [] [] [] [] | + gpe-timesheet | [] | + gpe-today | [] [] | + gpe-todo | [] | + gphoto2 | [] [] | + gprof | [] | + gpsdrive | [] | + gramadoir | () | + grep | [] [] | + gretl | | + gsasl | [] | + gss | | + gst-plugins-bad | [] | + gst-plugins-base | [] | + gst-plugins-good | [] | + gst-plugins-ugly | [] | + gstreamer | [] | + gtick | [] | + gtkam | [] [] | + gtkorphan | [] | + gtkspell | [] [] | + gutenprint | [] | + hello | [] [] [] [] [] [] [] | + herrie | [] | + hylafax | | + idutils | [] | + indent | [] [] | + iso_15924 | [] | + iso_3166 | [] [] [] [] [] [] [] [] | + iso_3166_2 | [] | + iso_4217 | [] [] [] | + iso_639 | [] [] [] [] | + jpilot | () () | + jtag | | + jwhois | [] | + kbd | [] | + keytouch | [] | + keytouch-editor | [] | + keytouch-keyboa... | | + latrine | [] | + ld | | + leafpad | [] [] | + libc | [] [] [] | + libexif | | + libextractor | | + libgpewidget | [] | + libgpg-error | | + libgphoto2 | [] | + libgphoto2_port | [] | + libgsasl | [] | + libiconv | [] | + libidn | [] [] | + lifelines | [] | + lilypond | [] | + lingoteach | [] | + lprng | | + lynx | [] [] | + m4 | [] [] | + mailfromd | | + mailutils | | + make | [] [] [] | + man-db | | + minicom | [] | + nano | [] [] [] | + opcodes | [] | + parted | [] [] | + pilot-qof | | + popt | [] [] [] | + psmisc | [] [] [] | + pwdutils | | + qof | | + radius | | + recode | [] | + rpm | [] [] | + screem | [] | + scrollkeeper | [] [] [] [] | + sed | [] [] | + shared-mime-info | [] [] [] [] [] [] [] | + sharutils | [] [] | + shishi | | + skencil | | + solfege | () () | + soundtracker | | + sp | () | + system-tools-ba... | [] [] [] [] | + tar | [] [] [] | + texinfo | [] [] | + tin | | + tuxpaint | () [] [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux | [] [] | + util-linux-ng | [] [] | + vorbis-tools | | + wastesedge | [] | + wdiff | [] [] | + wget | [] [] | + xchat | [] [] [] [] | + xkeyboard-config | [] [] [] | + xpad | [] [] [] | + +--------------------------------------------------+ + ja ka ko ku ky lg lt lv mk mn ms mt nb ne nl nn + 51 2 25 3 2 0 6 0 2 2 20 0 11 1 103 6 + + or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta + +--------------------------------------------------+ + Compendium | [] [] [] [] [] | + a2ps | () [] [] [] [] [] [] | + aegis | () () | + ant-phone | [] [] | + anubis | [] [] [] | + ap-utils | () | + aspell | [] [] [] | + bash | [] [] | + bfd | | + bibshelf | [] | + binutils | [] [] | + bison | [] [] [] [] [] | + bison-runtime | [] [] [] [] [] | + bluez-pin | [] [] [] [] [] [] [] [] [] | + cflow | [] | + clisp | [] | + console-tools | [] | + coreutils | [] [] [] [] | + cpio | [] [] [] | + cpplib | [] | + cryptonit | [] [] | + dialog | [] | + diffutils | [] [] [] [] [] [] | + doodle | [] [] | + e2fsprogs | [] [] | + enscript | [] [] [] [] [] | + fetchmail | [] [] [] | + findutils | [] [] [] | + findutils_stable | [] [] [] [] [] [] | + flex | [] [] [] [] [] | + fslint | [] | + gas | | + gawk | [] [] [] [] | + gcal | [] | + gcc | [] [] | + gettext-examples | [] [] [] [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] [] [] [] | + gettext-tools | [] [] [] [] [] [] [] | + gip | [] [] [] [] | + gliv | [] [] [] [] [] [] | + glunarclock | [] [] [] [] [] [] | + gmult | [] [] [] [] | + gnubiff | () [] | + gnucash | () [] | + gnuedu | | + gnulib | [] [] [] | + gnunet | | + gnunet-gtk | [] | + gnutls | [] [] | + gpe-aerial | [] [] [] [] [] [] [] | + gpe-beam | [] [] [] [] [] [] [] | + gpe-calendar | [] [] [] [] | + gpe-clock | [] [] [] [] [] [] [] [] | + gpe-conf | [] [] [] [] [] [] [] | + gpe-contacts | [] [] [] [] [] | + gpe-edit | [] [] [] [] [] [] [] [] [] | + gpe-filemanager | [] [] | + gpe-go | [] [] [] [] [] [] [] [] | + gpe-login | [] [] [] [] [] [] [] [] | + gpe-ownerinfo | [] [] [] [] [] [] [] [] | + gpe-package | [] [] | + gpe-sketchbook | [] [] [] [] [] [] [] [] | + gpe-su | [] [] [] [] [] [] [] [] | + gpe-taskmanager | [] [] [] [] [] [] [] [] | + gpe-timesheet | [] [] [] [] [] [] [] [] | + gpe-today | [] [] [] [] [] [] [] [] | + gpe-todo | [] [] [] [] | + gphoto2 | [] [] [] [] [] [] | + gprof | [] [] [] | + gpsdrive | [] [] | + gramadoir | [] [] | + grep | [] [] [] [] | + gretl | [] [] [] | + gsasl | [] [] [] | + gss | [] [] [] [] | + gst-plugins-bad | [] [] [] | + gst-plugins-base | [] [] | + gst-plugins-good | [] [] | + gst-plugins-ugly | [] [] [] | + gstreamer | [] [] [] [] | + gtick | [] | + gtkam | [] [] [] [] [] | + gtkorphan | [] | + gtkspell | [] [] [] [] [] [] [] [] | + gutenprint | [] | + hello | [] [] [] [] [] [] [] [] | + herrie | [] [] [] | + hylafax | | + idutils | [] [] [] [] [] | + indent | [] [] [] [] [] [] [] | + iso_15924 | | + iso_3166 | [] [] [] [] [] [] [] [] [] [] [] [] [] | + iso_3166_2 | | + iso_4217 | [] [] [] [] [] [] [] | + iso_639 | [] [] [] [] [] [] [] | + jpilot | | + jtag | [] | + jwhois | [] [] [] [] | + kbd | [] [] [] | + keytouch | [] | + keytouch-editor | [] | + keytouch-keyboa... | [] | + latrine | | + ld | [] | + leafpad | [] [] [] [] [] [] | + libc | [] [] [] [] | + libexif | [] [] | + libextractor | [] [] | + libgpewidget | [] [] [] [] [] [] [] [] | + libgpg-error | [] [] [] | + libgphoto2 | [] | + libgphoto2_port | [] [] [] | + libgsasl | [] [] [] [] | + libiconv | [] [] [] | + libidn | [] [] () | + lifelines | [] [] | + lilypond | | + lingoteach | [] | + lprng | [] | + lynx | [] [] [] | + m4 | [] [] [] [] [] | + mailfromd | [] | + mailutils | [] [] [] | + make | [] [] [] [] | + man-db | [] [] [] [] | + minicom | [] [] [] [] [] | + nano | [] [] [] [] | + opcodes | [] [] | + parted | [] | + pilot-qof | | + popt | [] [] [] [] | + psmisc | [] [] | + pwdutils | [] [] | + qof | [] [] | + radius | [] [] | + recode | [] [] [] [] [] [] [] | + rpm | [] [] [] [] | + screem | | + scrollkeeper | [] [] [] [] [] [] [] | + sed | [] [] [] [] [] [] [] [] [] | + shared-mime-info | [] [] [] [] [] [] | + sharutils | [] [] [] [] | + shishi | [] | + skencil | [] [] [] | + solfege | [] | + soundtracker | [] [] | + sp | | + system-tools-ba... | [] [] [] [] [] [] [] [] [] | + tar | [] [] [] [] | + texinfo | [] [] [] [] | + tin | () | + tuxpaint | [] [] [] [] [] [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux | [] [] [] [] | + util-linux-ng | [] [] [] [] | + vorbis-tools | [] | + wastesedge | | + wdiff | [] [] [] [] [] [] [] | + wget | [] [] [] [] | + xchat | [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] | + xpad | [] [] [] | + +--------------------------------------------------+ + or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta + 0 5 77 31 53 4 58 72 3 45 46 9 45 122 3 + + tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu + +---------------------------------------------------+ + Compendium | [] [] [] [] | 19 + a2ps | [] [] [] | 19 + aegis | [] | 1 + ant-phone | [] [] | 6 + anubis | [] [] [] | 11 + ap-utils | () [] | 4 + aspell | [] [] [] | 16 + bash | [] | 6 + bfd | | 2 + bibshelf | [] | 7 + binutils | [] [] [] [] | 9 + bison | [] [] [] [] | 20 + bison-runtime | [] [] [] [] | 18 + bluez-pin | [] [] [] [] [] [] | 28 + cflow | [] [] | 5 + clisp | | 9 + console-tools | [] [] | 5 + coreutils | [] [] [] | 18 + cpio | [] [] [] [] | 11 + cpplib | [] [] [] [] [] | 12 + cryptonit | [] | 6 + dialog | [] [] [] | 9 + diffutils | [] [] [] [] [] | 29 + doodle | [] | 6 + e2fsprogs | [] [] | 10 + enscript | [] [] [] | 16 + fetchmail | [] [] | 12 + findutils | [] [] [] | 11 + findutils_stable | [] [] [] [] | 18 + flex | [] [] | 15 + fslint | [] | 2 + gas | [] | 3 + gawk | [] [] [] | 16 + gcal | [] | 5 + gcc | [] [] [] | 7 + gettext-examples | [] [] [] [] [] [] | 29 + gettext-runtime | [] [] [] [] [] [] | 28 + gettext-tools | [] [] [] [] [] | 20 + gip | [] [] | 13 + gliv | [] [] | 11 + glunarclock | [] [] [] | 15 + gmult | [] [] [] [] | 16 + gnubiff | [] | 2 + gnucash | () [] | 5 + gnuedu | [] | 2 + gnulib | [] | 10 + gnunet | | 0 + gnunet-gtk | [] [] | 3 + gnutls | | 4 + gpe-aerial | [] [] | 14 + gpe-beam | [] [] | 14 + gpe-calendar | [] [] | 7 + gpe-clock | [] [] [] [] | 21 + gpe-conf | [] [] [] | 16 + gpe-contacts | [] [] | 10 + gpe-edit | [] [] [] [] [] | 22 + gpe-filemanager | [] [] | 7 + gpe-go | [] [] [] [] | 19 + gpe-login | [] [] [] [] [] | 21 + gpe-ownerinfo | [] [] [] [] | 21 + gpe-package | [] | 6 + gpe-sketchbook | [] [] | 16 + gpe-su | [] [] [] [] | 21 + gpe-taskmanager | [] [] [] [] | 21 + gpe-timesheet | [] [] [] [] | 18 + gpe-today | [] [] [] [] [] | 21 + gpe-todo | [] [] | 8 + gphoto2 | [] [] [] [] | 21 + gprof | [] [] | 13 + gpsdrive | [] | 5 + gramadoir | [] | 7 + grep | [] | 12 + gretl | | 6 + gsasl | [] [] [] | 9 + gss | [] | 7 + gst-plugins-bad | [] [] [] | 13 + gst-plugins-base | [] [] | 11 + gst-plugins-good | [] [] [] [] [] | 16 + gst-plugins-ugly | [] [] [] | 13 + gstreamer | [] [] [] | 18 + gtick | [] [] | 7 + gtkam | [] | 16 + gtkorphan | [] | 7 + gtkspell | [] [] [] [] [] [] | 27 + gutenprint | | 4 + hello | [] [] [] [] [] | 38 + herrie | [] [] | 8 + hylafax | | 0 + idutils | [] [] | 15 + indent | [] [] [] [] [] | 28 + iso_15924 | [] [] | 4 + iso_3166 | [] [] [] [] [] [] [] [] [] | 54 + iso_3166_2 | [] [] | 4 + iso_4217 | [] [] [] [] [] | 24 + iso_639 | [] [] [] [] [] | 26 + jpilot | [] [] [] [] | 7 + jtag | [] | 3 + jwhois | [] [] [] | 13 + kbd | [] [] [] | 13 + keytouch | [] | 8 + keytouch-editor | [] | 5 + keytouch-keyboa... | [] | 5 + latrine | [] [] | 5 + ld | [] [] [] [] | 10 + leafpad | [] [] [] [] [] | 24 + libc | [] [] [] | 19 + libexif | [] | 5 + libextractor | [] | 5 + libgpewidget | [] [] [] | 20 + libgpg-error | [] | 6 + libgphoto2 | [] [] | 9 + libgphoto2_port | [] [] [] | 11 + libgsasl | [] | 8 + libiconv | [] [] | 11 + libidn | [] [] | 11 + lifelines | | 4 + lilypond | [] | 6 + lingoteach | [] | 6 + lprng | [] | 2 + lynx | [] [] [] | 15 + m4 | [] [] [] | 18 + mailfromd | [] [] | 3 + mailutils | [] [] | 8 + make | [] [] [] | 20 + man-db | [] | 9 + minicom | [] | 14 + nano | [] [] [] | 20 + opcodes | [] [] | 10 + parted | [] [] [] | 11 + pilot-qof | [] | 1 + popt | [] [] [] [] | 18 + psmisc | [] [] | 10 + pwdutils | [] | 3 + qof | [] | 4 + radius | [] [] | 7 + recode | [] [] [] | 25 + rpm | [] [] [] [] | 13 + screem | [] | 2 + scrollkeeper | [] [] [] [] | 26 + sed | [] [] [] [] | 23 + shared-mime-info | [] [] [] | 29 + sharutils | [] [] [] | 23 + shishi | [] | 3 + skencil | [] | 7 + solfege | [] | 3 + soundtracker | [] [] | 9 + sp | [] | 3 + system-tools-ba... | [] [] [] [] [] [] [] | 38 + tar | [] [] [] | 17 + texinfo | [] [] [] | 15 + tin | | 1 + tuxpaint | [] [] [] | 19 + unicode-han-tra... | | 0 + unicode-transla... | | 2 + util-linux | [] [] [] | 20 + util-linux-ng | [] [] [] | 20 + vorbis-tools | [] [] | 4 + wastesedge | | 1 + wdiff | [] [] | 23 + wget | [] [] [] | 20 + xchat | [] [] [] [] | 29 + xkeyboard-config | [] [] [] | 14 + xpad | [] [] [] | 15 + +---------------------------------------------------+ + 76 teams tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu + 163 domains 0 3 1 74 51 0 143 21 1 57 7 45 0 2036 + + Some counters in the preceding matrix are higher than the number of +visible blocks let us expect. This is because a few extra PO files are +used for implementing regional variants of languages, or language +dialects. + + For a PO file in the matrix above to be effective, the package to +which it applies should also have been internationalized and +distributed as such by its maintainer. There might be an observable +lag between the mere existence a PO file and its wide availability in a +distribution. + + If November 2007 seems to be old, you may fetch a more recent copy +of this `ABOUT-NLS' file on most GNU archive sites. The most +up-to-date matrix with full percentage details can be found at +`http://translationproject.org/extra/matrix.html'. + +1.6 Using `gettext' in new packages +=================================== + +If you are writing a freely available program and want to +internationalize it you are welcome to use GNU `gettext' in your +package. Of course you have to respect the GNU Library General Public +License which covers the use of the GNU `gettext' library. This means +in particular that even non-free programs can use `libintl' as a shared +library, whereas only free software can use `libintl' as a static +library or use modified versions of `libintl'. + + Once the sources are changed appropriately and the setup can handle +the use of `gettext' the only thing missing are the translations. The +Free Translation Project is also available for packages which are not +developed inside the GNU project. Therefore the information given above +applies also for every other Free Software Project. Contact +`coordinator@translationproject.org' to make the `.pot' files available +to the translation teams. + diff --git a/Makefile.in b/Makefile.in index 6820d9a2..e64f3df8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -37,16 +37,16 @@ host_triplet = @host@ subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/NetworkManager.pc.in \ - $(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \ - ChangeLog INSTALL NEWS TODO compile config.guess config.sub \ - depcomp install-sh ltmain.sh missing + $(srcdir)/config.h.in $(top_srcdir)/configure ABOUT-NLS \ + AUTHORS COPYING ChangeLog INSTALL NEWS TODO compile \ + config.guess config.sub depcomp install-sh ltmain.sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ diff --git a/aclocal.m4 b/aclocal.m4 index 7791f12a..778d6e6c 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -452,39 +452,6 @@ sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD fi]) -# nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, -dnl Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. -dnl -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. -dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. - -AC_PREREQ([2.50]) - -AC_DEFUN([AM_NLS], -[ - AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE([nls], - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT([$USE_NLS]) - AC_SUBST([USE_NLS]) -]) - # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # serial 1 (pkg-config-0.24) # @@ -1701,3 +1668,4 @@ m4_include([m4/ltoptions.m4]) m4_include([m4/ltsugar.m4]) m4_include([m4/ltversion.m4]) m4_include([m4/lt~obsolete.m4]) +m4_include([m4/nls.m4]) diff --git a/callouts/Makefile.in b/callouts/Makefile.in index 5b8c1151..54912dfb 100644 --- a/callouts/Makefile.in +++ b/callouts/Makefile.in @@ -45,7 +45,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/cli/Makefile.in b/cli/Makefile.in index b2356ac1..06dee842 100644 --- a/cli/Makefile.in +++ b/cli/Makefile.in @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/cli/src/Makefile.in b/cli/src/Makefile.in index bdf4128e..51ec648a 100644 --- a/cli/src/Makefile.in +++ b/cli/src/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/configure b/configure index b62f55e4..c176ff90 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.66 for NetworkManager 0.8.3.998. +# Generated by GNU Autoconf 2.66 for NetworkManager 0.8.3.999. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager>. # @@ -563,8 +563,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='NetworkManager' PACKAGE_TARNAME='NetworkManager' -PACKAGE_VERSION='0.8.3.998' -PACKAGE_STRING='NetworkManager 0.8.3.998' +PACKAGE_VERSION='0.8.3.999' +PACKAGE_STRING='NetworkManager 0.8.3.999' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager' PACKAGE_URL='' @@ -1464,7 +1464,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures NetworkManager 0.8.3.998 to adapt to many kinds of systems. +\`configure' configures NetworkManager 0.8.3.999 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1534,7 +1534,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NetworkManager 0.8.3.998:";; + short | recursive ) echo "Configuration of NetworkManager 0.8.3.999:";; esac cat <<\_ACEOF @@ -1704,7 +1704,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NetworkManager configure 0.8.3.998 +NetworkManager configure 0.8.3.999 generated by GNU Autoconf 2.66 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2127,7 +2127,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by NetworkManager $as_me 0.8.3.998, which was +It was created by NetworkManager $as_me 0.8.3.999, which was generated by GNU Autoconf 2.66. Invocation command line was $ $0 $@ @@ -2942,7 +2942,7 @@ fi # Define the identity of the package. PACKAGE='NetworkManager' - VERSION='0.8.3.998' + VERSION='0.8.3.999' cat >>confdefs.h <<_ACEOF @@ -11844,7 +11844,7 @@ fi NM_MAJOR_VERSION=0 NM_MINOR_VERSION=8 NM_MICRO_VERSION=3 -NM_VERSION=0.8.3.998 +NM_VERSION=0.8.3.999 @@ -16989,7 +16989,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by NetworkManager $as_me 0.8.3.998, which was +This file was extended by NetworkManager $as_me 0.8.3.999, which was generated by GNU Autoconf 2.66. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17055,7 +17055,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -NetworkManager config.status 0.8.3.998 +NetworkManager config.status 0.8.3.999 configured by $0, generated by GNU Autoconf 2.66, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index ebb2aa9e..dbf720cf 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl The NM version number m4_define([nm_major_version], [0]) m4_define([nm_minor_version], [8]) m4_define([nm_micro_version], [3]) -m4_define([nm_nano_version], [998]) +m4_define([nm_nano_version], [999]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version.nm_nano_version]) diff --git a/data/Makefile.in b/data/Makefile.in index c5fb63ab..a98d2388 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -42,7 +42,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/docs/Makefile.in b/docs/Makefile.in index adcc2c43..59da07ac 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/docs/libnm-glib/Makefile.in b/docs/libnm-glib/Makefile.in index 45be8a0f..639a4494 100644 --- a/docs/libnm-glib/Makefile.in +++ b/docs/libnm-glib/Makefile.in @@ -48,7 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/docs/libnm-glib/html/ch01.html b/docs/libnm-glib/html/ch01.html index 3b0b3240..8a1a05e0 100644 --- a/docs/libnm-glib/html/ch01.html +++ b/docs/libnm-glib/html/ch01.html @@ -21,7 +21,7 @@ </tr></table> <div class="chapter" title="libnm-glib Objects"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id2975572"></a>libnm-glib Objects</h2></div></div></div> +<a name="id2910172"></a>libnm-glib Objects</h2></div></div></div> <div class="toc"><dl> <dt> <span class="refentrytitle"><a href="NMClient.html">NMClient</a></span><span class="refpurpose"></span> diff --git a/docs/libnm-glib/libnm-glib-sections.txt b/docs/libnm-glib/libnm-glib-sections.txt index a585d42c..f20c39de 100644 --- a/docs/libnm-glib/libnm-glib-sections.txt +++ b/docs/libnm-glib/libnm-glib-sections.txt @@ -624,6 +624,62 @@ NM_SETTINGS_INTERFACE_GET_INTERFACE </SECTION> <SECTION> +<FILE>nm-device-wimax-bindings</FILE> +DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_NetworkManager_Device_WiMax +org_freedesktop_NetworkManager_Device_WiMax_get_nsp_list +org_freedesktop_NetworkManager_Device_WiMax_get_nsp_list_reply +org_freedesktop_NetworkManager_Device_WiMax_get_nsp_list_async +dbus_g_proxy_begin_call +</SECTION> + +<SECTION> +<FILE>nm-settings-connection-bindings</FILE> +DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_NetworkManager_Settings_Connection +org_freedesktop_NetworkManager_Settings_Connection_update +org_freedesktop_NetworkManager_Settings_Connection_update_reply +org_freedesktop_NetworkManager_Settings_Connection_update_async +dbus_g_proxy_begin_call +org_freedesktop_NetworkManager_Settings_Connection_delete +org_freedesktop_NetworkManager_Settings_Connection_delete_reply +org_freedesktop_NetworkManager_Settings_Connection_delete_async +org_freedesktop_NetworkManager_Settings_Connection_get_settings +org_freedesktop_NetworkManager_Settings_Connection_get_settings_reply +org_freedesktop_NetworkManager_Settings_Connection_get_settings_async +org_freedesktop_NetworkManager_Settings_Connection_get_secrets +org_freedesktop_NetworkManager_Settings_Connection_get_secrets_reply +org_freedesktop_NetworkManager_Settings_Connection_get_secrets_async +</SECTION> + +<SECTION> +<FILE>nm-secret-agent-glue</FILE> +g_marshal_value_peek_boolean +g_marshal_value_peek_char +g_marshal_value_peek_uchar +g_marshal_value_peek_int +g_marshal_value_peek_uint +g_marshal_value_peek_long +g_marshal_value_peek_ulong +g_marshal_value_peek_int64 +g_marshal_value_peek_uint64 +g_marshal_value_peek_enum +g_marshal_value_peek_flags +g_marshal_value_peek_float +g_marshal_value_peek_double +g_marshal_value_peek_string +g_marshal_value_peek_param +g_marshal_value_peek_boxed +g_marshal_value_peek_pointer +g_marshal_value_peek_object +g_marshal_value_peek_variant +dbus_glib_marshal_nm_secret_agent_VOID__BOXED_STRING_POINTER +dbus_glib_marshal_nm_secret_agent_NONE__BOXED_STRING_POINTER +dbus_glib_marshal_nm_secret_agent_VOID__BOXED_BOXED_STRING_BOXED_UINT_POINTER +dbus_glib_marshal_nm_secret_agent_NONE__BOXED_BOXED_STRING_BOXED_UINT_POINTER +dbus_glib_marshal_nm_secret_agent_VOID__BOXED_BOXED_POINTER +dbus_glib_marshal_nm_secret_agent_NONE__BOXED_BOXED_POINTER +</SECTION> + +<SECTION> <FILE>nm-types</FILE> NM_TYPE_SSID nm_ssid_get_type @@ -641,3 +697,8 @@ NM_TYPE_IP6_ROUTE_OBJECT_ARRAY nm_ip6_route_object_array_get_type </SECTION> +<SECTION> +<FILE>nm-device-modem-bindings</FILE> +DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_NetworkManager_Device_Modem +</SECTION> + diff --git a/docs/libnm-glib/tmpl/nm-device-modem-bindings.sgml b/docs/libnm-glib/tmpl/nm-device-modem-bindings.sgml new file mode 100644 index 00000000..b01b1734 --- /dev/null +++ b/docs/libnm-glib/tmpl/nm-device-modem-bindings.sgml @@ -0,0 +1,31 @@ +<!-- ##### SECTION Title ##### --> +nm-device-modem-bindings + +<!-- ##### SECTION Short_Description ##### --> + + +<!-- ##### SECTION Long_Description ##### --> +<para> + +</para> + + +<!-- ##### SECTION See_Also ##### --> +<para> + +</para> + + +<!-- ##### SECTION Stability_Level ##### --> + + +<!-- ##### SECTION Image ##### --> + + +<!-- ##### MACRO DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_NetworkManager_Device_Modem ##### --> +<para> + +</para> + + + diff --git a/docs/libnm-glib/tmpl/nm-device-wimax-bindings.sgml b/docs/libnm-glib/tmpl/nm-device-wimax-bindings.sgml new file mode 100644 index 00000000..8b79e1c1 --- /dev/null +++ b/docs/libnm-glib/tmpl/nm-device-wimax-bindings.sgml @@ -0,0 +1,71 @@ +<!-- ##### SECTION Title ##### --> +nm-device-wimax-bindings + +<!-- ##### SECTION Short_Description ##### --> + + +<!-- ##### SECTION Long_Description ##### --> +<para> + +</para> + + +<!-- ##### SECTION See_Also ##### --> +<para> + +</para> + + +<!-- ##### SECTION Stability_Level ##### --> + + +<!-- ##### SECTION Image ##### --> + + +<!-- ##### MACRO DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_NetworkManager_Device_WiMax ##### --> +<para> + +</para> + + + +<!-- ##### FUNCTION org_freedesktop_NetworkManager_Device_WiMax_get_nsp_list ##### --> +<para> + +</para> + +@proxy: +@OUT_nsps: +@Returns: + + +<!-- ##### USER_FUNCTION org_freedesktop_NetworkManager_Device_WiMax_get_nsp_list_reply ##### --> +<para> + +</para> + +@proxy: +@OUT_nsps: +@error: +@userdata: + + +<!-- ##### FUNCTION org_freedesktop_NetworkManager_Device_WiMax_get_nsp_list_async ##### --> +<para> + +</para> + +@proxy: +@callback: +@Returns: + + +<!-- ##### FUNCTION dbus_g_proxy_begin_call ##### --> +<para> + +</para> + +@Param1: +@Returns: + + diff --git a/docs/libnm-glib/tmpl/nm-secret-agent-glue.sgml b/docs/libnm-glib/tmpl/nm-secret-agent-glue.sgml new file mode 100644 index 00000000..932de41e --- /dev/null +++ b/docs/libnm-glib/tmpl/nm-secret-agent-glue.sgml @@ -0,0 +1,236 @@ +<!-- ##### SECTION Title ##### --> +nm-secret-agent-glue + +<!-- ##### SECTION Short_Description ##### --> + + +<!-- ##### SECTION Long_Description ##### --> +<para> + +</para> + + +<!-- ##### SECTION See_Also ##### --> +<para> + +</para> + + +<!-- ##### SECTION Stability_Level ##### --> + + +<!-- ##### SECTION Image ##### --> + + +<!-- ##### MACRO g_marshal_value_peek_boolean ##### --> +<para> + +</para> + +@v: + + +<!-- ##### MACRO g_marshal_value_peek_char ##### --> +<para> + +</para> + +@v: + + +<!-- ##### MACRO g_marshal_value_peek_uchar ##### --> +<para> + +</para> + +@v: + + +<!-- ##### MACRO g_marshal_value_peek_int ##### --> +<para> + +</para> + +@v: + + +<!-- ##### MACRO g_marshal_value_peek_uint ##### --> +<para> + +</para> + +@v: + + +<!-- ##### MACRO g_marshal_value_peek_long ##### --> +<para> + +</para> + +@v: + + +<!-- ##### MACRO g_marshal_value_peek_ulong ##### --> +<para> + +</para> + +@v: + + +<!-- ##### MACRO g_marshal_value_peek_int64 ##### --> +<para> + +</para> + +@v: + + +<!-- ##### MACRO g_marshal_value_peek_uint64 ##### --> +<para> + +</para> + +@v: + + +<!-- ##### MACRO g_marshal_value_peek_enum ##### --> +<para> + +</para> + +@v: + + +<!-- ##### MACRO g_marshal_value_peek_flags ##### --> +<para> + +</para> + +@v: + + +<!-- ##### MACRO g_marshal_value_peek_float ##### --> +<para> + +</para> + +@v: + + +<!-- ##### MACRO g_marshal_value_peek_double ##### --> +<para> + +</para> + +@v: + + +<!-- ##### MACRO g_marshal_value_peek_string ##### --> +<para> + +</para> + +@v: + + +<!-- ##### MACRO g_marshal_value_peek_param ##### --> +<para> + +</para> + +@v: + + +<!-- ##### MACRO g_marshal_value_peek_boxed ##### --> +<para> + +</para> + +@v: + + +<!-- ##### MACRO g_marshal_value_peek_pointer ##### --> +<para> + +</para> + +@v: + + +<!-- ##### MACRO g_marshal_value_peek_object ##### --> +<para> + +</para> + +@v: + + +<!-- ##### MACRO g_marshal_value_peek_variant ##### --> +<para> + +</para> + +@v: + + +<!-- ##### FUNCTION dbus_glib_marshal_nm_secret_agent_VOID__BOXED_STRING_POINTER ##### --> +<para> + +</para> + +@closure: +@return_value: +@n_param_values: +@param_values: +@invocation_hint: +@marshal_data: + + +<!-- ##### MACRO dbus_glib_marshal_nm_secret_agent_NONE__BOXED_STRING_POINTER ##### --> +<para> + +</para> + + + +<!-- ##### FUNCTION dbus_glib_marshal_nm_secret_agent_VOID__BOXED_BOXED_STRING_BOXED_UINT_POINTER ##### --> +<para> + +</para> + +@closure: +@return_value: +@n_param_values: +@param_values: +@invocation_hint: +@marshal_data: + + +<!-- ##### MACRO dbus_glib_marshal_nm_secret_agent_NONE__BOXED_BOXED_STRING_BOXED_UINT_POINTER ##### --> +<para> + +</para> + + + +<!-- ##### FUNCTION dbus_glib_marshal_nm_secret_agent_VOID__BOXED_BOXED_POINTER ##### --> +<para> + +</para> + +@closure: +@return_value: +@n_param_values: +@param_values: +@invocation_hint: +@marshal_data: + + +<!-- ##### MACRO dbus_glib_marshal_nm_secret_agent_NONE__BOXED_BOXED_POINTER ##### --> +<para> + +</para> + + + diff --git a/docs/libnm-glib/tmpl/nm-settings-connection-bindings.sgml b/docs/libnm-glib/tmpl/nm-settings-connection-bindings.sgml new file mode 100644 index 00000000..f6333a4f --- /dev/null +++ b/docs/libnm-glib/tmpl/nm-settings-connection-bindings.sgml @@ -0,0 +1,164 @@ +<!-- ##### SECTION Title ##### --> +nm-settings-connection-bindings + +<!-- ##### SECTION Short_Description ##### --> + + +<!-- ##### SECTION Long_Description ##### --> +<para> + +</para> + + +<!-- ##### SECTION See_Also ##### --> +<para> + +</para> + + +<!-- ##### SECTION Stability_Level ##### --> + + +<!-- ##### SECTION Image ##### --> + + +<!-- ##### MACRO DBUS_GLIB_CLIENT_WRAPPERS_org_freedesktop_NetworkManager_Settings_Connection ##### --> +<para> + +</para> + + + +<!-- ##### FUNCTION org_freedesktop_NetworkManager_Settings_Connection_update ##### --> +<para> + +</para> + +@proxy: +@IN_properties: +@Returns: + + +<!-- ##### USER_FUNCTION org_freedesktop_NetworkManager_Settings_Connection_update_reply ##### --> +<para> + +</para> + +@proxy: +@error: +@userdata: + + +<!-- ##### FUNCTION org_freedesktop_NetworkManager_Settings_Connection_update_async ##### --> +<para> + +</para> + +@proxy: +@IN_properties: +@callback: +@Returns: + + +<!-- ##### FUNCTION dbus_g_proxy_begin_call ##### --> +<para> + +</para> + +@Param1: +@Returns: + + +<!-- ##### FUNCTION org_freedesktop_NetworkManager_Settings_Connection_delete ##### --> +<para> + +</para> + +@proxy: +@Returns: + + +<!-- ##### USER_FUNCTION org_freedesktop_NetworkManager_Settings_Connection_delete_reply ##### --> +<para> + +</para> + +@proxy: +@error: +@userdata: + + +<!-- ##### FUNCTION org_freedesktop_NetworkManager_Settings_Connection_delete_async ##### --> +<para> + +</para> + +@proxy: +@callback: +@Returns: + + +<!-- ##### FUNCTION org_freedesktop_NetworkManager_Settings_Connection_get_settings ##### --> +<para> + +</para> + +@proxy: +@OUT_settings: +@Returns: + + +<!-- ##### USER_FUNCTION org_freedesktop_NetworkManager_Settings_Connection_get_settings_reply ##### --> +<para> + +</para> + +@proxy: +@OUT_settings: +@error: +@userdata: + + +<!-- ##### FUNCTION org_freedesktop_NetworkManager_Settings_Connection_get_settings_async ##### --> +<para> + +</para> + +@proxy: +@callback: +@Returns: + + +<!-- ##### FUNCTION org_freedesktop_NetworkManager_Settings_Connection_get_secrets ##### --> +<para> + +</para> + +@proxy: +@IN_setting_name: +@OUT_secrets: +@Returns: + + +<!-- ##### USER_FUNCTION org_freedesktop_NetworkManager_Settings_Connection_get_secrets_reply ##### --> +<para> + +</para> + +@proxy: +@OUT_secrets: +@error: +@userdata: + + +<!-- ##### FUNCTION org_freedesktop_NetworkManager_Settings_Connection_get_secrets_async ##### --> +<para> + +</para> + +@proxy: +@IN_setting_name: +@callback: +@Returns: + + diff --git a/docs/libnm-util/Makefile.in b/docs/libnm-util/Makefile.in index 63e046a4..5138306a 100644 --- a/docs/libnm-util/Makefile.in +++ b/docs/libnm-util/Makefile.in @@ -48,7 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/docs/libnm-util/html/ch01.html b/docs/libnm-util/html/ch01.html index a8e5f34c..7159dcc5 100644 --- a/docs/libnm-util/html/ch01.html +++ b/docs/libnm-util/html/ch01.html @@ -21,7 +21,7 @@ </tr></table> <div class="chapter" title="libnm-util API Reference"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id2603518"></a>libnm-util API Reference</h2></div></div></div> +<a name="id2992775"></a>libnm-util API Reference</h2></div></div></div> <div class="toc"><dl> <dt> <span class="refentrytitle"><a href="NMConnection.html">NMConnection</a></span><span class="refpurpose"> — Describes a connection to specific network or provider</span> diff --git a/docs/settings-spec.html b/docs/settings-spec.html index cfe0441b..f2f01032 100644 --- a/docs/settings-spec.html +++ b/docs/settings-spec.html @@ -1,6 +1,6 @@ <html> <head> -<title>NetworkManager 0.8.3.998 Settings Specification</title></head> +<title>NetworkManager 0.8.3.999 Settings Specification</title></head> <body> <p><h2>Setting name: '802-1x'</h2></p> <table cellspacing=10 border=0 cellpadding=2> diff --git a/examples/Makefile.in b/examples/Makefile.in index ce7a12e5..4ab96315 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/examples/python/Makefile.in b/examples/python/Makefile.in index e6fdf88f..fe29d8ae 100644 --- a/examples/python/Makefile.in +++ b/examples/python/Makefile.in @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/examples/python/add-system-connection.py b/examples/python/add-system-connection.py index 39eaabee..d8902a13 100755 --- a/examples/python/add-system-connection.py +++ b/examples/python/add-system-connection.py @@ -1,4 +1,4 @@ -#!/bin/env python +#!/usr/bin/env python # # 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 diff --git a/examples/python/add-system-wifi-connection.py b/examples/python/add-system-wifi-connection.py index f12723d1..ab0b6020 100755 --- a/examples/python/add-system-wifi-connection.py +++ b/examples/python/add-system-wifi-connection.py @@ -1,4 +1,4 @@ -#!/bin/env python +#!/usr/bin/env python # # 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 diff --git a/examples/python/nm-state.py b/examples/python/nm-state.py index 2bbdd2db..e7bb55f1 100644 --- a/examples/python/nm-state.py +++ b/examples/python/nm-state.py @@ -1,4 +1,4 @@ -#!/bin/env python +#!/usr/bin/env python # # 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 diff --git a/include/Makefile.in b/include/Makefile.in index df62f1a6..121f1c1f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/initscript/Arch/Makefile.am b/initscript/Arch/Makefile.am index 2c1f8b54..98d43432 100644 --- a/initscript/Arch/Makefile.am +++ b/initscript/Arch/Makefile.am @@ -1,5 +1,2 @@ -EXTRA_DIST = networkmanager -DISTCLEANFILES = networkmanager - initddir = $(sysconfdir)/rc.d initd_SCRIPTS = networkmanager diff --git a/initscript/Arch/Makefile.in b/initscript/Arch/Makefile.in index f2561855..9bd465bc 100644 --- a/initscript/Arch/Makefile.in +++ b/initscript/Arch/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -268,8 +268,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = networkmanager -DISTCLEANFILES = networkmanager initddir = $(sysconfdir)/rc.d initd_SCRIPTS = networkmanager all: all-am @@ -412,7 +410,6 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/initscript/Arch/networkmanager b/initscript/Arch/networkmanager deleted file mode 100644 index 60874f22..00000000 --- a/initscript/Arch/networkmanager +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash - -prefix=/usr -exec_prefix=/usr -sbindir=${exec_prefix}/sbin - -NETWORKMANAGER_BIN=${sbindir}/NetworkManager - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -# Sanity checks. -[ -x $NETWORKMANAGER_BIN ] || exit 0 - -PID=`pidof -o %PPID $NETWORKMANAGER_BIN` -case "$1" in - start) - stat_busy "Starting NetworkManager" - [ ! -d /var/run/NetworkManager ] && install -d /var/run/NetworkManager - if [ -z "$PID" ]; then - $NETWORKMANAGER_BIN - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon networkmanager - stat_done - fi - ;; - stop) - stat_busy "Stopping NetworkManager" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon networkmanager - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - sleep) - /usr/bin/dbus-send --system \ - --dest=org.freedesktop.NetworkManager \ - --type=method_call \ - /org/freedesktop/NetworkManager \ - org.freedesktop.NetworkManager.sleep - ;; - wake) - /usr/bin/dbus-send --system \ - --dest=org.freedesktop.NetworkManager \ - --type=method_call \ - /org/freedesktop/NetworkManager \ - org.freedesktop.NetworkManager.wake - ;; - *) - echo "usage: $0 {start|stop|restart|sleep|wake}" - ;; -esac -exit 0 - - - diff --git a/initscript/Debian/Makefile.am b/initscript/Debian/Makefile.am index 890ed77b..a7356452 100644 --- a/initscript/Debian/Makefile.am +++ b/initscript/Debian/Makefile.am @@ -1,5 +1,2 @@ -EXTRA_DIST = NetworkManager.in -DISTCLEANFILES = NetworkManager - initddir = $(sysconfdir)/init.d initd_SCRIPTS = NetworkManager diff --git a/initscript/Debian/Makefile.in b/initscript/Debian/Makefile.in index 12b99d35..df36a08f 100644 --- a/initscript/Debian/Makefile.in +++ b/initscript/Debian/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -268,8 +268,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = NetworkManager.in -DISTCLEANFILES = NetworkManager initddir = $(sysconfdir)/init.d initd_SCRIPTS = NetworkManager all: all-am @@ -412,7 +410,6 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/initscript/Gentoo/Makefile.am b/initscript/Gentoo/Makefile.am index af023b75..a7356452 100644 --- a/initscript/Gentoo/Makefile.am +++ b/initscript/Gentoo/Makefile.am @@ -1,5 +1,2 @@ -EXTRA_DIST = NetworkManager -DISTCLEANFILES = NetworkManager - initddir = $(sysconfdir)/init.d initd_SCRIPTS = NetworkManager diff --git a/initscript/Gentoo/Makefile.in b/initscript/Gentoo/Makefile.in index e87643af..d7039dc4 100644 --- a/initscript/Gentoo/Makefile.in +++ b/initscript/Gentoo/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -268,8 +268,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = NetworkManager -DISTCLEANFILES = NetworkManager initddir = $(sysconfdir)/init.d initd_SCRIPTS = NetworkManager all: all-am @@ -412,7 +410,6 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/initscript/Gentoo/NetworkManager b/initscript/Gentoo/NetworkManager deleted file mode 100644 index 7db410be..00000000 --- a/initscript/Gentoo/NetworkManager +++ /dev/null @@ -1,23 +0,0 @@ -#!/sbin/runscript -# Copyright (c) 2008 Saleem Abdulrasool <compnerd@compnerd.org> -# Distributed under the terms of the GNU General Purpose License v2 -# $Header: $ - -depend() { - need dbus -} - -start() { - ebegin "Starting NetworkManager" - start-stop-daemon --start --quiet --pidfile /var/run/NetworkManager.pid \ - --exec /usr/sbin/NetworkManager -- --pid-file /var/run/NetworkManager.pid - eend $? -} - -stop() { - ebegin "Stopping NetworkManager" - start-stop-daemon --stop --quiet --pidfile /var/run/NetworkManager.pid - eend $? -} - -# vim: set ft=gentoo-init-d ts=3 sw=3 et: diff --git a/initscript/Makefile.in b/initscript/Makefile.in index 84b2370e..ff52589c 100644 --- a/initscript/Makefile.in +++ b/initscript/Makefile.in @@ -50,7 +50,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/initscript/Mandriva/Makefile.am b/initscript/Mandriva/Makefile.am index 0a0cc2bb..bdc99085 100644 --- a/initscript/Mandriva/Makefile.am +++ b/initscript/Mandriva/Makefile.am @@ -1,6 +1,3 @@ -EXTRA_DIST = networkmanager -DISTCLEANFILES = networkmanager - initddir = $(sysconfdir)/rc.d/init.d initd_SCRIPTS = networkmanager diff --git a/initscript/Mandriva/Makefile.in b/initscript/Mandriva/Makefile.in index eb882781..4ad3f365 100644 --- a/initscript/Mandriva/Makefile.in +++ b/initscript/Mandriva/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -268,8 +268,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = networkmanager -DISTCLEANFILES = networkmanager initddir = $(sysconfdir)/rc.d/init.d initd_SCRIPTS = networkmanager all: all-am @@ -412,7 +410,6 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/initscript/Mandriva/networkmanager b/initscript/Mandriva/networkmanager deleted file mode 100644 index bb65dc76..00000000 --- a/initscript/Mandriva/networkmanager +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/sh -# -# NetworkManager: NetworkManager daemon -# -# chkconfig: - 98 02 -# description: This is a daemon for automatically switching network \ -# connections to the best available connection. -# -# processname: NetworkManager -# pidfile: /var/run/NetworkManager/NetworkManager.pid -# -### BEGIN INIT INFO -# Provides: networkmanager -# Required-Start: $network -# Required-Stop: $network -# Default-Start: 3 4 5 -# Short-Description: Daemon for automatically switching to best network connection. -# Description: This is a daemon for automatically switching network -# connections to the best available connection. -### END INIT INFO - -prefix=/usr -exec_prefix=/usr -sbindir=${exec_prefix}/sbin - -NETWORKMANAGER_BIN=${sbindir}/NetworkManager - -# Sanity checks. -[ -x $NETWORKMANAGER_BIN ] || exit 1 - -# Source function library. -. /etc/rc.d/init.d/functions - -# Source network configuration -. /etc/sysconfig/network - -# so we can rearrange this easily -processname=NetworkManager -servicename=NetworkManager -pidfile=/var/run/NetworkManager/NetworkManager.pid - -RETVAL=0 - -start() -{ - echo $"Setting network parameters... " - sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1 - - if [ ! -e /var/lock/subsys/named ]; then - service named start >/dev/null 2>&1 - fi - - echo -n $"Starting NetworkManager daemon: " - daemon --check $servicename $processname --pid-file=$pidfile - RETVAL=$? - echo - if [ -n "${NETWORKWAIT}" ]; then - [ -z "${LINKDELAY}" ] && LINKDELAY=10 - echo -n $"Waiting for network..." - nm-online -q --timeout=$LINKDELAY || nm-online -q -x --timeout=30 - [ "$?" = "0" ] && success "network startup" || failure "network startup" - echo - [ -n "${NETWORKDELAY}" ] && /bin/sleep ${NETWORKDELAY} - fi - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename -} - -stop() -{ - echo -n $"Stopping NetworkManager daemon: " - killproc -p $pidfile $servicename - RETVAL=$? - echo - if [ $RETVAL -eq 0 ]; then - rm -f /var/lock/subsys/$servicename - rm -f $pidfile - fi -} - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status -p $pidfile $processname - RETVAL=$? - ;; - restart) - stop - start - ;; - condrestart) - if [ -f /var/lock/subsys/$servicename ]; then - stop - start - fi - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart}" - ;; -esac -exit $RETVAL diff --git a/initscript/RedHat/Makefile.am b/initscript/RedHat/Makefile.am index 3f7b876b..fc97ec45 100644 --- a/initscript/RedHat/Makefile.am +++ b/initscript/RedHat/Makefile.am @@ -1,6 +1,3 @@ -EXTRA_DIST = NetworkManager -DISTCLEANFILES = NetworkManager - initddir = $(sysconfdir)/rc.d/init.d initd_SCRIPTS = NetworkManager diff --git a/initscript/RedHat/Makefile.in b/initscript/RedHat/Makefile.in index 9e3bc499..7ce3a5ce 100644 --- a/initscript/RedHat/Makefile.in +++ b/initscript/RedHat/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -268,8 +268,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = NetworkManager -DISTCLEANFILES = NetworkManager initddir = $(sysconfdir)/rc.d/init.d initd_SCRIPTS = NetworkManager all: all-am @@ -412,7 +410,6 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/initscript/RedHat/NetworkManager b/initscript/RedHat/NetworkManager deleted file mode 100644 index 465c7611..00000000 --- a/initscript/RedHat/NetworkManager +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/sh -# -# NetworkManager: NetworkManager daemon -# -# chkconfig: - 23 84 -# description: This is a daemon for automatically switching network \ -# connections to the best available connection. -# -# processname: NetworkManager -# pidfile: /var/run/NetworkManager/NetworkManager.pid -# -### BEGIN INIT INFO -# Provides: network_manager $network -# Required-Start: messagebus -# Required-Stop: messagebus -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: start and stop NetworkManager -# Description: NetworkManager is a tool for easily managing network connections -### END INIT INFO - -prefix=/usr -exec_prefix=/usr -sbindir=${exec_prefix}/sbin - -NETWORKMANAGER_BIN=${sbindir}/NetworkManager - -# Sanity checks. -[ -x $NETWORKMANAGER_BIN ] || exit 1 - -# Source function library. -. /etc/rc.d/init.d/functions - -# Source network configuration -. /etc/sysconfig/network - -# so we can rearrange this easily -processname=NetworkManager -servicename=NetworkManager -pidfile=/var/run/NetworkManager/NetworkManager.pid - -RETVAL=0 - -start() -{ - echo -n $"Setting network parameters... " - sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1 - success - echo - - echo -n $"Starting NetworkManager daemon: " - daemon --pidfile $pidfile --check $servicename $processname --pid-file=$pidfile - RETVAL=$? - echo - if [ -n "${NETWORKWAIT}" ]; then - [ -z "${LINKDELAY}" ] && LINKDELAY=10 - echo -n $"Waiting for network..." - nm-online -q --timeout=$LINKDELAY || nm-online -q -x --timeout=30 - [ "$?" = "0" ] && success "network startup" || failure "network startup" - echo - [ -n "${NETWORKDELAY}" ] && /bin/sleep ${NETWORKDELAY} - fi - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename -} - -stop() -{ - echo -n $"Stopping NetworkManager daemon: " - killproc -p $pidfile $servicename - RETVAL=$? - echo - if [ $RETVAL -eq 0 ]; then - rm -f /var/lock/subsys/$servicename - rm -f $pidfile - fi -} - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status -p $pidfile $processname - RETVAL=$? - ;; - restart) - stop - start - ;; - condrestart) - if [ -f /var/lock/subsys/$servicename ]; then - stop - start - fi - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart}" - ;; -esac -exit $RETVAL diff --git a/initscript/SUSE/Makefile.am b/initscript/SUSE/Makefile.am index 75a7c2ac..4938e3e1 100644 --- a/initscript/SUSE/Makefile.am +++ b/initscript/SUSE/Makefile.am @@ -1,6 +1,3 @@ -EXTRA_DIST = networkmanager.in -DISTCLEANFILES = networkmanager - # Nowadays, NetworkManager support is built-in to the SUSE networking # subsystem, therefore a SUSE machine does not want these scripts. Uncomment # this if you actually want external initscripts, such as SUSE 10.0 or earlier. diff --git a/initscript/SUSE/Makefile.in b/initscript/SUSE/Makefile.in index 8e2c45de..e83f1d0b 100644 --- a/initscript/SUSE/Makefile.in +++ b/initscript/SUSE/Makefile.in @@ -42,7 +42,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -244,8 +244,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = networkmanager.in -DISTCLEANFILES = networkmanager all: all-am .SUFFIXES: @@ -349,7 +347,6 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/initscript/Slackware/Makefile.am b/initscript/Slackware/Makefile.am index ded3ee09..254bb7ad 100644 --- a/initscript/Slackware/Makefile.am +++ b/initscript/Slackware/Makefile.am @@ -1,6 +1,3 @@ -EXTRA_DIST = rc.networkmanager -DISTCLEANFILES = rc.networkmanager - initddir = $(sysconfdir)/rc.d initd_SCRIPTS = rc.networkmanager diff --git a/initscript/Slackware/Makefile.in b/initscript/Slackware/Makefile.in index 58f85f47..b0d96d25 100644 --- a/initscript/Slackware/Makefile.in +++ b/initscript/Slackware/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -268,8 +268,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = rc.networkmanager -DISTCLEANFILES = rc.networkmanager initddir = $(sysconfdir)/rc.d initd_SCRIPTS = rc.networkmanager all: all-am @@ -412,7 +410,6 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/initscript/Slackware/rc.networkmanager b/initscript/Slackware/rc.networkmanager deleted file mode 100644 index 5ab01ea1..00000000 --- a/initscript/Slackware/rc.networkmanager +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/sh -# -# NetworkManager: NetworkManager daemon -# -# description: This is a daemon for automatically switching network \ -# connections to the best available connection. \ -# -# processname: NetworkManager -# pidfile: /var/run/NetworkManager.pid -# - -prefix=/usr -exec_prefix=/usr -sbindir=${exec_prefix}/sbin - -NETWORKMANAGER_BIN=${sbindir}/NetworkManager - -# Sanity checks. -[ -x $NETWORKMANAGER_BIN ] || exit 0 - -PIDFILE=/var/run/NetworkManager.pid - -nm_start() -{ - if [ "`pgrep dbus-daemon`" = "" ]; then - echo "D-BUS must be running to start NetworkManager" - return - fi - - # Just in case the pidfile is still there, we may need to nuke it. - if [ -e "$PIDFILE" ]; then - rm -f $PIDFILE - fi - - echo "Starting NetworkManager daemon: $NETWORKMANAGER_BIN" - $NETWORKMANAGER_BIN -} - -nm_status() -{ - local pidlist=`cat $PIDFILE 2>/dev/null` - if [ -z "$pidlist" ]; then - return 1 - fi - local command=`ps -p $pidlist -o comm=` - if [ "$command" != 'NetworkManager' ]; then - return 1 - fi -} - -nm_stop() -{ - echo -en "Stopping NetworkManager: " - local pidlist=`cat $PIDFILE 2>/dev/null` - if [ ! -z "$pidlist" ]; then - kill $pidlist &>/dev/null - rm -f $PIDFILE &>/dev/null - fi - echo "stopped"; -} - -nm_restart() -{ - nm_stop - sleep 2 - nm_start -} - -case "$1" in -'start') - if ( ! nm_status ); then - nm_start - else - echo "NetworkManager is already running (will not start it twice)." - fi - ;; -'stop') - nm_stop - ;; -'restart') - nm_restart - ;; -'status') - if ( nm_status ); then - echo "NetworkManager is currently running" - else - echo "NetworkManager is not running." - fi - ;; -*) - echo "usage $0 start|stop|status|restart" -esac diff --git a/initscript/linexa/Makefile.am b/initscript/linexa/Makefile.am index 0a0cc2bb..bdc99085 100644 --- a/initscript/linexa/Makefile.am +++ b/initscript/linexa/Makefile.am @@ -1,6 +1,3 @@ -EXTRA_DIST = networkmanager -DISTCLEANFILES = networkmanager - initddir = $(sysconfdir)/rc.d/init.d initd_SCRIPTS = networkmanager diff --git a/initscript/linexa/Makefile.in b/initscript/linexa/Makefile.in index 49f99dae..9bd2bb0e 100644 --- a/initscript/linexa/Makefile.in +++ b/initscript/linexa/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -268,8 +268,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = networkmanager -DISTCLEANFILES = networkmanager initddir = $(sysconfdir)/rc.d/init.d initd_SCRIPTS = networkmanager all: all-am @@ -412,7 +410,6 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/initscript/linexa/networkmanager b/initscript/linexa/networkmanager deleted file mode 100644 index 0d754c36..00000000 --- a/initscript/linexa/networkmanager +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/bash -# Start the networkmanager daemon -# -# Author: Elias <elias@linexa.de> -# [2010-08-20] - -# Information about the daemon -title="networkmanager" # No spaces allowed in here -start_after="dbus" # dependencies for start-up -stop_after="xinetd" # dependencies for stop -runlevel="2" # start/stop in this runlevel -sequence="25" # "checkinstall networkmanager enable" - # will create links to: - # /etc/rc.d/rc${runlevel}.d/S${sequence}${title} - # /etc/rc.d/rc${runlevel}.d/S$((100 - ${sequence}))${title} - -# check whether daemon is running -# returns 0 if running, >0 if not -check() { - [ -f /var/run/NetworkManager.pid ] -} - -# start procedure -start() { - if check ; then - warning "${title} is already running. Type 'service restart ${title}'" # Issue a warning - else - /usr/sbin/NetworkManager & - evaluate_retval "Starting ${title}. " # Print [ done ] or [ failed ] depending on outcome - fi -} - -# stop procedure -stop() { - if check ; then # daemon is running - kill $(cat /var/run/NetworkManager.pid) - evaluate_retval "Stopping ${title}." # Print [ done ] or [ failed ] depending on outcome - else # daemon not running - warning "${title} is not running." # Issue a warning - fi -} - -# restart procedure -restart() { - stop - sleep 1 - start -} - -# reload action -reload() { - if check ; then # daemon is running - kill -HUP $(cat /var/run/NetworkManager.pid) &>/dev/null - evaluate_retval "Reloading ${title}." # Print [ done ] or [ failed ] depending on outcome - else # daemon not running - warning "${title} is not running." # Issue a warning - fi -} - diff --git a/initscript/paldo/Makefile.am b/initscript/paldo/Makefile.am index 3d67ff6e..2c1b1964 100644 --- a/initscript/paldo/Makefile.am +++ b/initscript/paldo/Makefile.am @@ -1,6 +1,3 @@ -EXTRA_DIST = NetworkManager -DISTCLEANFILES = NetworkManager - initddir = $(sysconfdir)/init.d initd_SCRIPTS = NetworkManager diff --git a/initscript/paldo/Makefile.in b/initscript/paldo/Makefile.in index 4f8570ce..75cc966e 100644 --- a/initscript/paldo/Makefile.in +++ b/initscript/paldo/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -268,8 +268,6 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = NetworkManager -DISTCLEANFILES = NetworkManager initddir = $(sysconfdir)/init.d initd_SCRIPTS = NetworkManager all: all-am @@ -412,7 +410,6 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/initscript/paldo/NetworkManager b/initscript/paldo/NetworkManager deleted file mode 100644 index fe66d80b..00000000 --- a/initscript/paldo/NetworkManager +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash -### BEGIN INIT INFO -# Provides: NetworkManager -# Required-Start: $network dbus -# Required-Stop: $network dbus -# Default-Start: 3 4 5 -# Default-Stop: 0 1 2 6 -### END INIT INFO -. /lib/lsb/init-functions - -[ -e /etc/default/NetworkManager ] && source /etc/default/NetworkManager -[ $(/usr/bin/tty -s; echo $?) -gt 0 -o "$(/usr/bin/tty)" == "/dev/console" ] && [ "$START_NETWORK_MANAGER" != "TRUE" ] && exit 0 - -prefix=/usr -exec_prefix=/usr -sbindir=${exec_prefix}/sbin - -case "$1" in - start) - echo -n "Starting NetworkManager..." - if start_daemon $sbindir/NetworkManager - then - log_success_msg - else - log_failure_msg - fi - ;; - stop) - echo -n "Stopping NetworkManager..." - if killproc $sbindir/NetworkManager - then - log_success_msg "." - else - log_failure_msg - fi - ;; - restart|force-reload) - $0 stop - sleep 1 - $0 start - ;; - try-restart) - if pidofproc $sbindir/NetworkManager - then - $0 restart - fi - ;; - status) - pidofproc $sbindir/NetworkManager - exit $? - ;; - *) - echo "Usage: $0 {start|stop|restart|try-restart|force-reload|status}" - exit 1 - ;; -esac diff --git a/introspection/Makefile.in b/introspection/Makefile.in index 0a37f352..3e4fb45e 100644 --- a/introspection/Makefile.in +++ b/introspection/Makefile.in @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/libnm-glib/Makefile.am b/libnm-glib/Makefile.am index 0c5fa137..165977cf 100644 --- a/libnm-glib/Makefile.am +++ b/libnm-glib/Makefile.am @@ -129,7 +129,9 @@ libnm_glib_la_LIBADD = \ $(DBUS_LIBS) \ $(GUDEV_LIBS) -libnm_glib_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-glib.ver \ +SYMBOL_VIS_FILE=$(srcdir)/libnm-glib.ver + +libnm_glib_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \ -version-info "6:3:4" noinst_PROGRAMS = libnm-glib-test @@ -208,3 +210,11 @@ DISTCLEANFILES = libnm-glib.pc libnm-glib.pc EXTRA_DIST = libnm-glib.pc.in libnm-glib-vpn.pc.in libnm-glib.ver libnm-glib-vpn.ver CLEANFILES = $(BUILT_SOURCES) + +if WITH_TESTS + +check-local: + $(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-glib.so $(SYMBOL_VIS_FILE) + +endif + diff --git a/libnm-glib/Makefile.in b/libnm-glib/Makefile.in index 822974dc..be259d7e 100644 --- a/libnm-glib/Makefile.in +++ b/libnm-glib/Makefile.in @@ -48,7 +48,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -491,7 +491,8 @@ libnm_glib_la_LIBADD = \ $(DBUS_LIBS) \ $(GUDEV_LIBS) -libnm_glib_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-glib.ver \ +SYMBOL_VIS_FILE = $(srcdir)/libnm-glib.ver +libnm_glib_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \ -version-info "6:3:4" libnm_glib_test_SOURCES = libnm-glib-test.c @@ -1055,7 +1056,9 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done +@WITH_TESTS_FALSE@check-local: check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) @@ -1164,24 +1167,24 @@ ps-am: uninstall-am: uninstall-libLTLIBRARIES uninstall-libnmincludeHEADERS \ uninstall-pkgconfigDATA -.MAKE: all check install install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \ - clean-noinstPROGRAMS ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libLTLIBRARIES \ - install-libnmincludeHEADERS install-man install-pdf \ - install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-libLTLIBRARIES uninstall-libnmincludeHEADERS \ - uninstall-pkgconfigDATA +.MAKE: all check check-am install install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ + clean-generic clean-libLTLIBRARIES clean-libtool \ + clean-noinstLTLIBRARIES clean-noinstPROGRAMS ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am \ + install-libLTLIBRARIES install-libnmincludeHEADERS install-man \ + install-pdf install-pdf-am install-pkgconfigDATA install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-libLTLIBRARIES \ + uninstall-libnmincludeHEADERS uninstall-pkgconfigDATA nm-client-bindings.h: $(top_srcdir)/introspection/nm-manager-client.xml @@ -1238,6 +1241,9 @@ nm-ip6-config-bindings.h: $(top_srcdir)/introspection/nm-ip6-config.xml nm-dhcp6-config-bindings.h: $(top_srcdir)/introspection/nm-dhcp6-config.xml $(AM_V_GEN) dbus-binding-tool --prefix=nm_dhcp6_config --mode=glib-client --output=$@ $< +@WITH_TESTS_TRUE@check-local: +@WITH_TESTS_TRUE@ $(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-glib.so $(SYMBOL_VIS_FILE) + # 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 --git a/libnm-glib/libnm-glib.ver b/libnm-glib/libnm-glib.ver index 22fc0e24..69c07a64 100644 --- a/libnm-glib/libnm-glib.ver +++ b/libnm-glib/libnm-glib.ver @@ -17,8 +17,8 @@ global: nm_access_point_get_wpa_flags; nm_access_point_new; nm_active_connection_get_connection; - nm_active_connection_get_default; nm_active_connection_get_default6; + nm_active_connection_get_default; nm_active_connection_get_devices; nm_active_connection_get_scope; nm_active_connection_get_service_name; @@ -47,20 +47,12 @@ global: nm_client_wwan_get_enabled; nm_client_wwan_hardware_get_enabled; nm_client_wwan_set_enabled; - nm_dbus_settings_get_connection_by_path; - nm_dbus_settings_get_type; - nm_dbus_settings_new; - nm_dbus_settings_system_add_connection; - nm_dbus_settings_system_get_can_modify; - nm_dbus_settings_system_get_type; - nm_dbus_settings_system_get_unmanaged_devices; - nm_dbus_settings_system_new; - nm_device_disconnect; - nm_device_bt_new; nm_device_bt_get_capabilities; nm_device_bt_get_hw_address; nm_device_bt_get_name; nm_device_bt_get_type; + nm_device_bt_new; + nm_device_disconnect; nm_device_ethernet_get_carrier; nm_device_ethernet_get_hw_address; nm_device_ethernet_get_permanent_hw_address; @@ -88,8 +80,8 @@ global: nm_device_wifi_get_bitrate; nm_device_wifi_get_capabilities; nm_device_wifi_get_hw_address; - nm_device_wifi_get_permanent_hw_address; nm_device_wifi_get_mode; + nm_device_wifi_get_permanent_hw_address; nm_device_wifi_get_type; nm_device_wifi_new; nm_dhcp4_config_get_one_option; @@ -100,7 +92,6 @@ global: nm_dhcp6_config_get_options; nm_dhcp6_config_get_type; nm_dhcp6_config_new; - nm_exported_connection_export; nm_exported_connection_get_type; nm_exported_connection_new; nm_gsm_device_get_type; @@ -109,9 +100,9 @@ global: nm_ip4_config_get_domains; nm_ip4_config_get_hostname; nm_ip4_config_get_nameservers; - nm_ip4_config_get_wins_servers; nm_ip4_config_get_routes; nm_ip4_config_get_type; + nm_ip4_config_get_wins_servers; nm_ip4_config_new; nm_ip6_address_array_get_type; nm_ip6_address_object_array_get_type; @@ -150,14 +141,9 @@ global: nm_settings_service_export_connection; nm_settings_service_get_connection_by_path; nm_settings_service_get_type; - nm_settings_system_interface_get_type; - nm_settings_system_interface_add_connection; nm_settings_system_interface_get_permissions; + nm_settings_system_interface_get_type; nm_settings_system_interface_save_hostname; - nm_settings_error_quark; - nm_settings_get_type; - nm_settings_list_connections; - nm_settings_signal_new_connection; nm_ssid_get_type; nm_string_array_get_type; nm_uint_array_get_type; diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am index a2d4d2b2..fd5eccef 100644 --- a/libnm-util/Makefile.am +++ b/libnm-util/Makefile.am @@ -58,7 +58,9 @@ libnm_util_la_SOURCES= \ libnm_util_la_LIBADD = $(GLIB_LIBS) $(DBUS_LIBS) $(UUID_LIBS) -libnm_util_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-util.ver \ +SYMBOL_VIS_FILE=$(srcdir)/libnm-util.ver + +libnm_util_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \ -version-info "7:1:6" if WITH_GNUTLS @@ -111,3 +113,10 @@ DISTCLEANFILES = libnm-util.pc EXTRA_DIST = libnm-util.pc.in libnm-util.ver +if WITH_TESTS + +check-local: + $(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-util.so $(SYMBOL_VIS_FILE) + +endif + diff --git a/libnm-util/Makefile.in b/libnm-util/Makefile.in index dcea77bf..d78365d7 100644 --- a/libnm-util/Makefile.in +++ b/libnm-util/Makefile.in @@ -57,7 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -444,7 +444,8 @@ libnm_util_la_SOURCES = crypto.c crypto.h nm-connection.c \ $(libnm_util_include_HEADERS) $(am__append_1) $(am__append_4) libnm_util_la_LIBADD = $(GLIB_LIBS) $(DBUS_LIBS) $(UUID_LIBS) \ $(am__append_3) $(am__append_6) -libnm_util_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libnm-util.ver \ +SYMBOL_VIS_FILE = $(srcdir)/libnm-util.ver +libnm_util_la_LDFLAGS = -Wl,--version-script=$(SYMBOL_VIS_FILE) \ -version-info "7:1:6" libnm_util_includedir = $(includedir)/NetworkManager @@ -1041,7 +1042,9 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done +@WITH_TESTS_FALSE@check-local: check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-local check: check-recursive all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) installdirs: installdirs-recursive @@ -1148,11 +1151,11 @@ ps-am: uninstall-am: uninstall-libLTLIBRARIES \ uninstall-libnm_util_includeHEADERS uninstall-pkgconfigDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \ + ctags-recursive install-am install-strip tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic \ + all all-am check check-am check-local clean clean-generic \ clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \ ctags ctags-recursive distclean distclean-compile \ distclean-generic distclean-libtool distclean-tags distdir dvi \ @@ -1170,6 +1173,9 @@ uninstall-am: uninstall-libLTLIBRARIES \ uninstall-libnm_util_includeHEADERS uninstall-pkgconfigDATA +@WITH_TESTS_TRUE@check-local: +@WITH_TESTS_TRUE@ $(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-util.so $(SYMBOL_VIS_FILE) + # 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 --git a/libnm-util/crypto_gnutls.c b/libnm-util/crypto_gnutls.c index edfc16af..0fee84c8 100644 --- a/libnm-util/crypto_gnutls.c +++ b/libnm-util/crypto_gnutls.c @@ -57,8 +57,6 @@ crypto_init (GError **error) void crypto_deinit (void) { - if (initialized) - gnutls_global_deinit(); } gboolean diff --git a/libnm-util/crypto_nss.c b/libnm-util/crypto_nss.c index 490d5fe9..ff12f9c5 100644 --- a/libnm-util/crypto_nss.c +++ b/libnm-util/crypto_nss.c @@ -74,10 +74,6 @@ crypto_init (GError **error) void crypto_deinit (void) { - if (initialized) { - NSS_Shutdown (); - PR_Cleanup (); - } } gboolean diff --git a/libnm-util/libnm-util.ver b/libnm-util/libnm-util.ver index 354a0f7b..7fce9a67 100644 --- a/libnm-util/libnm-util.ver +++ b/libnm-util/libnm-util.ver @@ -27,6 +27,54 @@ global: nm_connection_to_hash; nm_connection_update_secrets; nm_connection_verify; + nm_ip4_address_compare; + nm_ip4_address_dup; + nm_ip4_address_get_address; + nm_ip4_address_get_gateway; + nm_ip4_address_get_prefix; + nm_ip4_address_new; + nm_ip4_address_ref; + nm_ip4_address_set_address; + nm_ip4_address_set_gateway; + nm_ip4_address_set_prefix; + nm_ip4_address_unref; + nm_ip4_route_compare; + nm_ip4_route_dup; + nm_ip4_route_get_dest; + nm_ip4_route_get_metric; + nm_ip4_route_get_next_hop; + nm_ip4_route_get_prefix; + nm_ip4_route_new; + nm_ip4_route_ref; + nm_ip4_route_set_dest; + nm_ip4_route_set_metric; + nm_ip4_route_set_next_hop; + nm_ip4_route_set_prefix; + nm_ip4_route_unref; + nm_ip6_address_compare; + nm_ip6_address_dup; + nm_ip6_address_get_address; + nm_ip6_address_get_gateway; + nm_ip6_address_get_prefix; + nm_ip6_address_new; + nm_ip6_address_ref; + nm_ip6_address_set_address; + nm_ip6_address_set_gateway; + nm_ip6_address_set_prefix; + nm_ip6_address_unref; + nm_ip6_route_compare; + nm_ip6_route_dup; + nm_ip6_route_get_dest; + nm_ip6_route_get_metric; + nm_ip6_route_get_next_hop; + nm_ip6_route_get_prefix; + nm_ip6_route_new; + nm_ip6_route_ref; + nm_ip6_route_set_dest; + nm_ip6_route_set_metric; + nm_ip6_route_set_next_hop; + nm_ip6_route_set_prefix; + nm_ip6_route_unref; nm_setting_802_1x_add_eap_method; nm_setting_802_1x_clear_eap_methods; nm_setting_802_1x_error_get_type; @@ -34,17 +82,13 @@ global: nm_setting_802_1x_get_anonymous_identity; nm_setting_802_1x_get_ca_cert; nm_setting_802_1x_get_ca_cert_blob; - nm_setting_802_1x_set_ca_cert_from_file; nm_setting_802_1x_get_ca_cert_path; nm_setting_802_1x_get_ca_cert_scheme; - nm_setting_802_1x_set_ca_cert; nm_setting_802_1x_get_ca_path; nm_setting_802_1x_get_client_cert; nm_setting_802_1x_get_client_cert_blob; - nm_setting_802_1x_set_client_cert_from_file; nm_setting_802_1x_get_client_cert_path; nm_setting_802_1x_get_client_cert_scheme; - nm_setting_802_1x_set_client_cert; nm_setting_802_1x_get_eap_method; nm_setting_802_1x_get_identity; nm_setting_802_1x_get_num_eap_methods; @@ -56,271 +100,258 @@ global: nm_setting_802_1x_get_phase2_autheap; nm_setting_802_1x_get_phase2_ca_cert; nm_setting_802_1x_get_phase2_ca_cert_blob; - nm_setting_802_1x_set_phase2_ca_cert_from_file; nm_setting_802_1x_get_phase2_ca_cert_path; nm_setting_802_1x_get_phase2_ca_cert_scheme; - nm_setting_802_1x_set_phase2_ca_cert; nm_setting_802_1x_get_phase2_ca_path; nm_setting_802_1x_get_phase2_client_cert; nm_setting_802_1x_get_phase2_client_cert_blob; - nm_setting_802_1x_set_phase2_client_cert_from_file; nm_setting_802_1x_get_phase2_client_cert_path; nm_setting_802_1x_get_phase2_client_cert_scheme; - nm_setting_802_1x_set_phase2_client_cert; nm_setting_802_1x_get_phase2_private_key; nm_setting_802_1x_get_phase2_private_key_blob; nm_setting_802_1x_get_phase2_private_key_format; - nm_setting_802_1x_set_phase2_private_key_from_file; nm_setting_802_1x_get_phase2_private_key_password; nm_setting_802_1x_get_phase2_private_key_path; nm_setting_802_1x_get_phase2_private_key_scheme; nm_setting_802_1x_get_phase2_private_key_type; - nm_setting_802_1x_set_phase2_private_key; nm_setting_802_1x_get_pin; nm_setting_802_1x_get_private_key; nm_setting_802_1x_get_private_key_blob; nm_setting_802_1x_get_private_key_format; - nm_setting_802_1x_set_private_key_from_file; nm_setting_802_1x_get_private_key_password; nm_setting_802_1x_get_private_key_path; nm_setting_802_1x_get_private_key_scheme; nm_setting_802_1x_get_private_key_type; - nm_setting_802_1x_set_private_key; nm_setting_802_1x_get_psk; nm_setting_802_1x_get_system_ca_certs; nm_setting_802_1x_get_type; nm_setting_802_1x_new; nm_setting_802_1x_remove_eap_method; + nm_setting_802_1x_set_ca_cert; + nm_setting_802_1x_set_ca_cert_from_file; + nm_setting_802_1x_set_client_cert; + nm_setting_802_1x_set_client_cert_from_file; + nm_setting_802_1x_set_phase2_ca_cert; + nm_setting_802_1x_set_phase2_ca_cert_from_file; + nm_setting_802_1x_set_phase2_client_cert; + nm_setting_802_1x_set_phase2_client_cert_from_file; + nm_setting_802_1x_set_phase2_private_key; + nm_setting_802_1x_set_phase2_private_key_from_file; + nm_setting_802_1x_set_private_key; + nm_setting_802_1x_set_private_key_from_file; nm_setting_bluetooth_error_get_type; nm_setting_bluetooth_error_quark; - nm_setting_bluetooth_get_type; - nm_setting_bluetooth_new; nm_setting_bluetooth_get_bdaddr; nm_setting_bluetooth_get_connection_type; + nm_setting_bluetooth_get_type; + nm_setting_bluetooth_new; nm_setting_cdma_error_get_type; nm_setting_cdma_error_quark; - nm_setting_cdma_get_type; - nm_setting_cdma_new; nm_setting_cdma_get_number; - nm_setting_cdma_get_username; nm_setting_cdma_get_password; + nm_setting_cdma_get_type; + nm_setting_cdma_get_username; + nm_setting_cdma_new; nm_setting_clear_secrets; nm_setting_compare; nm_setting_connection_error_get_type; nm_setting_connection_error_quark; - nm_setting_connection_get_type; - nm_setting_connection_new; - nm_setting_connection_get_id; - nm_setting_connection_get_uuid; - nm_setting_connection_get_connection_type; nm_setting_connection_get_autoconnect; - nm_setting_connection_get_timestamp; + nm_setting_connection_get_connection_type; + nm_setting_connection_get_id; nm_setting_connection_get_read_only; + nm_setting_connection_get_timestamp; + nm_setting_connection_get_type; + nm_setting_connection_get_uuid; + nm_setting_connection_new; nm_setting_diff; nm_setting_duplicate; nm_setting_enumerate_values; nm_setting_error_get_type; nm_setting_error_quark; - nm_setting_new_from_hash; nm_setting_get_name; nm_setting_get_type; nm_setting_gsm_error_get_type; nm_setting_gsm_error_quark; - nm_setting_gsm_get_type; - nm_setting_gsm_new; - nm_setting_gsm_get_number; - nm_setting_gsm_get_username; - nm_setting_gsm_get_password; + nm_setting_gsm_get_allowed_bands; nm_setting_gsm_get_apn; + nm_setting_gsm_get_band; + nm_setting_gsm_get_home_only; nm_setting_gsm_get_network_id; nm_setting_gsm_get_network_type; - nm_setting_gsm_get_allowed_bands; - nm_setting_gsm_get_band; + nm_setting_gsm_get_number; + nm_setting_gsm_get_password; nm_setting_gsm_get_pin; nm_setting_gsm_get_puk; - nm_setting_gsm_get_home_only; - nm_setting_ip4_config_error_get_type; - nm_setting_ip4_config_error_quark; - nm_setting_ip4_config_get_type; - nm_setting_ip4_config_new; - nm_setting_ip4_config_get_method; - nm_setting_ip4_config_get_num_dns; - nm_setting_ip4_config_get_dns; + nm_setting_gsm_get_type; + nm_setting_gsm_get_username; + nm_setting_gsm_new; + nm_setting_ip4_config_add_address; nm_setting_ip4_config_add_dns; - nm_setting_ip4_config_remove_dns; - nm_setting_ip4_config_clear_dns; - nm_setting_ip4_config_get_num_dns_searches; - nm_setting_ip4_config_get_dns_search; nm_setting_ip4_config_add_dns_search; - nm_setting_ip4_config_remove_dns_search; - nm_setting_ip4_config_clear_dns_searches; - nm_setting_ip4_config_get_num_addresses; - nm_setting_ip4_config_get_address; - nm_setting_ip4_config_add_address; - nm_setting_ip4_config_remove_address; - nm_setting_ip4_config_clear_addresses; - nm_setting_ip4_config_get_num_routes; - nm_setting_ip4_config_get_route; nm_setting_ip4_config_add_route; - nm_setting_ip4_config_remove_route; + nm_setting_ip4_config_clear_addresses; + nm_setting_ip4_config_clear_dns; + nm_setting_ip4_config_clear_dns_searches; nm_setting_ip4_config_clear_routes; - nm_setting_ip4_config_get_ignore_auto_routes; - nm_setting_ip4_config_get_ignore_auto_dns; + nm_setting_ip4_config_error_get_type; + nm_setting_ip4_config_error_quark; + nm_setting_ip4_config_get_address; nm_setting_ip4_config_get_dhcp_client_id; nm_setting_ip4_config_get_dhcp_hostname; nm_setting_ip4_config_get_dhcp_send_hostname; - nm_setting_ip4_config_get_never_default; + nm_setting_ip4_config_get_dns; + nm_setting_ip4_config_get_dns_search; + nm_setting_ip4_config_get_ignore_auto_dns; + nm_setting_ip4_config_get_ignore_auto_routes; nm_setting_ip4_config_get_may_fail; - nm_ip6_address_new; - nm_ip6_address_dup; - nm_ip6_address_ref; - nm_ip6_address_unref; - nm_ip6_address_compare; - nm_ip6_address_get_address; - nm_ip6_address_set_address; - nm_ip6_address_get_gateway; - nm_ip6_address_set_gateway; - nm_ip6_address_get_prefix; - nm_ip6_address_set_prefix; - nm_ip6_route_new; - nm_ip6_route_dup; - nm_ip6_route_ref; - nm_ip6_route_unref; - nm_ip6_route_compare; - nm_ip6_route_get_dest; - nm_ip6_route_set_dest; - nm_ip6_route_get_prefix; - nm_ip6_route_set_prefix; - nm_ip6_route_get_next_hop; - nm_ip6_route_set_next_hop; - nm_ip6_route_get_metric; - nm_ip6_route_set_metric; + nm_setting_ip4_config_get_method; + nm_setting_ip4_config_get_never_default; + nm_setting_ip4_config_get_num_addresses; + nm_setting_ip4_config_get_num_dns; + nm_setting_ip4_config_get_num_dns_searches; + nm_setting_ip4_config_get_num_routes; + nm_setting_ip4_config_get_route; + nm_setting_ip4_config_get_type; + nm_setting_ip4_config_new; + nm_setting_ip4_config_remove_address; + nm_setting_ip4_config_remove_dns; + nm_setting_ip4_config_remove_dns_search; + nm_setting_ip4_config_remove_route; + nm_setting_ip6_config_add_address; + nm_setting_ip6_config_add_dns; + nm_setting_ip6_config_add_dns_search; + nm_setting_ip6_config_add_route; + nm_setting_ip6_config_clear_addresses; + nm_setting_ip6_config_clear_dns; + nm_setting_ip6_config_clear_dns_searches; + nm_setting_ip6_config_clear_routes; nm_setting_ip6_config_error_get_type; nm_setting_ip6_config_error_quark; - nm_setting_ip6_config_get_type; - nm_setting_ip6_config_new; - nm_setting_ip6_config_get_method; - nm_setting_ip6_config_get_num_dns; + nm_setting_ip6_config_get_address; nm_setting_ip6_config_get_dns; - nm_setting_ip6_config_add_dns; - nm_setting_ip6_config_remove_dns; - nm_setting_ip6_config_clear_dns; - nm_setting_ip6_config_get_num_dns_searches; nm_setting_ip6_config_get_dns_search; - nm_setting_ip6_config_add_dns_search; - nm_setting_ip6_config_remove_dns_search; - nm_setting_ip6_config_clear_dns_searches; + nm_setting_ip6_config_get_ignore_auto_dns; + nm_setting_ip6_config_get_ignore_auto_routes; + nm_setting_ip6_config_get_may_fail; + nm_setting_ip6_config_get_method; + nm_setting_ip6_config_get_never_default; nm_setting_ip6_config_get_num_addresses; - nm_setting_ip6_config_get_address; - nm_setting_ip6_config_add_address; - nm_setting_ip6_config_remove_address; - nm_setting_ip6_config_clear_addresses; + nm_setting_ip6_config_get_num_dns; + nm_setting_ip6_config_get_num_dns_searches; nm_setting_ip6_config_get_num_routes; nm_setting_ip6_config_get_route; - nm_setting_ip6_config_add_route; + nm_setting_ip6_config_get_type; + nm_setting_ip6_config_new; + nm_setting_ip6_config_remove_address; + nm_setting_ip6_config_remove_dns; + nm_setting_ip6_config_remove_dns_search; nm_setting_ip6_config_remove_route; - nm_setting_ip6_config_clear_routes; - nm_setting_ip6_config_get_ignore_auto_routes; - nm_setting_ip6_config_get_ignore_auto_dns; - nm_setting_ip6_config_get_never_default; - nm_setting_ip6_config_get_may_fail; nm_setting_need_secrets; + nm_setting_new_from_hash; + nm_setting_olpc_mesh_error_get_type; + nm_setting_olpc_mesh_error_quark; + nm_setting_olpc_mesh_get_channel; + nm_setting_olpc_mesh_get_dhcp_anycast_address; + nm_setting_olpc_mesh_get_ssid; + nm_setting_olpc_mesh_get_type; + nm_setting_olpc_mesh_new; nm_setting_ppp_error_get_type; nm_setting_ppp_error_quark; - nm_setting_ppp_get_type; - nm_setting_ppp_new; + nm_setting_ppp_get_baud; + nm_setting_ppp_get_crtscts; + nm_setting_ppp_get_lcp_echo_failure; + nm_setting_ppp_get_lcp_echo_interval; + nm_setting_ppp_get_mppe_stateful; + nm_setting_ppp_get_mru; + nm_setting_ppp_get_mtu; + nm_setting_ppp_get_no_vj_comp; nm_setting_ppp_get_noauth; - nm_setting_ppp_get_refuse_eap; - nm_setting_ppp_get_refuse_pap; + nm_setting_ppp_get_nobsdcomp; + nm_setting_ppp_get_nodeflate; nm_setting_ppp_get_refuse_chap; + nm_setting_ppp_get_refuse_eap; nm_setting_ppp_get_refuse_mschap; nm_setting_ppp_get_refuse_mschapv2; - nm_setting_ppp_get_nobsdcomp; - nm_setting_ppp_get_nodeflate; - nm_setting_ppp_get_no_vj_comp; + nm_setting_ppp_get_refuse_pap; nm_setting_ppp_get_require_mppe; nm_setting_ppp_get_require_mppe_128; - nm_setting_ppp_get_mppe_stateful; - nm_setting_ppp_get_crtscts; - nm_setting_ppp_get_baud; - nm_setting_ppp_get_mru; - nm_setting_ppp_get_mtu; - nm_setting_ppp_get_lcp_echo_failure; - nm_setting_ppp_get_lcp_echo_interval; + nm_setting_ppp_get_type; + nm_setting_ppp_new; nm_setting_pppoe_error_get_type; nm_setting_pppoe_error_quark; - nm_setting_pppoe_get_type; - nm_setting_pppoe_new; + nm_setting_pppoe_get_password; nm_setting_pppoe_get_service; + nm_setting_pppoe_get_type; nm_setting_pppoe_get_username; - nm_setting_pppoe_get_password; + nm_setting_pppoe_new; nm_setting_serial_error_get_type; nm_setting_serial_error_quark; - nm_setting_serial_get_type; - nm_setting_serial_new; nm_setting_serial_get_baud; nm_setting_serial_get_bits; nm_setting_serial_get_parity; - nm_setting_serial_get_stopbits; nm_setting_serial_get_send_delay; + nm_setting_serial_get_stopbits; + nm_setting_serial_get_type; + nm_setting_serial_new; nm_setting_to_hash; nm_setting_to_string; nm_setting_update_secrets; nm_setting_verify; + nm_setting_vpn_add_data_item; + nm_setting_vpn_add_secret; nm_setting_vpn_error_get_type; nm_setting_vpn_error_quark; - nm_setting_vpn_get_type; - nm_setting_vpn_new; - nm_setting_vpn_get_service_type; - nm_setting_vpn_get_user_name; - nm_setting_vpn_add_data_item; nm_setting_vpn_foreach_data_item; - nm_setting_vpn_get_data_item; - nm_setting_vpn_remove_data_item; - nm_setting_vpn_add_secret; nm_setting_vpn_foreach_secret; + nm_setting_vpn_get_data_item; nm_setting_vpn_get_secret; + nm_setting_vpn_get_service_type; + nm_setting_vpn_get_type; + nm_setting_vpn_get_user_name; + nm_setting_vpn_new; + nm_setting_vpn_remove_data_item; nm_setting_vpn_remove_secret; + nm_setting_wired_add_s390_option; nm_setting_wired_error_get_type; nm_setting_wired_error_quark; - nm_setting_wired_get_type; - nm_setting_wired_new; - nm_setting_wired_get_port; - nm_setting_wired_get_speed; - nm_setting_wired_get_duplex; nm_setting_wired_get_auto_negotiate; - nm_setting_wired_get_mac_address; nm_setting_wired_get_cloned_mac_address; + nm_setting_wired_get_duplex; + nm_setting_wired_get_mac_address; nm_setting_wired_get_mtu; nm_setting_wired_get_num_s390_options; + nm_setting_wired_get_port; nm_setting_wired_get_s390_nettype; nm_setting_wired_get_s390_option; nm_setting_wired_get_s390_option_by_key; - nm_setting_wired_add_s390_option; nm_setting_wired_get_s390_subchannels; + nm_setting_wired_get_speed; + nm_setting_wired_get_type; + nm_setting_wired_new; nm_setting_wired_remove_s390_option; + nm_setting_wireless_add_seen_bssid; nm_setting_wireless_ap_security_compatible; nm_setting_wireless_error_get_type; nm_setting_wireless_error_quark; - nm_setting_wireless_get_type; - nm_setting_wireless_new; - nm_setting_wireless_get_ssid; - nm_setting_wireless_get_mode; nm_setting_wireless_get_band; - nm_setting_wireless_get_channel; nm_setting_wireless_get_bssid; - nm_setting_wireless_get_rate; - nm_setting_wireless_get_tx_power; - nm_setting_wireless_get_mac_address; + nm_setting_wireless_get_channel; nm_setting_wireless_get_cloned_mac_address; + nm_setting_wireless_get_mac_address; + nm_setting_wireless_get_mode; nm_setting_wireless_get_mtu; - nm_setting_wireless_get_security; - nm_setting_wireless_add_seen_bssid; nm_setting_wireless_get_num_seen_bssids; + nm_setting_wireless_get_rate; + nm_setting_wireless_get_security; nm_setting_wireless_get_seen_bssid; - nm_setting_wireless_security_add_proto; - nm_setting_wireless_security_add_pairwise; + nm_setting_wireless_get_ssid; + nm_setting_wireless_get_tx_power; + nm_setting_wireless_get_type; + nm_setting_wireless_new; nm_setting_wireless_security_add_group; + nm_setting_wireless_security_add_pairwise; + nm_setting_wireless_security_add_proto; nm_setting_wireless_security_clear_groups; nm_setting_wireless_security_clear_pairwise; nm_setting_wireless_security_clear_protos; @@ -329,8 +360,8 @@ global: nm_setting_wireless_security_get_auth_alg; nm_setting_wireless_security_get_group; nm_setting_wireless_security_get_key_mgmt; - nm_setting_wireless_security_get_leap_username; nm_setting_wireless_security_get_leap_password; + nm_setting_wireless_security_get_leap_username; nm_setting_wireless_security_get_num_groups; nm_setting_wireless_security_get_num_pairwise; nm_setting_wireless_security_get_num_protos; @@ -346,23 +377,15 @@ global: nm_setting_wireless_security_remove_pairwise; nm_setting_wireless_security_remove_proto; nm_setting_wireless_security_set_wep_key; - nm_setting_olpc_mesh_error_quark; - nm_setting_olpc_mesh_error_get_type; - nm_setting_olpc_mesh_get_type; - nm_setting_olpc_mesh_get_ssid; - nm_setting_olpc_mesh_get_channel; - nm_setting_olpc_mesh_get_dhcp_anycast_address; - nm_setting_olpc_mesh_new; nm_utils_deinit; - nm_utils_rsa_key_encrypt; nm_utils_escape_ssid; nm_utils_gvalue_hash_dup; nm_utils_init; nm_utils_ip4_addresses_from_gvalue; nm_utils_ip4_addresses_to_gvalue; + nm_utils_ip4_get_default_prefix; nm_utils_ip4_netmask_to_prefix; nm_utils_ip4_prefix_to_netmask; - nm_utils_ip4_get_default_prefix; nm_utils_ip4_routes_from_gvalue; nm_utils_ip4_routes_to_gvalue; nm_utils_ip6_addresses_from_gvalue; @@ -370,40 +393,17 @@ global: nm_utils_ip6_routes_from_gvalue; nm_utils_ip6_routes_to_gvalue; nm_utils_is_empty_ssid; + nm_utils_rsa_key_encrypt; nm_utils_same_ssid; nm_utils_security_valid; nm_utils_slist_free; nm_utils_ssid_to_utf8; nm_utils_uuid_generate; nm_utils_uuid_generate_from_string; - nm_utils_wifi_freq_to_channel; nm_utils_wifi_channel_to_freq; nm_utils_wifi_find_next_channel; + nm_utils_wifi_freq_to_channel; nm_utils_wifi_is_channel_valid; - nm_ip4_address_compare; - nm_ip4_address_dup; - nm_ip4_address_get_address; - nm_ip4_address_get_prefix; - nm_ip4_address_get_gateway; - nm_ip4_address_new; - nm_ip4_address_ref; - nm_ip4_address_set_address; - nm_ip4_address_set_prefix; - nm_ip4_address_set_gateway; - nm_ip4_address_unref; - nm_ip4_route_compare; - nm_ip4_route_dup; - nm_ip4_route_get_dest; - nm_ip4_route_get_prefix; - nm_ip4_route_get_next_hop; - nm_ip4_route_get_metric; - nm_ip4_route_new; - nm_ip4_route_ref; - nm_ip4_route_unref; - nm_ip4_route_set_dest; - nm_ip4_route_set_prefix; - nm_ip4_route_set_next_hop; - nm_ip4_route_set_metric; local: *; }; diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c index 9c3662f4..7f40fc7e 100644 --- a/libnm-util/nm-utils.c +++ b/libnm-util/nm-utils.c @@ -272,13 +272,12 @@ gboolean nm_utils_init (GError **error) { if (!initialized) { + initialized = TRUE; + if (!crypto_init (error)) return FALSE; _nm_utils_register_value_transformations (); - - atexit (nm_utils_deinit); - initialized = TRUE; } return TRUE; } diff --git a/libnm-util/tests/Makefile.in b/libnm-util/tests/Makefile.in index 766aa979..ab69399a 100644 --- a/libnm-util/tests/Makefile.in +++ b/libnm-util/tests/Makefile.in @@ -45,7 +45,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/libnm-util/tests/certs/Makefile.in b/libnm-util/tests/certs/Makefile.in index d49619f7..0821f71d 100644 --- a/libnm-util/tests/certs/Makefile.in +++ b/libnm-util/tests/certs/Makefile.in @@ -50,7 +50,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/m4/nls.m4 b/m4/nls.m4 new file mode 100644 index 00000000..7967cc2f --- /dev/null +++ b/m4/nls.m4 @@ -0,0 +1,31 @@ +# nls.m4 serial 3 (gettext-0.15) +dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Authors: +dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. +dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. + +AC_PREREQ(2.50) + +AC_DEFUN([AM_NLS], +[ + AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE(nls, + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT($USE_NLS) + AC_SUBST(USE_NLS) +]) diff --git a/man/Makefile.in b/man/Makefile.in index 0be51b3c..ee9bab8e 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -45,7 +45,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/marshallers/Makefile.in b/marshallers/Makefile.in index f299d460..e3c481c4 100644 --- a/marshallers/Makefile.in +++ b/marshallers/Makefile.in @@ -42,7 +42,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/policy/Makefile.in b/policy/Makefile.in index c5aef572..78be10df 100644 --- a/policy/Makefile.in +++ b/policy/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/src/Makefile.in b/src/Makefile.in index bf489591..3b8cc961 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -46,7 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/src/backends/Makefile.in b/src/backends/Makefile.in index 3a640dc8..2f6869a2 100644 --- a/src/backends/Makefile.in +++ b/src/backends/Makefile.in @@ -55,7 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/src/bluez-manager/Makefile.in b/src/bluez-manager/Makefile.in index f7ca0b4d..fad2ec6e 100644 --- a/src/bluez-manager/Makefile.in +++ b/src/bluez-manager/Makefile.in @@ -42,7 +42,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/src/dhcp-manager/Makefile.in b/src/dhcp-manager/Makefile.in index 73302319..cf331d6f 100644 --- a/src/dhcp-manager/Makefile.in +++ b/src/dhcp-manager/Makefile.in @@ -42,7 +42,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/src/dhcp-manager/nm-dhcp-client.c b/src/dhcp-manager/nm-dhcp-client.c index 3a8b1940..4c19b300 100644 --- a/src/dhcp-manager/nm-dhcp-client.c +++ b/src/dhcp-manager/nm-dhcp-client.c @@ -1227,7 +1227,7 @@ ip6_options_to_config (NMDHCPClient *self) if (str) { if (!inet_pton (AF_INET6, str, &tmp_addr)) { nm_log_warn (LOGD_DHCP6, "(%s): DHCP returned invalid address '%s'", - priv->iface); + priv->iface, str); goto error; } diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c index f3c1e84f..8ef961fa 100644 --- a/src/dhcp-manager/nm-dhcp-manager.c +++ b/src/dhcp-manager/nm-dhcp-manager.c @@ -235,19 +235,19 @@ nm_dhcp_manager_handle_event (DBusGProxy *proxy, client = get_client_for_pid (manager, (GPid) temp); if (client == NULL) { - nm_log_warn (LOGD_DHCP, "(pid %d) unhandled DHCP event for interface %s", temp, iface); + nm_log_warn (LOGD_DHCP, "(pid %ld) unhandled DHCP event for interface %s", temp, iface); goto out; } if (strcmp (iface, nm_dhcp_client_get_iface (client))) { - nm_log_warn (LOGD_DHCP, "(pid %d) received DHCP event from unexpected interface '%s' (expected '%s')", + nm_log_warn (LOGD_DHCP, "(pid %ld) received DHCP event from unexpected interface '%s' (expected '%s')", temp, iface, nm_dhcp_client_get_iface (client)); goto out; } reason = get_option (options, "reason"); if (reason == NULL) { - nm_log_warn (LOGD_DHCP, "(pid %d) DHCP event didn't have a reason", temp); + nm_log_warn (LOGD_DHCP, "(pid %ld) DHCP event didn't have a reason", temp); goto out; } diff --git a/src/dhcp-manager/tests/Makefile.in b/src/dhcp-manager/tests/Makefile.in index 233cd504..e1393aa8 100644 --- a/src/dhcp-manager/tests/Makefile.in +++ b/src/dhcp-manager/tests/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/src/dns-manager/Makefile.in b/src/dns-manager/Makefile.in index 69b76815..78d4765a 100644 --- a/src/dns-manager/Makefile.in +++ b/src/dns-manager/Makefile.in @@ -42,7 +42,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/src/dns-manager/nm-dns-plugin.c b/src/dns-manager/nm-dns-plugin.c index f7d65a52..ae230ada 100644 --- a/src/dns-manager/nm-dns-plugin.c +++ b/src/dns-manager/nm-dns-plugin.c @@ -205,7 +205,7 @@ ensure_killed (gpointer data) /* ensure the child is reaped */ nm_log_dbg (LOGD_DNS, "waiting for %s pid %d to exit", info->progname, info->pid); waitpid (info->pid, NULL, 0); - nm_log_dbg (LOGD_DNS, "dnsmasq pid %d cleaned up", info->progname, info->pid); + nm_log_dbg (LOGD_DNS, "dnsmasq pid %d cleaned up", info->pid); g_free (info->progname); g_free (info); diff --git a/src/dnsmasq-manager/Makefile.in b/src/dnsmasq-manager/Makefile.in index fb62d61b..d158168f 100644 --- a/src/dnsmasq-manager/Makefile.in +++ b/src/dnsmasq-manager/Makefile.in @@ -42,7 +42,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/src/ip6-manager/Makefile.in b/src/ip6-manager/Makefile.in index 1e8da3da..d7190e93 100644 --- a/src/ip6-manager/Makefile.in +++ b/src/ip6-manager/Makefile.in @@ -42,7 +42,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/src/ip6-manager/nm-ip6-manager.c b/src/ip6-manager/nm-ip6-manager.c index 7ffa2d1f..0eb40302 100644 --- a/src/ip6-manager/nm-ip6-manager.c +++ b/src/ip6-manager/nm-ip6-manager.c @@ -701,7 +701,7 @@ process_nduseropt_rdnss (NMIP6Device *device, struct nd_opt_hdr *opt) cur_server->expires = server.expires; if (server.expires > 0) { - nm_log_dbg (LOGD_IP6, "(%s): refreshing RA-provided nameserver %s (expires in %d seconds)", + nm_log_dbg (LOGD_IP6, "(%s): refreshing RA-provided nameserver %s (expires in %ld seconds)", device->iface, buf, server.expires - now); break; @@ -720,7 +720,7 @@ process_nduseropt_rdnss (NMIP6Device *device, struct nd_opt_hdr *opt) if (i < device->rdnss_servers->len) continue; - nm_log_dbg (LOGD_IP6, "(%s): found RA-provided nameserver %s (expires in %d seconds)", + nm_log_dbg (LOGD_IP6, "(%s): found RA-provided nameserver %s (expires in %ld seconds)", device->iface, buf, server.expires - now); server.addr = *addr; @@ -843,7 +843,7 @@ process_nduseropt_dnssl (NMIP6Device *device, struct nd_opt_hdr *opt) cur_domain->expires = domain.expires; if (domain.expires > 0) { - nm_log_dbg (LOGD_IP6, "(%s): refreshing RA-provided domain %s (expires in %d seconds)", + nm_log_dbg (LOGD_IP6, "(%s): refreshing RA-provided domain %s (expires in %ld seconds)", device->iface, domain_str, domain.expires - now); break; @@ -862,7 +862,7 @@ process_nduseropt_dnssl (NMIP6Device *device, struct nd_opt_hdr *opt) if (i < device->dnssl_domains->len) continue; - nm_log_dbg (LOGD_IP6, "(%s): found RA-provided domain %s (expires in %d seconds)", + nm_log_dbg (LOGD_IP6, "(%s): found RA-provided domain %s (expires in %ld seconds)", device->iface, domain_str, domain.expires - now); g_assert (strlen (domain_str) < sizeof (domain.domain)); diff --git a/src/logging/Makefile.in b/src/logging/Makefile.in index 48a29b8f..2bc4cbac 100644 --- a/src/logging/Makefile.in +++ b/src/logging/Makefile.in @@ -42,7 +42,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/src/logging/nm-logging.c b/src/logging/nm-logging.c index c5f57a13..34884507 100644 --- a/src/logging/nm-logging.c +++ b/src/logging/nm-logging.c @@ -215,12 +215,13 @@ nm_logging_level_enabled (guint32 level) return !!(log_level & level); } -void _nm_log (const char *loc, - const char *func, - guint32 domain, - guint32 level, - const char *fmt, - ...) +void +_nm_log (const char *loc, + const char *func, + guint32 domain, + guint32 level, + const char *fmt, + ...) { va_list args; char *msg; diff --git a/src/logging/nm-logging.h b/src/logging/nm-logging.h index e4abcf75..b23f83a3 100644 --- a/src/logging/nm-logging.h +++ b/src/logging/nm-logging.h @@ -69,24 +69,27 @@ GQuark nm_logging_error_quark (void); GType nm_logging_error_get_type (void); -#define nm_log_err(domain, fmt, args...) \ - { _nm_log (G_STRLOC, G_STRFUNC, domain, LOGL_ERR, fmt, ##args); } +#define nm_log_err(domain, ...) \ + _nm_log (G_STRLOC, G_STRFUNC, domain, LOGL_ERR, ## __VA_ARGS__ ) -#define nm_log_warn(domain, fmt, args...) \ - { _nm_log (G_STRLOC, G_STRFUNC, domain, LOGL_WARN, fmt, ##args); } +#define nm_log_warn(domain, ...) \ + _nm_log (G_STRLOC, G_STRFUNC, domain, LOGL_WARN, ## __VA_ARGS__ ) -#define nm_log_info(domain, fmt, args...) \ - { _nm_log (G_STRLOC, G_STRFUNC, domain, LOGL_INFO, fmt, ##args); } +#define nm_log_info(domain, ...) \ + _nm_log (G_STRLOC, G_STRFUNC, domain, LOGL_INFO, ## __VA_ARGS__ ) -#define nm_log_dbg(domain, fmt, args...) \ - { _nm_log (G_STRLOC, G_STRFUNC, domain, LOGL_DEBUG, fmt, ##args); } +#define nm_log_dbg(domain, ...) \ + _nm_log (G_STRLOC, G_STRFUNC, domain, LOGL_DEBUG, ## __VA_ARGS__ ) -#define nm_log(domain, level, fmt, args...) \ - { _nm_log (G_STRLOC, G_STRFUNC, domain, level, fmt, ##args); } +#define nm_log(domain, level, ...) \ + _nm_log (G_STRLOC, G_STRFUNC, domain, level, ## __VA_ARGS__ ) -void _nm_log (const char *loc, const char *func, - guint32 domain, guint32 level, - const char *fmt, ...); +void _nm_log (const char *loc, + const char *func, + guint32 domain, + guint32 level, + const char *fmt, + ...) __attribute__((__format__ (__printf__, 5, 6))); const char *nm_logging_level_to_string (void); char *nm_logging_domains_to_string (void); diff --git a/src/modem-manager/Makefile.in b/src/modem-manager/Makefile.in index c640df5b..5d33ee26 100644 --- a/src/modem-manager/Makefile.in +++ b/src/modem-manager/Makefile.in @@ -42,7 +42,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/src/nm-device-ethernet.c b/src/nm-device-ethernet.c index 49e58887..c4f62f39 100644 --- a/src/nm-device-ethernet.c +++ b/src/nm-device-ethernet.c @@ -371,7 +371,7 @@ _update_s390_subchannels (NMDeviceEthernet *self) priv->subchan3 = g_path_get_basename (buf); } else { nm_log_warn (LOGD_DEVICE | LOGD_HW, - "(%s): failed to read cdev link '%s': %s", + "(%s): failed to read cdev link '%s': %d", iface, cdev_path, errno); } g_free (cdev_path); @@ -681,8 +681,7 @@ _set_hw_addr (NMDeviceEthernet *self, const guint8 *addr, const char *detail) /* Do nothing if current MAC is same */ if (!memcmp (&priv->hw_addr, addr, ETH_ALEN)) { - nm_log_dbg (LOGD_DEVICE | LOGD_ETHER, "(%s): no MAC address change needed", - iface, detail, mac_str); + nm_log_dbg (LOGD_DEVICE | LOGD_ETHER, "(%s): no MAC address change needed", iface); g_free (mac_str); return TRUE; } diff --git a/src/nm-device-wifi.c b/src/nm-device-wifi.c index 451284dc..2e278c7c 100644 --- a/src/nm-device-wifi.c +++ b/src/nm-device-wifi.c @@ -772,7 +772,8 @@ supplicant_interface_release (NMDeviceWifi *self) /* Reset the scan interval to be pretty frequent when disconnected */ priv->scan_interval = SCAN_INTERVAL_MIN + SCAN_INTERVAL_STEP; nm_log_dbg (LOGD_WIFI_SCAN, "(%s): reset scanning interval to %d seconds", - nm_device_get_iface (NM_DEVICE (self))); + nm_device_get_iface (NM_DEVICE (self)), + priv->scan_interval); remove_supplicant_interface_error_handler (self); @@ -1161,8 +1162,7 @@ _set_hw_addr (NMDeviceWifi *self, const guint8 *addr, const char *detail) /* Do nothing if current MAC is same */ if (!memcmp (&priv->hw_addr, addr, ETH_ALEN)) { - nm_log_dbg (LOGD_DEVICE | LOGD_ETHER, "(%s): no MAC address change needed", - iface, detail, mac_str); + nm_log_dbg (LOGD_DEVICE | LOGD_ETHER, "(%s): no MAC address change needed", iface); g_free (mac_str); return TRUE; } @@ -1494,11 +1494,8 @@ nm_device_wifi_get_mode (NMDeviceWifi *self) break; } } else { - if (errno != ENODEV) { - nm_log_warn (LOGD_HW | LOGD_WIFI, - "(%s): error %d getting card mode", - iface, strerror (errno)); - } + if (errno != ENODEV) + nm_log_warn (LOGD_HW | LOGD_WIFI, "(%s): error %d getting card mode", iface, errno); } close (fd); @@ -1547,11 +1544,8 @@ nm_device_wifi_set_mode (NMDeviceWifi *self, const NM80211Mode mode) strncpy (wrq.ifr_name, iface, IFNAMSIZ); if (ioctl (fd, SIOCSIWMODE, &wrq) < 0) { - if (errno != ENODEV) { - nm_log_err (LOGD_HW | LOGD_WIFI, - "(%s): error setting mode %d", - iface, mode, strerror (errno)); - } + if (errno != ENODEV) + nm_log_err (LOGD_HW | LOGD_WIFI, "(%s): error setting mode %d", iface, mode); } else success = TRUE; close (fd); diff --git a/src/ppp-manager/Makefile.in b/src/ppp-manager/Makefile.in index 20cfb0ba..f8f55d2c 100644 --- a/src/ppp-manager/Makefile.in +++ b/src/ppp-manager/Makefile.in @@ -42,7 +42,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/src/supplicant-manager/Makefile.in b/src/supplicant-manager/Makefile.in index 03b05e5d..08ffaece 100644 --- a/src/supplicant-manager/Makefile.in +++ b/src/supplicant-manager/Makefile.in @@ -42,7 +42,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/src/supplicant-manager/nm-supplicant-config.c b/src/supplicant-manager/nm-supplicant-config.c index e33f67ab..6ee9c510 100644 --- a/src/supplicant-manager/nm-supplicant-config.c +++ b/src/supplicant-manager/nm-supplicant-config.c @@ -731,6 +731,7 @@ nm_supplicant_config_add_setting_8021x (NMSupplicantConfig *self, /* Wired 802.1x must always use eapol_flags=0 */ if (!add_string_val (self, "0", "eapol_flags", FALSE, FALSE)) return FALSE; + nm_supplicant_config_set_ap_scan (self, 0); } ADD_STRING_LIST_VAL (setting, 802_1x, eap_method, eap_methods, "eap", TRUE, FALSE); diff --git a/src/supplicant-manager/tests/Makefile.in b/src/supplicant-manager/tests/Makefile.in index 17113522..ac812e2e 100644 --- a/src/supplicant-manager/tests/Makefile.in +++ b/src/supplicant-manager/tests/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/src/system-settings/Makefile.in b/src/system-settings/Makefile.in index 45f4a414..a720c923 100644 --- a/src/system-settings/Makefile.in +++ b/src/system-settings/Makefile.in @@ -42,7 +42,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/src/system-settings/nm-sysconfig-settings.c b/src/system-settings/nm-sysconfig-settings.c index 75ac9879..1a1fc6fd 100644 --- a/src/system-settings/nm-sysconfig-settings.c +++ b/src/system-settings/nm-sysconfig-settings.c @@ -922,7 +922,6 @@ permission_call_done (GObject *object, GAsyncResult *result, gpointer user_data) /* Some random error happened */ if (error) { nm_log_err (LOGD_SYS_SET, "error checking '%s' permission: (%d) %s", - __FILE__, __LINE__, __func__, call->pk_action, error ? error->code : -1, error && error->message ? error->message : "(unknown)"); diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in index 46a75b25..1b9c0833 100644 --- a/src/tests/Makefile.in +++ b/src/tests/Makefile.in @@ -44,7 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/src/vpn-manager/Makefile.in b/src/vpn-manager/Makefile.in index a1d72bbe..46aebbb2 100644 --- a/src/vpn-manager/Makefile.in +++ b/src/vpn-manager/Makefile.in @@ -42,7 +42,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/src/vpn-manager/nm-vpn-manager.c b/src/vpn-manager/nm-vpn-manager.c index 4b58be0d..d3cd10a8 100644 --- a/src/vpn-manager/nm-vpn-manager.c +++ b/src/vpn-manager/nm-vpn-manager.c @@ -369,6 +369,7 @@ try_add_service (NMVPNManager *self, const char *namefile) service = nm_vpn_service_new (namefile, &error); if (!service) { nm_log_warn (LOGD_VPN, "failed to load VPN service file %s: (%d) %s", + namefile, error ? error->code : -1, error && error->message ? error->message : "(unknown)"); g_clear_error (&error); @@ -377,7 +378,7 @@ try_add_service (NMVPNManager *self, const char *namefile) service_name = nm_vpn_service_get_dbus_service (service); g_hash_table_insert (priv->services, (char *) service_name, service); - nm_log_info (LOGD_VPN, "VPN: loaded %s", service_name, service); + nm_log_info (LOGD_VPN, "VPN: loaded %s", service_name); } static void @@ -409,7 +410,7 @@ vpn_dir_changed (GFileMonitor *monitor, /* Stop active VPN connections and destroy the service */ nm_vpn_service_connections_stop (service, TRUE, NM_VPN_CONNECTION_STATE_REASON_SERVICE_STOPPED); - nm_log_info (LOGD_VPN, "VPN: unloaded %s", service_name, service); + nm_log_info (LOGD_VPN, "VPN: unloaded %s", service_name); g_hash_table_remove (priv->services, service_name); } break; diff --git a/src/wpa.c b/src/wpa.c index 5f4fd024..7d0e2261 100644 --- a/src/wpa.c +++ b/src/wpa.c @@ -447,7 +447,7 @@ wpa_ie_data * wpa_parse_wpa_ie(const u8 *wpa_ie, size_t wpa_ie_len) nm_log_dbg (LOGD_WIFI, " key mgmt 0x%X", data->key_mgmt); nm_log_dbg (LOGD_WIFI, " capabilities 0x%X", data->capabilities); nm_log_dbg (LOGD_WIFI, " # pmkid 0x%X", data->num_pmkid); - nm_log_dbg (LOGD_WIFI, ""); + nm_log_dbg (LOGD_WIFI, " "); } return data; diff --git a/system-settings/Makefile.in b/system-settings/Makefile.in index 5defd4f3..51703aac 100644 --- a/system-settings/Makefile.in +++ b/system-settings/Makefile.in @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/system-settings/plugins/Makefile.in b/system-settings/plugins/Makefile.in index c4f7fa63..16a39882 100644 --- a/system-settings/plugins/Makefile.in +++ b/system-settings/plugins/Makefile.in @@ -46,7 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/system-settings/plugins/ifcfg-rh/Makefile.in b/system-settings/plugins/ifcfg-rh/Makefile.in index 9d79e8e9..970b8884 100644 --- a/system-settings/plugins/ifcfg-rh/Makefile.in +++ b/system-settings/plugins/ifcfg-rh/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/system-settings/plugins/ifcfg-rh/tests/Makefile.in b/system-settings/plugins/ifcfg-rh/tests/Makefile.in index ee01e1f1..34da7b60 100644 --- a/system-settings/plugins/ifcfg-rh/tests/Makefile.in +++ b/system-settings/plugins/ifcfg-rh/tests/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.in b/system-settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.in index 54080b01..7a2a324e 100644 --- a/system-settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.in +++ b/system-settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.in @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/system-settings/plugins/ifcfg-suse/Makefile.in b/system-settings/plugins/ifcfg-suse/Makefile.in index 9c948c1b..c0ded70e 100644 --- a/system-settings/plugins/ifcfg-suse/Makefile.in +++ b/system-settings/plugins/ifcfg-suse/Makefile.in @@ -42,7 +42,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/system-settings/plugins/ifnet/Makefile.in b/system-settings/plugins/ifnet/Makefile.in index c5047f5b..73a6e48f 100644 --- a/system-settings/plugins/ifnet/Makefile.in +++ b/system-settings/plugins/ifnet/Makefile.in @@ -42,7 +42,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/system-settings/plugins/ifnet/tests/Makefile.in b/system-settings/plugins/ifnet/tests/Makefile.in index 39d49b4e..2a1b9897 100644 --- a/system-settings/plugins/ifnet/tests/Makefile.in +++ b/system-settings/plugins/ifnet/tests/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/system-settings/plugins/ifupdown/Makefile.in b/system-settings/plugins/ifupdown/Makefile.in index 590d62a3..cc2a40ce 100644 --- a/system-settings/plugins/ifupdown/Makefile.in +++ b/system-settings/plugins/ifupdown/Makefile.in @@ -42,7 +42,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/system-settings/plugins/ifupdown/tests/Makefile.in b/system-settings/plugins/ifupdown/tests/Makefile.in index b6db0bdc..1f0134be 100644 --- a/system-settings/plugins/ifupdown/tests/Makefile.in +++ b/system-settings/plugins/ifupdown/tests/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/system-settings/plugins/keyfile/Makefile.in b/system-settings/plugins/keyfile/Makefile.in index 96172ca3..13fe6074 100644 --- a/system-settings/plugins/keyfile/Makefile.in +++ b/system-settings/plugins/keyfile/Makefile.in @@ -42,7 +42,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/system-settings/plugins/keyfile/tests/Makefile.in b/system-settings/plugins/keyfile/tests/Makefile.in index 8a80502c..f70cc3ef 100644 --- a/system-settings/plugins/keyfile/tests/Makefile.in +++ b/system-settings/plugins/keyfile/tests/Makefile.in @@ -43,7 +43,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/system-settings/plugins/keyfile/tests/keyfiles/Makefile.in b/system-settings/plugins/keyfile/tests/keyfiles/Makefile.in index 9f821d20..562e1a4a 100644 --- a/system-settings/plugins/keyfile/tests/keyfiles/Makefile.in +++ b/system-settings/plugins/keyfile/tests/keyfiles/Makefile.in @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/test/Makefile.in b/test/Makefile.in index 64a31543..b65f1647 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -44,7 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d diff --git a/tools/Makefile.am b/tools/Makefile.am index 17dc6146..09a3f0ed 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1 +1 @@ -EXTRA_DIST = doc-generator.xsl +EXTRA_DIST = doc-generator.xsl check-exports.sh diff --git a/tools/Makefile.in b/tools/Makefile.in index f51c7422..489fc662 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -41,7 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \ $(top_srcdir)/m4/libnl-check.m4 $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -243,7 +243,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = doc-generator.xsl +EXTRA_DIST = doc-generator.xsl check-exports.sh all: all-am .SUFFIXES: diff --git a/tools/check-exports.sh b/tools/check-exports.sh new file mode 100755 index 00000000..1415e144 --- /dev/null +++ b/tools/check-exports.sh @@ -0,0 +1,25 @@ +#!/bin/sh + +LC_ALL=C +export LC_ALL + +stat=0 +so=$1 +def=$2 + +# Have to prefix with a tab and suffix with a ';' to match .ver file format +get_syms='( objdump -t "$so" | grep "^[^ ]* [^l.*]*[.]"; objdump -t "$so" | grep "[.]hidden.*"; ) | sed "s/.* //" | sed "s/^/\t/" | sed "s/$/;/"' + +echo $so: checking exported symbols against $def + +{ + echo "{" + echo "global:" + eval $get_syms | sort -u + echo "local:" + echo " *;" + echo "};" +} | diff -u "$def" - >&2 || stat=1 + +exit $stat + |