November 2013 - openSUSE Commits - openSUSE Mailing Lists

commit MozillaThunderbird for openSUSE:12.2:Update
by root＠hilbert.suse.de 07 Nov '13

07 Nov '13

Hello community, here is the log from the commit of package MozillaThunderbird for openSUSE:12.2:Update checked in at 2013-11-07 09:53:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2:Update/MozillaThunderbird (Old) and /work/SRC/openSUSE:12.2:Update/.MozillaThunderbird.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaThunderbird" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.ZQ0fOU/_old 2013-11-07 09:53:31.000000000 +0100 +++ /var/tmp/diff_new_pack.ZQ0fOU/_new 2013-11-07 09:53:31.000000000 +0100 @@ -1 +1 @@ -<link package='MozillaThunderbird.2015' cicount='copy' /> +<link package='MozillaThunderbird.2157' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit MozillaFirefox for openSUSE:12.3:Update
by root＠hilbert.suse.de 07 Nov '13

07 Nov '13

Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:12.3:Update checked in at 2013-11-07 09:53:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/MozillaFirefox (Old) and /work/SRC/openSUSE:12.3:Update/.MozillaFirefox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaFirefox" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.2x9aQU/_old 2013-11-07 09:53:26.000000000 +0100 +++ /var/tmp/diff_new_pack.2x9aQU/_new 2013-11-07 09:53:26.000000000 +0100 @@ -1 +1 @@ -<link package='MozillaFirefox.2014' cicount='copy' /> +<link package='MozillaFirefox.2157' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit MozillaFirefox for openSUSE:12.2:Update
by root＠hilbert.suse.de 07 Nov '13

07 Nov '13

Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:12.2:Update checked in at 2013-11-07 09:53:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2:Update/MozillaFirefox (Old) and /work/SRC/openSUSE:12.2:Update/.MozillaFirefox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaFirefox" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.7NiLQ8/_old 2013-11-07 09:53:21.000000000 +0100 +++ /var/tmp/diff_new_pack.7NiLQ8/_new 2013-11-07 09:53:21.000000000 +0100 @@ -1 +1 @@ -<link package='MozillaFirefox.2014' cicount='copy' /> +<link package='MozillaFirefox.2157' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit MozillaFirefox.2157 for openSUSE:12.2:Update
by root＠hilbert.suse.de 07 Nov '13

07 Nov '13

Hello community, here is the log from the commit of package MozillaFirefox.2157 for openSUSE:12.2:Update checked in at 2013-11-07 09:53:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2:Update/MozillaFirefox.2157 (Old) and /work/SRC/openSUSE:12.2:Update/.MozillaFirefox.2157.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaFirefox.2157" Changes: -------- New Changes file: --- /dev/null 2013-10-11 12:16:15.204037506 +0200 +++ /work/SRC/openSUSE:12.2:Update/.MozillaFirefox.2157.new/MozillaFirefox.changes 2013-11-07 09:53:13.000000000 +0100 @@ -0,0 +1,3314 @@ +------------------------------------------------------------------- +Thu Oct 24 18:16:19 UTC 2013 - wr(a)rosenauer.org + +- update to Firefox 25.0 (bnc#847708) + * rebased patches + * requires NSS 3.15.2 or above + * MFSA 2013-93/CVE-2013-5590/CVE-2013-5591/CVE-2013-5592 + Miscellaneous memory safety hazards + * MFSA 2013-94/CVE-2013-5593 (bmo#868327) + Spoofing addressbar through SELECT element + * MFSA 2013-95/CVE-2013-5604 (bmo#914017) + Access violation with XSLT and uninitialized data + * MFSA 2013-96/CVE-2013-5595 (bmo#916580) + Improperly initialized memory and overflows in some JavaScript + functions + * MFSA 2013-97/CVE-2013-5596 (bmo#910881) + Writing to cycle collected object during image decoding + * MFSA 2013-98/CVE-2013-5597 (bmo#918864) + Use-after-free when updating offline cache + * MFSA 2013-99/CVE-2013-5598 (bmo#920515) + Security bypass of PDF.js checks using iframes + * MFSA 2013-100/CVE-2013-5599/CVE-2013-5600/CVE-2013-5601 + (bmo#915210, bmo#915576, bmo#916685) + Miscellaneous use-after-free issues found through ASAN fuzzing + * MFSA 2013-101/CVE-2013-5602 (bmo#897678) + Memory corruption in workers + * MFSA 2013-102/CVE-2013-5603 (bmo#916404) + Use-after-free in HTML document templates + +------------------------------------------------------------------- +Tue Sep 24 07:31:30 UTC 2013 - wr(a)rosenauer.org + +- as GStreamer is not automatically required anymore but loaded + dynamically if available, require it explicitely +- recommend optional GStreamer plugins for comprehensive media + support + +------------------------------------------------------------------- +Mon Sep 16 11:59:18 UTC 2013 - lnussel(a)suse.de + +- move greek to the translations-common package (bnc#840551) + +------------------------------------------------------------------- +Sat Sep 14 14:39:58 UTC 2013 - wr(a)rosenauer.org + +- update to Firefox 24.0 (bnc#840485) + * MFSA 2013-76/CVE-2013-1718/CVE-2013-1719 + Miscellaneous memory safety hazards + * MFSA 2013-77/CVE-2013-1720 (bmo#888820) + Improper state in HTML5 Tree Builder with templates + * MFSA 2013-78/CVE-2013-1721 (bmo#890277) + Integer overflow in ANGLE library + * MFSA 2013-79/CVE-2013-1722 (bmo#893308) + Use-after-free in Animation Manager during stylesheet cloning + * MFSA 2013-80/CVE-2013-1723 (bmo#891292) + NativeKey continues handling key messages after widget is destroyed + * MFSA 2013-81/CVE-2013-1724 (bmo#894137) + Use-after-free with select element + * MFSA 2013-82/CVE-2013-1725 (bmo#876762) + Calling scope for new Javascript objects can lead to memory corruption + * MFSA 2013-85/CVE-2013-1728 (bmo#883686) + Uninitialized data in IonMonkey + * MFSA 2013-88/CVE-2013-1730 (bmo#851353) + Compartment mismatch re-attaching XBL-backed nodes + * MFSA 2013-89/CVE-2013-1732 (bmo#883514) + Buffer overflow with multi-column, lists, and floats + * MFSA 2013-90/CVE-2013-1735/CVE-2013-1736 (bmo#898871, bmo#906301) + Memory corruption involving scrolling + * MFSA 2013-91/CVE-2013-1737 (bmo#907727) + User-defined properties on DOM proxies get the wrong "this" object + * MFSA 2013-92/CVE-2013-1738 (bmo#887334, bmo#882897) + GC hazard with default compartments and frame chain restoration +- enable gstreamer explicitely via pref (gecko.js) +- require NSS 3.15.1 + +------------------------------------------------------------------- +Mon Aug 26 07:35:36 UTC 2013 - wr(a)rosenauer.org + +- update to Firefox 23.0.1 + * Audio static/"burble"/breakup in Firefox to Firefox WebRTC calls + (bmo#901527) + +------------------------------------------------------------------- +Sun Aug 4 18:30:11 UTC 2013 - wr(a)rosenauer.org + +- update to Firefox 23.0 (bnc#833389) + * MFSA 2013-63/CVE-2013-1701/CVE-2013-1702 + Miscellaneous memory safety hazards + * MFSA 2013-64/CVE-2013-1704 (bmo#883313) + Use after free mutating DOM during SetBody + * MFSA 2013-65/CVE-2013-1705 (bmo#882865) + Buffer underflow when generating CRMF requests + * MFSA 2013-67/CVE-2013-1708 (bmo#879924) + Crash during WAV audio file decoding + * MFSA 2013-68/CVE-2013-1709 (bmo#838253) + Document URI misrepresentation and masquerading + * MFSA 2013-69/CVE-2013-1710 (bmo#871368) + CRMF requests allow for code execution and XSS attacks + * MFSA 2013-70/CVE-2013-1711 (bmo#843829) + Bypass of XrayWrappers using XBL Scopes + * MFSA 2013-72/CVE-2013-1713 (bmo#887098) + Wrong principal used for validating URI for some Javascript + components + * MFSA 2013-73/CVE-2013-1714 (bmo#879787) + Same-origin bypass with web workers and XMLHttpRequest + * MFSA 2013-75/CVE-2013-1717 (bmo#406541, bmo#738397) + Local Java applets may read contents of local file system +- requires NSPR 4.10 and NSS 3.15 + +------------------------------------------------------------------- +Wed Jul 3 17:14:35 UTC 2013 - dmueller(a)suse.com + +- fix build on ARM (/-g/ matches /-grecord-switches/) + +------------------------------------------------------------------- +Sat Jun 22 17:48:06 UTC 2013 - wr(a)rosenauer.org + +- update to Firefox 22.0 (bnc#825935) + * removed obsolete patches + + mozilla-qcms-ppc.patch + + mozilla-gstreamer-760140.patch + * GStreamer support does not build on 12.1 anymore (build only + on 12.2 and later) + * MFSA 2013-49/CVE-2013-1682/CVE-2013-1683 + Miscellaneous memory safety hazards + * MFSA 2013-50/CVE-2013-1684/CVE-2013-1685/CVE-2013-1686 + Memory corruption found using Address Sanitizer + * MFSA 2013-51/CVE-2013-1687 (bmo#863933, bmo#866823) + Privileged content access and execution via XBL + * MFSA 2013-52/CVE-2013-1688 (bmo#873966) + Arbitrary code execution within Profiler + * MFSA 2013-53/CVE-2013-1690 (bmo#857883) + Execution of unmapped memory through onreadystatechange event + * MFSA 2013-54/CVE-2013-1692 (bmo#866915) + Data in the body of XHR HEAD requests leads to CSRF attacks + * MFSA 2013-55/CVE-2013-1693 (bmo#711043) + SVG filters can lead to information disclosure + * MFSA 2013-56/CVE-2013-1694 (bmo#848535) + PreserveWrapper has inconsistent behavior + * MFSA 2013-57/CVE-2013-1695 (bmo#849791) + Sandbox restrictions not applied to nested frame elements + * MFSA 2013-58/CVE-2013-1696 (bmo#761667) + X-Frame-Options ignored when using server push with multi-part + responses + * MFSA 2013-59/CVE-2013-1697 (bmo#858101) + XrayWrappers can be bypassed to run user defined methods in a + privileged context + * MFSA 2013-60/CVE-2013-1698 (bmo#876044) + getUserMedia permission dialog incorrectly displays location + * MFSA 2013-61/CVE-2013-1699 (bmo#840882) + Homograph domain spoofing in .com, .net and .name + +------------------------------------------------------------------- +Tue Jun 11 21:06:58 UTC 2013 - dvaleev(a)suse.com + +- Fix qcms altivec include (mozilla-qcms-ppc.patch) + +------------------------------------------------------------------- +Fri May 10 05:25:39 UTC 2013 - wr(a)rosenauer.org + +- update to Firefox 21.0 (bnc#819204) + * removed upstreamed patch firefox-712763.patch + * removed disabled mozilla-disable-neon-option.patch + * MFSA 2013-41/CVE-2013-0801/CVE-2013-1669 + Miscellaneous memory safety hazards + * MFSA 2013-42/CVE-2013-1670 (bmo#853709) + Privileged access for content level constructor + * MFSA 2013-43/CVE-2013-1671 (bmo#842255) + File input control has access to full path + * MFSA 2013-46/CVE-2013-1674 (bmo#860971) + Use-after-free with video and onresize event + * MFSA 2013-47/CVE-2013-1675 (bmo#866825) + Uninitialized functions in DOMSVGZoomEvent + * MFSA 2013-48/CVE-2013-1676/CVE-2013-1677/CVE-2013-1678/ + CVE-2013-1679/CVE-2013-1680/CVE-2013-1681 + Memory corruption found using Address Sanitizer + +------------------------------------------------------------------- +Tue Apr 9 06:41:31 UTC 2013 - wr(a)rosenauer.org + +- revert to use GStreamer 0.10 on 12.3 (bnc#814101) + (remove mozilla-gstreamer-1.patch) + +------------------------------------------------------------------- +Fri Apr 5 17:04:11 UTC 2013 - schwab(a)linux-m68k.org + +- Explicitly disable WebRTC support on non-x86, the configure script + disables it only half-heartedly + +------------------------------------------------------------------- +Fri Mar 29 22:15:21 UTC 2013 - wr(a)rosenauer.org + +- update to Firefox 20.0 (bnc#813026) + * requires NSPR 4.9.5 and NSS 3.14.3 + * mozilla-webrtc-ppc.patch included upstream + * MFSA 2013-30/CVE-2013-0788/CVE-2013-0789 + Miscellaneous memory safety hazards ++++ 3117 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.2:Update/.MozillaFirefox.2157.new/MozillaFirefox.changes New: ---- MozillaFirefox-rpmlintrc MozillaFirefox.changes MozillaFirefox.desktop MozillaFirefox.spec _constraints add-plugins.sh.in compare-locales.tar.bz2 create-tar.sh find-external-requires.sh firefox-25.0-source.tar.bz2 firefox-branded-icons.patch firefox-browser-css.patch firefox-kde-114.patch firefox-kde.patch firefox-mimeinfo.xml firefox-multilocale-chrome.patch firefox-no-default-ualocale.patch firefox.1 firefox.js gecko.js kde.js l10n-25.0.tar.bz2 mozilla-arm-disable-edsp.patch mozilla-get-app-id mozilla-kde.patch mozilla-language.patch mozilla-libproxy-compat.patch mozilla-nongnome-proxies.patch mozilla-ntlm-full-path.patch mozilla-ppc.patch mozilla-prefer_plugin_pref.patch mozilla-preferences.patch mozilla-repo.patch mozilla-shared-nss-db.patch mozilla-sle11.patch mozilla.sh.in source-stamp.txt toolkit-download-folder.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ ++++ 638 lines (skipped) ++++++ MozillaFirefox-rpmlintrc ++++++ addFilter("no-jar-manifest") ++++++ MozillaFirefox.desktop ++++++ [Desktop Entry] Encoding=UTF-8 Name=Firefox GenericName=Web Browser Comment=Web Browser TryExec=firefox Exec=firefox %u Icon=firefox Terminal=false StartupNotify=true MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;application/x-xpinstall;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp; Type=Application ++++++ add-plugins.sh.in ++++++ #! /bin/sh # Copyright (c) 2008 Wolfgang Rosenauer. All rights reserved. # # check if we are started as root # only one of UID and USER must be set correctly if test "$UID" != 0 -a "$USER" != root; then echo "You must be root to start $0." exit 1 fi PREFIX="%PROGDIR" # dictionaries MYSPELL=/usr/share/myspell MOZ_SPELL=$PREFIX/dictionaries if [ -d $MOZ_SPELL ] ; then if [ -d $MYSPELL ] ; then for dict in $MYSPELL/??[-_]??.aff ; do # check is it is really the file or it is a string which contain '??_??' if ! [ -e $dict ] ; then continue fi # the dict file name dict_file=`echo ${dict##*/}` # the dict file has a valid name lang=`echo ${dict_file:0:2}` country=`echo ${dict_file:3:2}` # check for .dic file if [ ! -r $MYSPELL/${lang}[-_]${country}.dic ] ; then continue fi # create links if [ ! -r $MOZ_SPELL/${lang}[-_]${country}.aff ] ; then ln -sf $MYSPELL/${lang}[-_]${country}.aff \ $MOZ_SPELL/${lang}-${country}.aff fi if [ ! -r $MOZ_SPELL/${lang}[-_]${country}.dic ] ; then ln -sf $MYSPELL/${lang}[-_]${country}.dic \ $MOZ_SPELL/${lang}-${country}.dic fi done echo "-> added myspell dictionaries" fi # remove broken links for dict in $MOZ_SPELL/*.{aff,dic} ; do if ! [ -r $dict ] ; then rm -f $dict fi done fi ++++++ create-tar.sh ++++++ #!/bin/bash CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" RELEASE_TAG="FIREFOX_25_0_RELEASE" VERSION="25.0" # mozilla if [ -d mozilla ]; then pushd mozilla _repourl=$(hg paths) case "$_repourl" in *$BRANCH*) echo "updating previous tree" hg pull popd ;; * ) echo "removing obsolete tree" popd rm -rf mozilla ;; esac fi if [ ! -d mozilla ]; then echo "cloning new $BRANCH..." hg clone http://hg.mozilla.org/$BRANCH mozilla fi pushd mozilla hg update --check [ "$RELEASE_TAG" == "default" ] || hg update -r $RELEASE_TAG # get repo and source stamp echo -n "REV=" > ../source-stamp.txt hg -R . parent --template="{node|short}\n" >> ../source-stamp.txt echo -n "REPO=" >> ../source-stamp.txt hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" >> ../source-stamp.txt popd echo "creating archive..." tar cjf firefox-$VERSION-source.tar.bz2 --exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=CVS mozilla # l10n echo "fetching locales..." test ! -d l10n && mkdir l10n for locale in $(awk '{ print $1; }' mozilla/browser/locales/shipped-locales); do case $locale in ja-JP-mac|en-US) ;; *) echo "fetching $locale ..." hg clone http://hg.mozilla.org/releases/l10n/mozilla-$CHANNEL/$locale l10n/$locale [ "$RELEASE_TAG" == "default" ] || hg -R l10n/$locale up -C -r $RELEASE_TAG ;; esac done echo "creating l10n archive..." tar cjf l10n-$VERSION.tar.bz2 --exclude=.hgtags --exclude=.hgignore --exclude=.hg l10n # compare-locales echo "creating compare-locales" hg clone http://hg.mozilla.org/build/compare-locales tar cjf compare-locales.tar.bz2 --exclude=.hgtags --exclude=.hgignore --exclude=.hg compare-locales ++++++ find-external-requires.sh ++++++ #!/bin/sh # Finds requirements provided outside of the current file set filelist=$( sed "s/[]['\"*?{}]/\\\\\&/g" ) provides=$( echo "$filelist" | /usr/lib/rpm/find-provides ) echo "$filelist" \ | /usr/lib/rpm/find-requires \ | grep -F -v "$provides" \ | sort -u ++++++ firefox-branded-icons.patch ++++++ # HG changeset patch # Parent 5defe7bd2f041c227fe4a65f8a90e6cc42a9a339 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in @@ -133,16 +133,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d endif ifdef MOZ_WIDGET_GTK libs:: $(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(FINAL_TARGET)/icons $(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(FINAL_TARGET)/chrome/icons/default $(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png $(FINAL_TARGET)/chrome/icons/default $(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(FINAL_TARGET)/chrome/icons/default +ifdef MOZ_OFFICIAL_BRANDING + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default22.png $(FINAL_TARGET)/chrome/icons/default + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default24.png $(FINAL_TARGET)/chrome/icons/default + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default256.png $(FINAL_TARGET)/chrome/icons/default +endif endif libs:: $(srcdir)/profile/prefs.js $(INSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile ifndef LIBXUL_SDK # channel-prefs.js is handled separate from other prefs due to bug 756325 libs:: $(srcdir)/profile/channel-prefs.js diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in --- a/browser/branding/official/Makefile.in +++ b/browser/branding/official/Makefile.in @@ -42,18 +42,21 @@ BRANDING_FILES := \ document.icns \ dsstore \ $(NULL) endif ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) BRANDING_FILES := \ default16.png \ + default22.png \ + default24.png \ default32.png \ default48.png \ + default256.png \ mozicon128.png \ $(NULL) endif ifeq ($(OS_ARCH),OS2) BRANDING_FILES := \ firefox-os2.ico \ document-os2.ico \ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -571,18 +571,21 @@ @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png @BINPATH@/chrome/toolkit@JAREXT@ @BINPATH@/chrome/toolkit.manifest @BINPATH@/chrome/recording.manifest @BINPATH@/chrome/recording/* #ifdef MOZ_GTK @BINPATH@/browser/chrome/icons/default/default16.png +@BINPATH@/browser/chrome/icons/default/default22.png +@BINPATH@/browser/chrome/icons/default/default24.png @BINPATH@/browser/chrome/icons/default/default32.png @BINPATH@/browser/chrome/icons/default/default48.png +@BINPATH@/browser/chrome/icons/default/default256.png #endif ; shell icons #ifdef XP_UNIX #ifndef XP_MACOSX ; shell icons @BINPATH@/browser/icons/*.png #ifdef MOZ_UPDATER ++++++ firefox-browser-css.patch ++++++ From: Jakub Steiner <jimmac(a)novell.com>, Wolfgang Rosenauer <wr(a)rosenauer.org Subject: make style compatible with dark themes References: https://bugzilla.novell.com/show_bug.cgi?id=503351 https://bugzilla.mozilla.org/show_bug.cgi?id=478632 wr: changed because of https://bugzilla.novell.com/show_bug.cgi?id=561027 diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css --- a/browser/themes/linux/browser.css +++ b/browser/themes/linux/browser.css @@ -980,16 +980,30 @@ toolbar[iconsize="small"] #webrtc-status margin-top: 0; margin-bottom: 0; -moz-margin-start: 0; color: GrayText; } %include ../shared/identity-block.inc.css +#PopupAutoCompleteRichResult .autocomplete-richlistitem { + background-color: -moz-Field !important; +} + +#PopupAutoCompleteRichResult .autocomplete-richlistitem[selected="true"], +#PopupAutoCompleteRichResult .autocomplete-richlistitem[selected="true"] * { + color: HighlightText !important; + background: Highlight !important; +} + +.ac-title { + color: -moz-Fieldtext !important; +} + #page-proxy-favicon { margin-top: 2px; margin-bottom: 2px; -moz-margin-start: 4px; -moz-margin-end: 3px; -moz-image-region: rect(0, 16px, 16px, 0); } ++++++ firefox-kde-114.patch ++++++ # HG changeset patch # User Wolfgang Rosenauer <wr(a)rosenauer.org> # Parent ba2d9b1374e15e7c339a44452169d0afac2ca82e With openSUSE 11.4 the desktop file name changed from MozillaFirefox to firefox diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js --- a/browser/components/preferences/advanced.js +++ b/browser/components/preferences/advanced.js @@ -751,17 +751,17 @@ var gAdvancedPane = { if (kde_session == 1) { var shellObj = Components.classes["@mozilla.org/file/local;1"] .createInstance(Components.interfaces.nsILocalFile); shellObj.initWithPath("/usr/bin/kwriteconfig"); var process = Components.classes["@mozilla.org/process/util;1"] .createInstance(Components.interfaces.nsIProcess); process.init(shellObj); var args = ["--file", "kdeglobals", "--group", "General", "--key", - "BrowserApplication", "MozillaFirefox"]; + "BrowserApplication", "firefox"]; process.run(false, args, args.length); } let selectedIndex = shellSvc.isDefaultBrowser(false, true) ? 1 : 0; document.getElementById("setDefaultPane").selectedIndex = selectedIndex; } #endif }; ++++++ firefox-kde.patch ++++++ ++++ 1774 lines (skipped) ++++++ firefox-multilocale-chrome.patch ++++++ # HG changeset patch # Parent 020e09bf3fc6f17b3041ecf70f1376da37db8645 # User Wolfgang Rosenauer <wr(a)rosenauer.org> Add searchplugins to chrome packaging for proper localization diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -340,16 +340,20 @@ pref("browser.download.panel.shown", fal pref("browser.download.panel.firstSessionCompleted", false); // search engines URL pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/"); // pointer to the default engine name pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties"); +// Tell the search service to load search plugins from the locale JAR +pref("browser.search.loadFromJars", true); +pref("browser.search.jarURIs", "chrome://browser/locale/searchplugins/"); + // disable logging for the search service by default pref("browser.search.log", false); // Ordering of Search Engines in the Engine list. pref("browser.search.order.1", "chrome://browser-region/locale/region.properties"); pref("browser.search.order.2", "chrome://browser-region/locale/region.properties"); pref("browser.search.order.3", "chrome://browser-region/locale/region.properties"); diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in @@ -71,20 +71,22 @@ UNINSTALLER_PACKAGE_HOOK = $(RM) -r $(ST STUB_HOOK = $(NSINSTALL) -D "$(_ABS_DIST)/$(PKG_INST_PATH)"; \ $(RM) "$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe"; \ cp ../installer/windows/l10ngen/stub.exe "$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe"; \ chmod 0755 "$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe"; \ $(NULL) endif -SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt)) +SEARCHPLUGINS_NAMES = $(shell cat \ + $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \ + @srcdir@/en-US/searchplugins/list.txt ) ) SEARCHPLUGINS_PATH := $(FINAL_TARGET)/searchplugins SEARCHPLUGINS := $(addsuffix .xml,$(SEARCHPLUGINS_NAMES)) -PP_TARGETS += SEARCHPLUGINS +#PP_TARGETS += SEARCHPLUGINS # Required for l10n.mk - defines a list of app sub dirs that should # be included in langpack xpis. ifdef MOZ_METRO # metro build, include both app folders DIST_SUBDIRS = browser metro else DIST_SUBDIRS = $(DIST_SUBDIR) @@ -131,20 +133,44 @@ install:: $(addprefix generic/profile/,$ install:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME))) $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile/chrome # metro build calls back here for search engine plugins searchplugins: $(addprefix $(FINAL_TARGET)/searchplugins/,$(SEARCHPLUGINS)) .PHONY: searchplugins +tmp-search.jar.mn:: + printf "$(AB_CD).jar:" > $@ + printf "$(foreach plugin,$(SEARCHPLUGINS), \n locale/browser/searchplugins/$(plugin) ($(plugin)))" >> $@ + @echo >> $@ + +searchplugins-jar:: $(SEARCHPLUGINS) + for SEARCHPLUGIN in $^; do \ + $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \ + $$SEARCHPLUGIN > $$SEARCHPLUGIN-new ; \ + mv $$SEARCHPLUGIN-new $$SEARCHPLUGIN ; \ + done + +searchplugins-jar:: tmp-search.jar.mn + $(PYTHON) $(MOZILLA_DIR)/config/JarMaker.py \ + $(QUIET) -j $(FINAL_TARGET)/chrome \ + -s $(topsrcdir)/$(relativesrcdir)/en-US/searchplugins \ + -s $(LOCALE_SRCDIR)/searchplugins \ + $(MAKE_JARS_FLAGS) tmp-search.jar.mn + +libs:: searchplugins-jar + +GARBAGE += tmp-search.jar.mn + libs-%: $(NSINSTALL) -D $(DIST)/install @$(MAKE) -C ../../toolkit/locales libs-$* @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* + @$(MAKE) -B searchplugins-jar AB_CD=$* XPI_NAME=locale-$* ifdef MOZ_WEBAPP_RUNTIME @$(MAKE) -C ../../webapprt/locales AB_CD=$* XPI_NAME=locale-$* endif @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$* @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR) ifdef MOZ_METRO @$(MAKE) -C ../metro/locales AB_CD=$* XPI_NAME=locale-$* diff --git a/browser/locales/en-US/searchplugins/google.xml b/browser/locales/en-US/searchplugins/google.xml --- a/browser/locales/en-US/searchplugins/google.xml +++ b/browser/locales/en-US/searchplugins/google.xml @@ -9,24 +9,16 @@ <Image width="16" height="16">data:image/x-icon;base64,AAABAAIAEBAAAAAAAAB9AQAAJgAAACAgAAAAAAAA8gIAAKMBAACJUE5HDQoaCgAAAA1JSERSAAAAEAAAABAIBgAAAB/z/2EAAAFESURBVDjLpZNJSwNBEIXnt4lE4kHxovgT9BDwJHqPy0HEEOJBiAuCRg+KUdC4QS4KrpC4gCBGE3NQ48JsnZ6eZ3UOM6gjaePhQU93v6+qq2q0pqgeJj2S8EdJT1hr0OxBtKCD5iEd8QxDYpvhvOBAuMDKURX9C9aPu4GA1GEVkzvMg10UBfYveWAWgYAP00V01fa+R9M2bA51wJvhIn3qR+ybt3D3JNQBE5sMjCIOLFpoHzOwdsLRO22qA6R6kiZiWwxUvy/PUQZIhYZ1vFM9cvcOOsYNdcBgysISdSJBnZjJMlR0Fw8vAp0xoz5gao/h+NZBy4i/10XGwrPA+hmvDyhVRG2Avu/LwcrkFADZa16L1h330w1RNgc3DiJzCpPYRm1bpveXX11clQR28xwblHpk1vq1iP/5mcoS0CoXDZiL0vsJ+dzfl+3T/VYAAAAASUVORK5CYIKJUE5HDQoaCgAAAA1JSERSAAAAIAAAACAIBgAAAHN6evQAAAK5SURBVFjDxVfrSxRRFJ9/Jta/oyWjF5XQm6D6EkHRgygIIgjUTcueVgqVWSRRkppEUQYWWB8ye1iGWilWlo/Ude489s7M6Zw7D9dlt53dmd29cFiWvXvO77x+51xpaaUsoSxBaUWZQ4ECy5xji2xKZDyCMlMEw6lCNiOSgwZKJK1SkcKeSealfP64t0mBjl4Ow39MkDUL0p2RSROOtqhZdeUEYM1pBl39XCg/fEeFtWcY7G9W4csvUxjlBkCsQ4Nt9QyWVfvT6RsAKXw3aoDGATZeYIt+W1kjw7cJG0RctWDTRebbKd8A6h5pwsDb70ba3w/eUr3wt/cmwgfw6Yft4TNMQaY7o1P2ncm4FT4ANQH/jQBJ2xv7kqIXEADDql8eS3+n8bku7oxNm+EDIM/dU92upb3T/NJGeaNbDx/AsbsLRUY5Xn92caWXY5d8RV6gWllxSg4fAEnTC90DQW13BLlgXR2D3dcUeDVkwOthA1bXspxILWcm3HdThcfvufB26LcJpkOEAz9NKI/lzqpSEC7feol5EWnpSeSlIxCALUkApmULdjUqxQVAQnl3D/X/yQda4QBEq2TYc12By091MQ17Bg3R88nHKlQbVmHvj89awNBLYrwT9zXY2aBAxTkGFdiSxP/Jp6FLDw+AS7GfsdJTJ2EqSO5khD43nGfBARy/ZxOQgZHe7GPM1jzUvChUtmnBAXQPcKGMJp3fdFGq6NByEhiAO4b/YptFfQJwNyQ/bZkVQGcf90Ja25ndIyrKBOa/f8wIpwi3X1G8UcxNu7ozUS7tiH0jBswwS3RIaF1w6LYKU/ML2+8sGnjygQswtKrVIy/Qd9qQP6LnO64q4fPAKpxyZIymHo1jWk6p1ag2BsdNwQMHcC+M5kHFJX+YlPxpVlbCx2mZ5DzPI04k4kUwHHdskU3pH76iftG8yWlkAAAAAElFTkSuQmCC</Image> <Url type="application/x-suggestions+json" method="GET" template="https://www.google.com/complete/search?client=firefox&q={searchTerms}"/> <Url type="text/html" method="GET" template="https://www.google.com/search"> <Param name="q" value="{searchTerms}"/> <Param name="ie" value="utf-8"/> <Param name="oe" value="utf-8"/> <Param name="aq" value="t"/> <Param name="rls" value="{moz:distributionID}:{moz:locale}:{moz:official}"/> -#if MOZ_UPDATE_CHANNEL == beta - <MozParam name="client" condition="defaultEngine" trueValue="firefox-beta" falseValue="firefox"/> -#elif MOZ_UPDATE_CHANNEL == aurora - <MozParam name="client" condition="defaultEngine" trueValue="firefox-aurora" falseValue="firefox"/> -#elif MOZ_UPDATE_CHANNEL == nightly - <MozParam name="client" condition="defaultEngine" trueValue="firefox-nightly" falseValue="firefox"/> -#else <MozParam name="client" condition="defaultEngine" trueValue="firefox-a" falseValue="firefox"/> -#endif <MozParam name="channel" condition="purpose" purpose="contextmenu" value="rcs"/> <MozParam name="channel" condition="purpose" purpose="keyword" value="fflb"/> <MozParam name="channel" condition="purpose" purpose="homepage" value="np"/> <MozParam name="source" condition="purpose" purpose="homepage" value="hp"/> </Url> <SearchForm>https://www.google.com/</SearchForm> </SearchPlugin> diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn @@ -119,14 +119,15 @@ locale/browser/syncQuota.properties (%chrome/browser/syncQuota.properties) #endif % locale browser-region @AB_CD@ %locale/browser-region/ locale/browser-region/region.properties (%chrome/browser-region/region.properties) # the following files are browser-specific overrides locale/browser/netError.dtd (%chrome/overrides/netError.dtd) locale/browser/appstrings.properties (%chrome/overrides/appstrings.properties) locale/browser/downloads/settingsChange.dtd (%chrome/overrides/settingsChange.dtd) + locale/browser/searchplugins/list.txt (%searchplugins/list.txt) % override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd % override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties % override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd % locale pdf.js @AB_CD@ %locale/pdfviewer/ locale/pdfviewer/viewer.properties (%pdfviewer/viewer.properties) locale/pdfviewer/chrome.properties (%pdfviewer/chrome.properties) ++++++ firefox-no-default-ualocale.patch ++++++ # HG changeset patch # User Wolfgang Rosenauer <wr(a)rosenauer.org> # Parent 4ecbbda17c2a7a8f62beb568ab838b45beaaf36a Do not overwrite the locale dynamic pref from xulrunner's all.js with a wrong default value diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -215,17 +215,17 @@ pref("extensions.{972ce4c6-7e08-4474-a28 pref("xpinstall.whitelist.add", "addons.mozilla.org"); pref("xpinstall.whitelist.add.180", "marketplace.firefox.com"); pref("lightweightThemes.update.enabled", true); pref("keyword.enabled", true); -pref("general.useragent.locale", "@AB_CD@"); +pref("general.useragent.locale", "chrome://global/locale/intl.properties"); pref("general.skins.selectedSkin", "classic/1.0"); pref("general.smoothScroll", true); #ifdef UNIX_BUT_NOT_MAC pref("general.autoScroll", false); #else pref("general.autoScroll", true); #endif ++++++ firefox.1 ++++++ .TH FIREFOX 1 "January 04, 2006" firefox "Linux User's Manual" .SH NAME firefox \- a Web browser for X11 derived from the Mozilla browser .SH SYNOPSIS .B firefox [\fIOPTIONS\fR] [\fIURL\fR] .SH DESCRIPTION \fBMozilla Firefox\fR is an open-source web browser, designed for standards compliance, performance and portability. .SH USAGE \fBfirefox\fR is a simple shell script that will set up the environment for the actual executable. .SH OPTIONS A summary of the options supported by \fBfirefox\fR is included below. .SS "GTK options" \fB\-\-gdk-debug=\fR\fIFLAGS\fR Gdk debugging flags to set .TP \fB\-\-gdk-no-debug=\fR\fIFLAGS\fR Gdk debugging flags to unset .TP \fB\-\-gtk-debug=\fR\fIFLAGS\fR Gtk+ debugging flags to set .TP \fB\-\-gtk-no-debug=\fR\fIFLAGS\fR Gtk+ debugging flags to unset .TP \fB\-\-gtk-module=\fR\fIMODULE\fR Load an additional Gtk module .SS "X11 options" .TP .BI \-\-display= DISPLAY X display to use .TP .B \--sync Make X calls synchronous .TP .B \-\-no-xshm Don't use X shared memory extension .TP .BI \-\-xim-preedit= STYLE .TP .BI \-\-xim-status= STYLE .TP .B \-\-g-fatal-warnings Make all warnings fatal .SS "Firefox options" .TP .B \-h, \-help Show summary of options. .TP \fB\-height\fR \fIvalue\fR Set height of startup window to \fIvalue\fR. .TP \fB\-width\fR \fIvalue\fR Set width of startup window to \fIvalue\fR. .TP .B \-v, \-version Print \fB/usr/bin/firefox-bin\fR version. .TP \fB\-CreateProfile\fR \fIprofile\fR Create \fIprofile\fR. .TP \fB\-P\fR \fIprofile\fR Start with \fIprofile\fR. .TP .B \-ProfileManager Start with profile manager. .TP \fB\-UILocale\fR \fIlang-region\fR Start with \fIlang-region\fR resources. .TP \fB\-contentLocale\fR \fIlang-region\fR Start with \fIlang-region\fR resources. .TP \fB\-remote\fR \fIcommand\fR Execute \fIcommand\fR in an already running Firefox process. For more info, see: \fIhttp://www.mozilla.org/unix/remote.html\fR .TP .B \-no-remote Don't try to control an already running instance. .TP .B \-jsconsole Start with Javascript Console .TP \fB\-chrome\fR \fIurl\fR Load the specified chrome. .TP \fB\-new-window\fR \fIurl\fR Open URL in a new window if Firefox is already running. .TP \fB\-new-tab\fR \fIurl\fR Open URL in a new tab if Firefox is already running. .TP \fB\-preferences\fR Open Firefox preferences menu. .TP .B \-safe-mode Disables extensions and themes for this session. .TP .SH FILES \fI/usr/bin/firefox\fR - shell script wrapping \fBfirefox\fR .br \fI/usr/lib/firefox/firefox\fR - \fBfirefox\fR executable .SH VERSION 3.0 .SH BUGS To report a bug, please visit \fIhttp://bugzilla.mozilla.org/\fR .SH "SEE ALSO" .BR mozilla(1) .SH AUTHORS .TP .B The Mozilla Organization .I http://www.mozilla.org/about.html ++++++ firefox.js ++++++ pref("browser.preferences.instantApply", true); ++++++ gecko.js ++++++ pref("media.gstreamer.enabled", true); ++++++ kde.js ++++++ pref("browser.preferences.instantApply", false); ++++++ mozilla-arm-disable-edsp.patch ++++++ # HG changeset patch # User Adrian Schröter <adrian(a)suse.de> # Parent b945e0c3b145b6b2245f42bab52f911c2d1f6759 disable ESDP support (no BNC or BMO reference yet :-() diff --git a/mozglue/build/arm.h b/mozglue/build/arm.h --- a/mozglue/build/arm.h +++ b/mozglue/build/arm.h @@ -116,17 +116,17 @@ namespace mozilla { extern bool MFBT_DATA neon_enabled; #endif #endif } #if defined(MOZILLA_PRESUME_EDSP) # define MOZILLA_MAY_SUPPORT_EDSP 1 inline bool supports_edsp() { return true; } -#elif defined(MOZILLA_MAY_SUPPORT_EDSP) \ +#elif 0 \ && defined(MOZILLA_ARM_HAVE_CPUID_DETECTION) inline bool supports_edsp() { return arm_private::edsp_enabled; } #else inline bool supports_edsp() { return false; } #endif #if defined(MOZILLA_PRESUME_ARMV6) # define MOZILLA_MAY_SUPPORT_ARMV6 1 ++++++ mozilla-get-app-id ++++++ #!/usr/bin/perl -w use XML::Simple; my $file = shift || die "Usage: $0 [install.rdf|somefile.xpi]\n"; my $xml; if ($file =~ /\.xpi$/) { use Archive::Zip qw/:ERROR_CODES :CONSTANTS/; my $zip = Archive::Zip->new(); if ( $zip->read($file) != AZ_OK ) { die "zip file read error\n"; } my $data = $zip->contents("install.rdf"); die "missing install.rdf in $file\n" unless $data; $xml = XMLin($data) || die "$!\n"; } elsif ($file =~ /install.rdf/) { $xml = XMLin($file) || die "$!\n"; } else { die "unsupported file format\n"; } my $desc; for my $tag (qw/RDF:Description Description/) { if (exists $xml->{$tag}) { if (ref $xml->{$tag} eq 'ARRAY') { $desc = $xml->{$tag}; } else { $desc = [ $xml->{$tag} ]; } } } my $uuid; my $id; for my $x (@$desc) { if ($x->{"em:id"} =~ /{[[:xdigit:]]+-/) { print STDERR "Warning: multiple uuids!\n" if defined $uuid; $uuid = $x->{"em:id"}; } elsif ($x->{"em:id"} =~ /@/) { print STDERR "Warning: multiple ids!\n" if defined $id; $id = $x->{"em:id"}; } } if (defined $id) { print "$id\n"; } elsif (defined $uuid) { print "$uuid\n"; } else { exit 1; } ++++++ mozilla-kde.patch ++++++ ++++ 3731 lines (skipped) ++++++ mozilla-language.patch ++++++ # HG changeset patch # User Wolfgang Rosenauer <wr(a)rosenauer.org> # Parent df748bfc0eaca6dedf086cfd7167392416bfae27 Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE diff --git a/intl/locale/src/nsLocaleService.cpp b/intl/locale/src/nsLocaleService.cpp --- a/intl/locale/src/nsLocaleService.cpp +++ b/intl/locale/src/nsLocaleService.cpp @@ -127,16 +127,17 @@ nsLocaleService::nsLocaleService(void) nsRefPtr<nsLocale> resultLocale(new nsLocale()); NS_ENSURE_TRUE_VOID(resultLocale); #ifdef MOZ_WIDGET_QT const char* lang = QLocale::system().name().toUtf8(); #else // Get system configuration const char* lang = getenv("LANG"); + const char* language = getenv("LANGUAGE"); #endif nsAutoString xpLocale, platformLocale; nsAutoString category, category_platform; int i; for( i = 0; i < LocaleListLength; i++ ) { nsresult result; @@ -155,16 +156,21 @@ nsLocaleService::nsLocaleService(void) } else { CopyASCIItoUTF16(lang, platformLocale); result = nsPosixLocale::GetXPLocale(lang, xpLocale); } } if (NS_FAILED(result)) { return; } + // LANGUAGE is overriding LC_MESSAGES + if (i == LC_MESSAGES && language && *language) { + CopyASCIItoUTF16(language, platformLocale); + result = nsPosixLocale::GetXPLocale(language, xpLocale); + } resultLocale->AddCategory(category, xpLocale); resultLocale->AddCategory(category_platform, platformLocale); } mSystemLocale = do_QueryInterface(resultLocale); mApplicationLocale = do_QueryInterface(resultLocale); #endif // XP_UNIX #ifdef XP_OS2 ++++++ mozilla-libproxy-compat.patch ++++++ # HG changeset patch # Parent 99164862ccce7947259465dcf9edbf6375d56413 # User Wolfgang Rosenauer <wr(a)rosenauer.org> No bug - libproxy API change picked up in bmo#769764 but fails in openSUSE 11.2 and earlier. Still cast to char* to make "all" happy Note: Remove that patch when openSUSE 11.2 runs out of any support! diff --git a/toolkit/system/unixproxy/nsLibProxySettings.cpp b/toolkit/system/unixproxy/nsLibProxySettings.cpp --- a/toolkit/system/unixproxy/nsLibProxySettings.cpp +++ b/toolkit/system/unixproxy/nsLibProxySettings.cpp @@ -67,17 +67,17 @@ nsUnixSystemProxySettings::GetProxyForUR if (!mProxyFactory) { mProxyFactory = px_proxy_factory_new(); } NS_ENSURE_TRUE(mProxyFactory, NS_ERROR_NOT_AVAILABLE); char **proxyArray = nullptr; proxyArray = px_proxy_factory_get_proxies(mProxyFactory, - PromiseFlatCString(aSpec).get()); + (char *) (PromiseFlatCString(aSpec).get())); NS_ENSURE_TRUE(proxyArray, NS_ERROR_NOT_AVAILABLE); // Translate libproxy's output to PAC string as expected // libproxy returns an array of proxies in the format: // <procotol>://[username:password@]proxy:port // or // direct:// // ++++++ mozilla-nongnome-proxies.patch ++++++ From: Wolfgang Rosenauer Subject: Do not use gconf for proxy settings if not running within Gnome Index: toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp =================================================================== RCS file: /cvsroot/mozilla/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp,v retrieving revision 1.1 diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp @@ -50,24 +50,28 @@ nsUnixSystemProxySettings::GetMainThread // dbus prevents us from being threadsafe, but this routine should not block anyhow *aMainThreadOnly = true; return NS_OK; } nsresult nsUnixSystemProxySettings::Init() { - mSchemeProxySettings.Init(5); - mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID); - if (mGSettings) { - mGSettings->GetCollectionForSchema(NS_LITERAL_CSTRING("org.gnome.system.proxy"), - getter_AddRefs(mProxySettings)); - } - if (!mProxySettings) { - mGConf = do_GetService(NS_GCONFSERVICE_CONTRACTID); + // only use GSettings if that is a GNOME session + const char* sessionType = PR_GetEnv("DESKTOP_SESSION"); + if (sessionType && !strcmp(sessionType, "gnome")) { + mSchemeProxySettings.Init(5); + mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID); + if (mGSettings) { + mGSettings->GetCollectionForSchema(NS_LITERAL_CSTRING("org.gnome.system.proxy"), + getter_AddRefs(mProxySettings)); + } + if (!mProxySettings) { + mGConf = do_GetService(NS_GCONFSERVICE_CONTRACTID); + } } return NS_OK; } bool nsUnixSystemProxySettings::IsProxyMode(const char* aMode) { ++++++ mozilla-ntlm-full-path.patch ++++++ # HG changeset patch # User Petr Cerny <pcerny(a)novell.com> # Parent 7308e4a7c1f769f4bbbc90870b849cadd99495a6 Bug 634334 - call to the ntlm_auth helper fails diff --git a/extensions/auth/nsAuthSambaNTLM.cpp b/extensions/auth/nsAuthSambaNTLM.cpp --- a/extensions/auth/nsAuthSambaNTLM.cpp +++ b/extensions/auth/nsAuthSambaNTLM.cpp @@ -168,17 +168,17 @@ static uint8_t* ExtractMessage(const nsA nsresult nsAuthSambaNTLM::SpawnNTLMAuthHelper() { const char* username = PR_GetEnv("USER"); if (!username) return NS_ERROR_FAILURE; const char* const args[] = { - "ntlm_auth", + "/usr/bin/ntlm_auth", "--helper-protocol", "ntlmssp-client-1", "--use-cached-creds", "--username", username, nullptr }; bool isOK = SpawnIOChild(const_cast<char* const*>(args), &mChildPID, &mFromChildFD, &mToChildFD); if (!isOK) ++++++ mozilla-ppc.patch ++++++ # HG changeset patch # Parent 21d0e194954e451f0f1935d0ed68ee9eae432ddf # User Wolfgang Rosenauer <wr(a)rosenauer.org> Bug 746112 - RegExp hang on ppc64 in execute. diff --git a/js/src/yarr/YarrInterpreter.h b/js/src/yarr/YarrInterpreter.h --- a/js/src/yarr/YarrInterpreter.h +++ b/js/src/yarr/YarrInterpreter.h @@ -162,17 +162,17 @@ struct ByteTerm { , m_invert(invert) { atom.characterClass = characterClass; atom.quantityType = QuantifierFixedCount; atom.quantityCount = 1; inputPosition = inputPos; } - ByteTerm(Type type, unsigned subpatternId, ByteDisjunction* parenthesesInfo, bool capture, int inputPos) + ByteTerm(Type type, unsigned subpatternId, ByteDisjunction* parenthesesInfo, bool capture, int inputPos) __attribute__((noinline)) : type(type) , m_capture(capture) , m_invert(false) { atom.subpatternId = subpatternId; atom.parenthesesDisjunction = parenthesesInfo; atom.quantityType = QuantifierFixedCount; atom.quantityCount = 1; @@ -183,17 +183,17 @@ struct ByteTerm { : type(type) , m_capture(false) , m_invert(invert) { atom.quantityType = QuantifierFixedCount; atom.quantityCount = 1; } - ByteTerm(Type type, unsigned subpatternId, bool capture, bool invert, int inputPos) + ByteTerm(Type type, unsigned subpatternId, bool capture, bool invert, int inputPos) __attribute__((noinline)) : type(type) , m_capture(capture) , m_invert(invert) { atom.subpatternId = subpatternId; atom.quantityType = QuantifierFixedCount; atom.quantityCount = 1; inputPosition = inputPos; diff --git a/js/src/yarr/YarrPattern.h b/js/src/yarr/YarrPattern.h --- a/js/src/yarr/YarrPattern.h +++ b/js/src/yarr/YarrPattern.h @@ -180,17 +180,17 @@ struct PatternTerm { , m_capture(false) , m_invert(invert) { characterClass = charClass; quantityType = QuantifierFixedCount; quantityCount = 1; } - PatternTerm(Type type, unsigned subpatternId, PatternDisjunction* disjunction, bool capture = false, bool invert = false) + PatternTerm(Type type, unsigned subpatternId, PatternDisjunction* disjunction, bool capture = false, bool invert = false) __attribute__((noinline)) : type(type) , m_capture(capture) , m_invert(invert) { parentheses.disjunction = disjunction; parentheses.subpatternId = subpatternId; parentheses.isCopy = false; parentheses.isTerminal = false; diff --git a/memory/mozjemalloc/jemalloc.c b/memory/mozjemalloc/jemalloc.c --- a/memory/mozjemalloc/jemalloc.c +++ b/memory/mozjemalloc/jemalloc.c @@ -1099,17 +1099,17 @@ struct arena_s { static unsigned ncpus; #endif /* * When MALLOC_STATIC_SIZES is defined most of the parameters * controlling the malloc behavior are defined as compile-time constants * for best performance and cannot be altered at runtime. */ -#if !defined(__ia64__) && !defined(__sparc__) && !defined(__mips__) +#if !defined(__ia64__) && !defined(__sparc__) && !defined(__mips__) && !(defined(__powerpc__)) #define MALLOC_STATIC_SIZES 1 #endif #ifdef MALLOC_STATIC_SIZES /* * VM page size. It must divide the runtime CPU page size or the code * will abort. ++++++ mozilla-prefer_plugin_pref.patch ++++++ From: Ubuntu Subject: introduce a pref to prefer certain plugins for mime-types diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp --- a/dom/plugins/base/nsPluginHost.cpp +++ b/dom/plugins/base/nsPluginHost.cpp @@ -1334,17 +1334,51 @@ nsPluginHost::FindPluginForType(const ch if (!aMimeType) { return nullptr; } LoadPlugins(); InfallibleTArray<nsPluginTag*> matchingPlugins; + char *preferredPluginPath = nullptr; + nsAutoCString mimetypePrefString ("modules.plugins.mimetype."); + mimetypePrefString.Append(aMimeType); + const char *mimetypePrefChar = mimetypePrefString.get(); + nsAdoptingCString pluginPath = Preferences::GetCString(mimetypePrefChar); + preferredPluginPath = (char*) pluginPath.get(); + nsPluginTag *plugin = mPlugins; + + if(preferredPluginPath) { + while (plugin) { + if (!aCheckEnabled || plugin->IsEnabled()) { + if (0 == PL_strcasecmp(plugin->mFileName.get(), preferredPluginPath) || + 0 == PL_strcasecmp(plugin->mFullPath.get(), preferredPluginPath)) { + matchingPlugins.AppendElement(plugin); + } + } + plugin = plugin->mNext; + } + + // now lets search for substrings + plugin = mPlugins; + while (plugin) { + if (!aCheckEnabled || plugin->IsEnabled()) { + if (nullptr != PL_strstr(plugin->mFileName.get(), preferredPluginPath) || + nullptr != PL_strstr(plugin->mFullPath.get(), preferredPluginPath)) { + matchingPlugins.AppendElement(plugin); + } + } + plugin = plugin->mNext; + } + + return FindPreferredPlugin(matchingPlugins); + } + while (plugin) { if (!aCheckEnabled || plugin->IsActive()) { int32_t mimeCount = plugin->mMimeTypes.Length(); for (int32_t i = 0; i < mimeCount; i++) { if (0 == PL_strcasecmp(plugin->mMimeTypes[i].get(), aMimeType)) { matchingPlugins.AppendElement(plugin); break; } ++++++ mozilla-preferences.patch ++++++ From: Wolfgang Rosenauer <wr(a)rosenauer.org> Subject: use system locale if available This setting used to live in the branding-openSUSE package but this is causing too much confusion and therefore is currently the only setting we switch in the unbranded package unconditionally. # HG changeset patch # Parent 020571ebc3766a68f1e50780b910c51d1bb76087 diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js --- a/modules/libpref/src/init/all.js +++ b/modules/libpref/src/init/all.js @@ -1085,17 +1085,17 @@ pref("intl.charsetmenu.browser.unicode", pref("intl.charsetmenu.mailedit", "chrome://global/locale/intl.properties"); pref("intl.charsetmenu.browser.cache", ""); pref("intl.charsetmenu.mailview.cache", ""); pref("intl.charsetmenu.composer.cache", ""); pref("intl.charsetmenu.browser.cache.size", 5); pref("intl.charset.detector", "chrome://global/locale/intl.properties"); pref("intl.charset.default", "chrome://global-platform/locale/intl.properties"); pref("intl.ellipsis", "chrome://global-platform/locale/intl.properties"); -pref("intl.locale.matchOS", false); +pref("intl.locale.matchOS", true); // fallback charset list for Unicode conversion (converting from Unicode) // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes) // for ISO-8859-1 pref("intl.fallbackCharsetList.ISO-8859-1", "windows-1252"); pref("font.language.group", "chrome://global/locale/intl.properties"); // these locales have right-to-left UI pref("intl.uidirection.ar", "rtl"); ++++++ mozilla-repo.patch ++++++ # HG changeset patch # Parent 8d013204e3f06811daf5156939452765fb3e10bb diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk --- a/toolkit/mozapps/installer/package-name.mk +++ b/toolkit/mozapps/installer/package-name.mk @@ -138,23 +138,23 @@ else BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID) endif ifndef INCLUDED_RCS_MK USE_RCS_MK := 1 include $(topsrcdir)/config/makefiles/makeutils.mk endif -MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node|short}\n" 2>/dev/null)) +#MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_DIR) parent --template="{node|short}\n" 2>/dev/null)) ########################################################################### # bug: 746277 - preserve existing functionality. # MOZILLA_DIR="": cd $(SPACE); hg # succeeds if ~/.hg exists ########################################################################### -MOZ_SOURCE_REPO = $(call getSourceRepo,$(MOZILLA_DIR)$(NULL) $(NULL)) +#MOZ_SOURCE_REPO = $(call getSourceRepo,$(MOZILLA_DIR)$(NULL) $(NULL)) MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).txt MOZ_BUILDINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).json # JavaScript Shell PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip endif # PACKAGE_NAME_MK_INCLUDED diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in @@ -214,17 +214,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR endif endif MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null)) ifdef MOZ_SOURCE_STAMP INIARGS = --sourcestamp=$(MOZ_SOURCE_STAMP) - source_repo := $(call getSourceRepo) + source_repo ?= $(call getSourceRepo) # extra sanity check for old versions of hg, no showconfig support ifneq (,$(filter http%,$(source_repo))) INIARGS += --sourcerepo=$(source_repo) endif endif # MOZ_SOURCE_STAMP ++++++ mozilla-shared-nss-db.patch ++++++ From: Hans Petter Jansson <hpj(a)copyleft.no> Wolfgang Rosenauer <wr(a)rosenauer.org> Subject: use libnsssharedhelper if available at compile time (can be disabled by exporting MOZ_XRE_NO_NSSHELPER=1) References: diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in @@ -8289,16 +8289,31 @@ AC_SUBST(QCMS_LIBS) dnl ======================================================== dnl HarfBuzz dnl ======================================================== MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)' AC_SUBST(MOZ_HARFBUZZ_LIBS) dnl ======================================================== +dnl Check for nss-shared-helper +dnl ======================================================== + + PKG_CHECK_MODULES(NSSHELPER, nss-shared-helper, + [MOZ_ENABLE_NSSHELPER=1], + [MOZ_ENABLE_NSSHELPER=]) + +if test "$MOZ_ENABLE_NSSHELPER"; then + AC_DEFINE(MOZ_ENABLE_NSSHELPER) +fi +AC_SUBST(MOZ_ENABLE_NSSHELPER) +AC_SUBST(NSSHELPER_CFLAGS) +AC_SUBST(NSSHELPER_LIBS) + +dnl ======================================================== dnl SIL Graphite dnl ======================================================== MOZ_GRAPHITE_LIBS='$(DEPTH)/gfx/graphite2/src/$(LIB_PREFIX)mozgraphite2.$(LIB_SUFFIX)' AC_SUBST(MOZ_GRAPHITE_LIBS) dnl ======================================================== dnl OTS dnl ======================================================== diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in --- a/security/manager/ssl/src/Makefile.in +++ b/security/manager/ssl/src/Makefile.in @@ -18,10 +18,13 @@ LIBXUL_LIBRARY = 1 CSRCS += md4.c DEFINES += \ -DNSS_ENABLE_ECC \ -DDLL_PREFIX=\"$(DLL_PREFIX)\" \ -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \ $(NULL) +LOCAL_INCLUDES += $(NSSHELPER_CFLAGS) +EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS) + include $(topsrcdir)/config/rules.mk diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp --- a/security/manager/ssl/src/nsNSSComponent.cpp +++ b/security/manager/ssl/src/nsNSSComponent.cpp @@ -3,16 +3,23 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #ifdef MOZ_LOGGING #define FORCE_PR_LOG 1 #endif +#ifdef MOZ_ENABLE_NSSHELPER +#pragma GCC visibility push(default) +#include <nss-shared-helper.h> +#pragma GCC visibility pop +#include "prenv.h" +#endif + #include "nsNSSComponent.h" #include "CertVerifier.h" #include "nsCertVerificationThread.h" #include "nsAppDirectoryServiceDefs.h" #include "nsComponentManagerUtils.h" #include "nsDirectoryServiceDefs.h" #include "nsICertOverrideService.h" @@ -1144,18 +1151,34 @@ nsNSSComponent::InitializeNSS(bool showW ConfigureInternalPKCS11Token(); // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs // module by NSS_Initialize because we will load it in InstallLoadableRoots // later. It also allows us to work around a bug in the system NSS in // Ubuntu 8.04, which loads any nonexistent "<configdir>/libnssckbi.so" as // "/usr/lib/nss/libnssckbi.so". uint32_t init_flags = NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE; - SECStatus init_rv = ::NSS_Initialize(profileStr.get(), "", "", - SECMOD_DB, init_flags); + SECStatus init_rv = SECFailure; +#ifdef MOZ_ENABLE_NSSHELPER + if (PR_GetEnv("MOZ_XRE_NO_NSSHELPER")) { + init_rv = ::NSS_Initialize(profileStr.get(), "", "", + SECMOD_DB, init_flags); + } else { + init_rv = ::nsshelp_open_db ("Firefox", profileStr.get(), init_flags); + + if (init_rv != SECSuccess) { + PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS using nsshelp_open_db in %s\n", profileStr.get())); + init_rv = ::NSS_Initialize(profileStr.get(), "", "", + SECMOD_DB, init_flags); + } + } +#else + init_rv = ::NSS_Initialize(profileStr.get(), "", "", + SECMOD_DB, init_flags); +#endif if (init_rv != SECSuccess) { PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS r/w in %s\n", profileStr.get())); if (supress_warning_preference) { which_nss_problem = problem_none; } else { diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in @@ -490,17 +490,17 @@ ifneq (,$(or $(filter 1400,$(_MSC_VER)), ifdef MOZ_DEBUG EXTRA_DSO_LDOPTS += -INCREMENTAL:NO endif endif endif EXTRA_DSO_LDOPTS += $(LIBS_DIR) -EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) +EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) $(NSSHELPER_LIBS) ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) CXXFLAGS += $(TK_CFLAGS) OS_LIBS += \ -framework SystemConfiguration \ -framework QTKit \ -framework IOKit \ -F/System/Library/PrivateFrameworks -framework CoreUI \ ++++++ mozilla-sle11.patch ++++++ Subject: Patches needed to build on SLE11/11.1 References: https://bugzilla.mozilla.org/show_bug.cgi?id=513422 diff --git a/mozglue/build/SSE.cpp b/mozglue/build/SSE.cpp --- a/mozglue/build/SSE.cpp +++ b/mozglue/build/SSE.cpp @@ -12,26 +12,77 @@ namespace { // SSE.h has parallel #ifs which declare MOZILLA_SSE_HAVE_CPUID_DETECTION. // We can't declare these functions in the header file, however, because // <intrin.h> conflicts with <windows.h> on MSVC 2005, and some files want to // include both SSE.h and <windows.h>. #ifdef HAVE_CPUID_H // cpuid.h is available on gcc 4.3 and higher on i386 and x86_64 -#include <cpuid.h> +//#include <cpuid.h> enum CPUIDRegister { eax = 0, ebx = 1, ecx = 2, edx = 3 }; +#ifdef __i386__ +#define _my_cpuid(level, a, b, c, d) \ + __asm__ ("xchg{l}\t{%%}ebx, %1\n\t" \ + "cpuid\n\t" \ + "xchg{l}\t{%%}ebx, %1\n\t" \ + : "=a" (a), "=r" (b), "=c" (c), "=d" (d) \ + : "0" (level)) +#else +#define _my_cpuid(level, a, b, c, d) \ + __asm__ ("cpuid\n\t" \ + : "=a" (a), "=b" (b), "=c" (c), "=d" (d) \ + : "0" (level)) +#endif + +static __inline unsigned int +my_cpuid_max (unsigned int __ext, unsigned int *__sig) +{ + unsigned int __eax, __ebx, __ecx, __edx; + +#ifdef __i386__ + __asm__ ("pushf{l|d}\n\t" + "pushf{l|d}\n\t" + "pop{l}\t%0\n\t" + "mov{l}\t{%0, %1|%1, %0}\n\t" + "xor{l}\t{%2, %0|%0, %2}\n\t" + "push{l}\t%0\n\t" + "popf{l|d}\n\t" + "pushf{l|d}\n\t" + "pop{l}\t%0\n\t" + "popf{l|d}\n\t" + : "=&r" (__eax), "=&r" (__ebx) + : "i" (0x00200000)); + + if (!((__eax ^ __ebx) & 0x00200000)) + return 0; +#endif + + /* Host supports cpuid. Return highest supported cpuid input value. */ + _my_cpuid (__ext, __eax, __ebx, __ecx, __edx); + + if (__sig) + *__sig = __ebx; + + return __eax; +} + static bool has_cpuid_bit(unsigned int level, CPUIDRegister reg, unsigned int bit) { unsigned int regs[4]; - return __get_cpuid(level, &regs[0], &regs[1], &regs[2], &regs[3]) && - (regs[reg] & bit); + + unsigned int __ext = level & 0x80000000; + if (my_cpuid_max(__ext, 0) < level) + return false; + + _my_cpuid(level, regs[0], regs[1], regs[2], regs[3]); + return !!(unsigned(regs[reg]) & bit); } #elif defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_AMD64)) // MSVC 2005 or newer on x86-32 or x86-64 #include <intrin.h> enum CPUIDRegister { eax = 0, ebx = 1, ecx = 2, edx = 3 }; ++++++ mozilla.sh.in ++++++ #!/bin/sh # # ***** BEGIN LICENSE BLOCK ***** # Version: MPL 1.1/GPL 2.0/LGPL 2.1 # # The contents of this file are subject to the Mozilla Public License Version # 1.1 (the "License"); you may not use this file except in compliance with # the License. You may obtain a copy of the License at # http://www.mozilla.org/MPL/ # # Software distributed under the License is distributed on an "AS IS" basis, # WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License # for the specific language governing rights and limitations under the # License. # # The Original Code is mozilla.org Code. # # The Initial Developer of the Original Code is # Netscape Communications Corporation. # Portions created by the Initial Developer are Copyright (C) 1998 # the Initial Developer. All Rights Reserved. # # Contributor(s): # Wolfgang Rosenauer <wolfgang.rosenauer(a)suse.de> # <wr(a)rosenauer.org> # # Alternatively, the contents of this file may be used under the terms of # either the GNU General Public License Version 2 or later (the "GPL"), or # the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), # in which case the provisions of the GPL or the LGPL are applicable instead # of those above. If you wish to allow use of your version of this file only # under the terms of either the GPL or the LGPL, and not to allow others to # use your version of this file under the terms of the MPL, indicate your # decision by deleting the provisions above and replace them with the notice # and other provisions required by the GPL or the LGPL. If you do not delete # the provisions above, a recipient may use your version of this file under # the terms of any one of the MPL, the GPL or the LGPL. # # ***** END LICENSE BLOCK ***** ## ## Usage: ## ## $ mozilla [args] ## ## This script is meant to run a mozilla program from the mozilla ## rpm installation. ## ## The script will setup all the environment voodoo needed to make ## mozilla work. cmdname=`basename $0` ## ## Variables ## MOZ_DIST_BIN="%PREFIX" MOZ_DIST_LIB="%PROGDIR" MOZ_APPNAME="%APPNAME" MOZ_PROGRAM="$MOZ_DIST_LIB/$MOZ_APPNAME" MOZ_APP_LAUNCHER="$MOZ_DIST_LIB/$MOZ_APPNAME.sh" if [ "$0" = "$MOZ_APP_LAUNCHER" ]; then [ -h "/usr/bin/$MOZ_APPNAME" ] && \ _link=$(readlink -f "/usr/bin/$MOZ_APPNAME") if [ "$_link" = "$MOZ_APP_LAUNCHER" ]; then export MOZ_APP_LAUNCHER="/usr/bin/$MOZ_APPNAME" fi else export MOZ_APP_LAUNCHER="/usr/bin/$MOZ_APPNAME" fi mozilla_lib=`file $MOZ_PROGRAM` LIB=lib echo $mozilla_lib | grep -q -E 'ELF.64-bit.*(x86-64|S/390|PowerPC)' && LIB=lib64 BROWSER_PLUGIN_DIR=/usr/$LIB/browser-plugins if [ ! -d $BROWSER_PLUGIN_DIR ]; then BROWSER_PLUGIN_DIR=/opt/netscape/plugins fi MOZILLA_FIVE_HOME="$MOZ_DIST_LIB" export MOZILLA_FIVE_HOME LD_LIBRARY_PATH=$MOZ_DIST_LIB${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} export LD_LIBRARY_PATH # needed for SUN Java under Xorg >= 7.2 export LIBXCB_ALLOW_SLOPPY_LOCK=1 ## if [ -z "$MOZ_PLUGIN_PATH" ]; then export MOZ_PLUGIN_PATH=$BROWSER_PLUGIN_DIR else # make sure that BROWSER_PLUGIN_DIR is in MOZ_PLUGIN_PATH echo "$MOZ_PLUGIN_PATH" | grep "$BROWSER_PLUGIN_DIR" 2>&1 >/dev/null _retval=$? if [ ${_retval} -ne 0 ]; then export MOZ_PLUGIN_PATH=$MOZ_PLUGIN_PATH:$BROWSER_PLUGIN_DIR fi fi # disable Gnome crash dialog (doesn't make sense anyway) export GNOME_DISABLE_CRASH_DIALOG=1 moz_debug=0 script_args="" pass_arg_count=0 while [ $# -gt $pass_arg_count ] do case "$1" in -d | --debugger) moz_debugger=$2; if [ "${moz_debugger}" != "" ]; then shift 2 moz_debug=1 else echo "-d requires an argument" exit 1 fi ;; *) # Move the unrecognized argument to the end of the list. arg="$1" shift set -- "$@" "$arg" pass_arg_count=`expr $pass_arg_count + 1` ;; esac done if [ $moz_debug -eq 1 ]; then tmpfile=`mktemp /tmp/mozargs.XXXXXX` || { echo "Cannot create temporary file" >&2; exit 1; } trap " [ -f \"$tmpfile\" ] && /bin/rm -f -- \"$tmpfile\"" 0 1 2 3 13 15 echo -e "set args ${1+"$@"}\nrun" > $tmpfile echo "$moz_debugger $MOZ_PROGRAM -x $tmpfile" exec $moz_debugger "$MOZ_PROGRAM" -x $tmpfile else exec $MOZ_PROGRAM "$@" fi ++++++ source-stamp.txt ++++++ REV=de08ee190ca3 REPO=http://hg.mozilla.org/releases/mozilla-release ++++++ toolkit-download-folder.patch ++++++ From: Wolfgang Rosenauer Subject: Don't use localized Downloads unless XDG is set up References: https://bugzilla.novell.com/show_bug.cgi?id=501724 diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js --- a/browser/components/preferences/main.js +++ b/browser/components/preferences/main.js @@ -344,7 +344,7 @@ var gMainPane = { // With 3.0, a new desktop folder - 'Downloads' was introduced for // platforms and versions that don't support a default system downloads // folder. See nsDownloadManager for details. - downloadFolder.label = bundlePreferences.getString("downloadsFolderName"); + downloadFolder.label = "Downloads"; iconUrlSpec = fph.getURLSpecFromFile(this._indexToFolder(1)); } else { // 'Desktop' diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp --- a/toolkit/components/downloads/nsDownloadManager.cpp +++ b/toolkit/components/downloads/nsDownloadManager.cpp @@ -1269,8 +1269,10 @@ nsDownloadManager::GetDefaultDownloadsDi // XDG user dir spec, with a fallback to Home/Downloads nsXPIDLString folderName; - mBundle->GetStringFromName(NS_LITERAL_STRING("downloadsFolder").get(), - getter_Copies(folderName)); + // We don't want localized "Downloads" unless XDG is used + //mBundle->GetStringFromName(NS_LITERAL_STRING("downloadsFolder").get(), + // getter_Copies(folderName)); + folderName.AssignLiteral("Downloads"); #if defined (XP_MACOSX) rv = dirService->Get(NS_OSX_DEFAULT_DOWNLOAD_DIR, -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit zypper for openSUSE:Factory
by root＠hilbert.suse.de 07 Nov '13

07 Nov '13

Hello community, here is the log from the commit of package zypper for openSUSE:Factory checked in at 2013-11-07 09:15:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zypper (Old) and /work/SRC/openSUSE:Factory/.zypper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "zypper" Changes: -------- --- /work/SRC/openSUSE:Factory/zypper/zypper.changes 2013-10-01 08:36:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.zypper.new/zypper.changes 2013-11-07 09:15:58.000000000 +0100 @@ -1,0 +2,28 @@ +Sun Oct 13 01:14:15 CEST 2013 - ma(a)suse.de + +- Update zypper-po.tar.bz2 + +------------------------------------------------------------------- +Thu Oct 10 01:14:28 CEST 2013 - ma(a)suse.de + +- Update zypper-po.tar.bz2 + +------------------------------------------------------------------- +Mon Oct 7 12:16:18 CEST 2013 - ma(a)suse.de + +- Avoid duplicated product entries (bnc#841473) +- Bump version for Factory + 13.1 is continued on SuSE-Code-13_1-Branch +- version 1.10.0 + +------------------------------------------------------------------- +Sun Oct 6 01:14:52 CEST 2013 - ma(a)suse.de + +- Update zypper-po.tar.bz2 + +------------------------------------------------------------------- +Thu Oct 3 01:15:29 CEST 2013 - ma(a)suse.de + +- Update zypper-po.tar.bz2 + +------------------------------------------------------------------- Old: ---- zypper-1.9.2.tar.bz2 New: ---- zypper-1.10.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zypper.spec ++++++ --- /var/tmp/diff_new_pack.gCZGTk/_old 2013-11-07 09:15:59.000000000 +0100 +++ /var/tmp/diff_new_pack.gCZGTk/_new 2013-11-07 09:15:59.000000000 +0100 @@ -33,7 +33,7 @@ Summary: Command line software manager using libzypp License: GPL-2.0+ Group: System/Packages -Version: 1.9.2 +Version: 1.10.0 Release: 0 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc ++++++ zypper-1.9.2.tar.bz2 -> zypper-1.10.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/zypper/zypper-1.9.2.tar.bz2 /work/SRC/openSUSE:Factory/.zypper.new/zypper-1.10.0.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ypserv for openSUSE:Factory
by root＠hilbert.suse.de 07 Nov '13

07 Nov '13

Hello community, here is the log from the commit of package ypserv for openSUSE:Factory checked in at 2013-11-07 09:15:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ypserv (Old) and /work/SRC/openSUSE:Factory/.ypserv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ypserv" Changes: -------- --- /work/SRC/openSUSE:Factory/ypserv/ypserv.changes 2013-04-19 10:04:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ypserv.new/ypserv.changes 2013-11-07 09:15:40.000000000 +0100 @@ -1,0 +2,9 @@ +Wed Nov 6 15:15:08 CET 2013 - kukuk(a)suse.de + +- Update to version 2.32 + - Update autoconf/automake + - ypserv: remove broken SIGHUP support. + - /var/yp/Makefile: read MINUID/MINGID from /etc/login.defs +- Remove old sysv init scripts + +------------------------------------------------------------------- Old: ---- yppasswdd.init ypserv-2.31.diff ypserv-2.31.tar.bz2 ypserv.init ypxfrd.init New: ---- ypserv-2.32.diff ypserv-2.32.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ypserv.spec ++++++ --- /var/tmp/diff_new_pack.rGUEFT/_old 2013-11-07 09:15:41.000000000 +0100 +++ /var/tmp/diff_new_pack.rGUEFT/_new 2013-11-07 09:15:41.000000000 +0100 @@ -25,7 +25,7 @@ Requires: make Requires: rpcbind BuildRoot: %{_tmppath}/%{name}-%{version}-build -Version: 2.31 +Version: 2.32 Release: 0 Url: http://www.linux-nis.org/nis/ypserv/ Summary: YP - (NIS)-Server @@ -33,9 +33,6 @@ Group: Productivity/Networking/NIS PreReq: %insserv_prereq %fillup_prereq Source: ypserv-%{version}.tar.bz2 -Source1: ypserv.init -Source2: yppasswdd.init -Source3: ypxfrd.init Source4: sysconfig.ypserv Source5: SuSEfirewall2.ypserv Source6: ypserv.service @@ -71,7 +68,6 @@ make %install -mkdir -p $RPM_BUILD_ROOT/etc/init.d mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/yp @@ -83,9 +79,6 @@ #install contrib/ypslave $RPM_BUILD_ROOT/usr/sbin/ install -m 644 etc/ypserv.conf $RPM_BUILD_ROOT/etc/ install -m 644 etc/securenets $RPM_BUILD_ROOT/var/yp -install -m 755 %SOURCE1 $RPM_BUILD_ROOT/etc/init.d/ypserv -install -m 755 %SOURCE2 $RPM_BUILD_ROOT/etc/init.d/yppasswdd -install -m 755 %SOURCE3 $RPM_BUILD_ROOT/etc/init.d/ypxfrd # install sysconfig.ypserv install -m 644 %SOURCE4 $RPM_BUILD_ROOT/var/adm/fillup-templates/ # install SuSEfirewall2 service script @@ -126,9 +119,6 @@ %defattr(-,root,root) %doc NEWS README TODO COPYING ChangeLog /var/adm/fillup-templates/sysconfig.ypserv -%config /etc/init.d/yppasswdd -%config /etc/init.d/ypserv -%config /etc/init.d/ypxfrd %config(noreplace) /var/yp/Makefile %config(noreplace) /var/yp/securenets %config(noreplace) /etc/ypserv.conf ++++++ ypserv-2.31.diff -> ypserv-2.32.diff ++++++ ++++++ ypserv-2.31.tar.bz2 -> ypserv-2.32.tar.bz2 ++++++ ++++ 6487 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypserv-2.31/ChangeLog new/ypserv-2.32/ChangeLog --- old/ypserv-2.31/ChangeLog 2013-04-11 11:26:51.000000000 +0200 +++ new/ypserv-2.32/ChangeLog 2013-11-06 15:03:52.000000000 +0100 @@ -1,3 +1,25 @@ +2013-11-06 Thorsten Kukuk <kukuk(a)suse.de> + + * release version 2.32 + + * ypserv/ypserv.c: Remove sig_hup, ignore SIG_HUP. + * ypserv/ypserv.8.xml: Remove SIG HUP section. + * lib/yp_db.c: fix return value for tcbdbopen in error case. + Patch by Edgar Hoch, RHBZ#1004110 + + * scripts/ypMakefile.in: Read MINUID/MINGID from /etc/login.defs + Patch by Honza Horak, RHBZ#1004090 + +2013-10-07 Thorsten Kukuk <kukuk(a)suse.de> + + * yppush/yppush.8.xml: Fix typo (reported by + Masatake YAMATO <yamato(a)redhat.com>). + +2013-07-22 Thorsten Kukuk <kukuk(a)suse.de> + + * lib/ypserv_conf.c (load_ypserv_conf): Use int instead + of c because of fgetc/EOF. + 2013-04-11 Thorsten Kukuk <kukuk(a)suse.de> * release version 2.31 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypserv-2.31/Makefile.am new/ypserv-2.32/Makefile.am --- old/ypserv-2.31/Makefile.am 2012-05-30 14:21:30.000000000 +0200 +++ new/ypserv-2.32/Makefile.am 2013-11-06 15:11:30.000000000 +0100 @@ -8,7 +8,7 @@ CLEANFILES = *~ -M4_FILES = $(shell ls $(srcdir)/m4/*.m4) +M4_FILES = m4/jh_path_xml_catalog.m4 EXTRA_DIST = $(M4_FILES) conf_post.h ACLOCAL_AMFLAGS = -I m4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypserv-2.31/NEWS new/ypserv-2.32/NEWS --- old/ypserv-2.31/NEWS 2013-04-11 11:26:39.000000000 +0200 +++ new/ypserv-2.32/NEWS 2013-11-06 15:14:13.000000000 +0100 @@ -5,6 +5,11 @@ Please send bug reports, questions and suggestions to <kukuk(a)linux-nis.org>. +Version 2.32 +* Update autoconf/automake +* ypserv: remove broken SIGHUP support. +* /var/yp/Makefile: read MINUID/MINGID from /etc/login.defs + Version 2.31 * Fix build failures diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypserv-2.31/config.h.in new/ypserv-2.32/config.h.in --- old/ypserv-2.31/config.h.in 2013-04-11 11:27:02.000000000 +0200 +++ new/ypserv-2.32/config.h.in 2013-11-06 15:07:38.000000000 +0100 @@ -1,4 +1,4 @@ -/* config.h.in. Generated from configure.in by autoheader. */ +/* config.h.in. Generated from configure.ac by autoheader. */ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypserv-2.31/configure.ac new/ypserv-2.32/configure.ac --- old/ypserv-2.31/configure.ac 1970-01-01 01:00:00.000000000 +0100 +++ new/ypserv-2.32/configure.ac 2013-11-06 15:04:05.000000000 +0100 @@ -0,0 +1,389 @@ +# +# Copyright (C) 1999-2013 Thorsten Kukuk <kukuk(a)linux-nis.org> +# +dnl Process this file with autoconf to produce a configure script. +AC_INIT([ypserv],[2.32],[kukuk(a)linux-nis.org]) +AM_INIT_AUTOMAKE +AC_CONFIG_SRCDIR([ypserv/ypserv.c]) +AC_CONFIG_HEADERS([config.h]) +AC_PREFIX_DEFAULT(/usr) +AH_BOTTOM([#include <conf_post.h>]) + +AC_SUBST(PACKAGE) +AC_SUBST(VERSION) + +dnl Some hacks... +test "${prefix}" = "NONE" && prefix="/usr" +if test ${prefix} = '/usr' +then +dnl If we use /usr as prefix, use /etc for ypserv.conf + if test ${sysconfdir} = '${prefix}/etc' + then + sysconfdir="/etc" + fi +dnl If we use /usr as prefix, use /usr/share/man for manual pages + if test ${mandir} = '${prefix}/man' + then + mandir='${prefix}/share/man' + fi +fi +dnl Change libexec to lib/yp +if test ${libexecdir} = '${exec_prefix}/libexec' +then + libexecdir='${exec_prefix}/lib/yp' + if test "${exec_prefix}" = "NONE" + then + YPBINDIR=/usr/lib/yp + else + YPBINDIR=${exec_prefix}/lib/yp + fi +else + YPBINDIR=${libexecdir} +fi +AC_SUBST(YPBINDIR) + +dnl Location of the NIS maps. default: /var/yp +AC_ARG_ENABLE([ypmapdir], + AS_HELP_STRING([--enable-ypmapdir=path], + [Location of NIS maps (default=/var/yp)]), + YPMAPDIR=$enableval, YPMAPDIR=/var/yp) +AC_SUBST(YPMAPDIR) + + +if test ${sbindir} = '${exec_prefix}/sbin' +then + if test "${exec_prefix}" = "NONE" + then + SBINDIR=/usr/sbin + else + SBINDIR=${exec_prefix}/sbin + fi +else + SBINDIR=${sbindir} +fi +AC_SUBST(SBINDIR) + +dnl Checks for programs. +AC_PROG_CC +AC_SEARCH_LIBS([strerror],[cposix]) +AC_PROG_CPP +AC_PROG_INSTALL +AC_PROG_MAKE_SET +AC_PROG_RANLIB +AM_PROG_CC_C_O +AC_USE_SYSTEM_EXTENSIONS + +if eval "test x$GCC = xyes"; then + for flag in \ + -pedantic \ + -W \ + -Wall \ + -Wbad-function-cast \ + -Wcast-align \ + -Wcast-qual \ + -Wmissing-declarations \ + -Wmissing-prototypes \ + -Wpointer-arith \ + -Wreturn-type \ + -Wstrict-prototypes + do + JAPHAR_GREP_CFLAGS($flag, [ CFLAGS="$CFLAGS $flag" ]) + done +fi + +AC_ARG_ENABLE(pie,AS_HELP_STRING([--disable-pie], + [Disable position-independent executeables (PIE)]), + USE_PIE=$enableval, USE_PIE=yes) + +AC_CACHE_CHECK(for -fpie, libc_cv_fpie, [dnl + cat > conftest.c <<EOF +int foo; +main () { return 0;} +EOF + if test "$USE_PIE" = "yes" && + AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -pie -fpie + -o conftest conftest.c 1>&AS_MESSAGE_LOG_FD]) + then + libc_cv_fpie=yes + PIE_CFLAGS="-fpie" + PIE_LDFLAGS="-pie" + else + libc_cv_fpie=no + PIE_CFLAGS="" + PIE_LDFLAGS="" + fi + rm -f conftest*]) +AC_SUBST(libc_cv_fpie) +AC_SUBST(PIE_CFLAGS) +AC_SUBST(PIE_LDFLAGS) + +AM_WITH_DMALLOC +AM_WITH_EFENCE + +dnl Check for big or little endian system +AC_C_BIGENDIAN +dnl Check for 64bit systems +AC_CHECK_SIZEOF(long) + +dnl Search a awk program +AC_PATH_PROGS(AWK, mawk gawk nawk awk, ERROR) +if test $AWK = ERROR +then + echo " " + echo "ERROR: You must have at last one of the following programs:" + echo " mawk, gawk, nawk or awk !" + echo " " + exit +fi + +dnl Search the bash +AC_PATH_PROGS(BASH, bash /sbin/sh, /bin/sh) + +dnl Search make +AC_PATH_PROGS(MAKE, gmake make, "", $PATH:/usr/ccs/bin:/usr/local/bin) +if test x$MAKE = x +then + echo " " + echo "Warning: No make on this system?" + echo " " + exit +fi +AC_SUBST(MAKE) + +dnl Check for aliases path +AC_PATH_PROG(ALIASES, aliases, /etc/mail/aliases, /etc/mail:/etc) + + + +dnl Should we use a gethostbyname after gethostname to use FQDN ? default yes +AC_ARG_ENABLE(fqdn, AS_HELP_STRING([--disable-fqdn], + [Always use FQDN (default=yes)]), + USE_PARAM_FQDN=$enableval, USE_PARAM_FQDN=yes) +if test "$USE_PARAM_FQDN" = "no"; then + USE_FQDN=0 +else + USE_FQDN=1 +fi +AC_SUBST(USE_FQDN) + +dnl Should we allow root to change a password with yppasswd ? default: yes +AC_ARG_ENABLE([checkroot],AS_HELP_STRING([--disable-checkroot], + [Disable check for root password (default=yes)]), + CHECKROOT=$enableval, CHECKROOT=yes) +AC_SUBST(CHECKROOT) + +# Check for --with-dbmliborder +dbmliborder="gdbm ndbm qdbm tokyocabinet" +AC_MSG_CHECKING(for --with-dbmliborder) +AC_ARG_WITH(dbmliborder, + AS_HELP_STRING([--with-dbmliborder=db1:db2:...], [order to check db backends for dbm. Valid value is a colon separated string with the backend names `ndbm', `gdbm', `qdbm' and `tokyocabinet'.]), +[ +if test x$with_dbmliborder = xyes +then + AC_MSG_ERROR([proper usage is --with-dbmliborder=db1:db2:...]) +else + dbmliborder=`echo $with_dbmliborder | sed 's/:/ /g'` + for db in $dbmliborder; do + if test x$db != xndbm && test x$db != xgdbm && test x$db != xqdbm && test x$db != xtokyocabinet + then + AC_MSG_ERROR([proper usage is --with-dbmliborder=db1:db2:...]) + fi + done +fi]) +AC_MSG_RESULT($with_dbmliborder) + +# find which dbm we have +for db in $dbmliborder; do + if test x$db = xqdbm + then + AC_CHECK_LIB(qdbm,gdbm_open,LIBDBM="$( pkg-config --libs qdbm )" ; CFLAGS="$( pkg-config --cflags qdbm ) $CFLAGS",LIBDBM="") + if test x"" != x"${LIBDBM}" + then + AC_DEFINE(HAVE_LIBQDBM, 1, [Use qdbm library as database]) + libdb_parameter=yes + break + fi + elif test x$db = xgdbm + then + AC_CHECK_LIB(gdbm,gdbm_open,LIBDBM="-lgdbm",LIBDBM="") + if test x"" != x"${LIBDBM}" + then + AC_DEFINE(HAVE_LIBGDBM, 1, [Use gdbm library as database]) + libdb_parameter=yes + break + fi + elif test x$db = xtokyocabinet + then + AC_CHECK_LIB(tokyocabinet,tcbdbopen,LIBDBM="-ltokyocabinet",LIBDBM="") + if test x"" != x"${LIBDBM}" + then + AC_DEFINE(HAVE_LIBTC, 1, [Use tokyocabinet library as database]) + libdb_parameter=yes + break + fi + elif test x$db = xndbm + then + AC_CHECK_FUNCS(dbm_open) + if test x$ac_cv_func_dbm_open = xyes + then + AC_DEFINE(HAVE_NDBM, 1, [Use ndbm library as database]) + libdb_parameter=yes + break + fi + fi +done +AC_SUBST(LIBDBM) + +if test x$libdb_parameter != xyes +then + echo " + + You need the GNU GDBM, QDBM, Tokyo Cabinet or the Solaris NDBM functions for this package !" + echo "" + echo "" + exit +fi + +AC_CHECK_LIB(xcrypt,crypt,LIBCRYPT="-lxcrypt",LIBCRYPT="") +if test -z "$LIBCRYPT" ; then + AC_CHECK_LIB(crypt,crypt,LIBCRYPT="-lcrypt",LIBCRYPT="") + AC_CHECK_HEADERS(crypt.h) +else + AC_CHECK_HEADERS(xcrypt.h crypt.h) +fi +AC_SUBST(LIBCRYPT) + +USE_SLP=0 +AC_CHECK_LIB(slp,SLPReg,LIBSLP="-lslp",LIBSLP="") +AC_SUBST(LIBSLP) +if test -n "$LIBSLP" ; then + AC_CHECK_HEADERS(slp.h) + if test "$ac_cv_header_slp_h" = yes; then + USE_SLP=1 + fi +fi +AC_SUBST(USE_SLP) + +AC_CHECK_FUNCS(getrpcport) +if test "$ac_cv_func_getrpcport" = no; then + AC_CHECK_LIB([rpcsvc], [getrpcport], + [ac_cv_func_getrpcport=yes; LIBS="-lrpcsvc $LIBS"]) +fi + +USE_SD_NOTIFY=0 +AC_SUBST(USE_SD_NOTIFY) +AC_CHECK_LIB(systemd-daemon,sd_notify,LIBSYSTEMD_DAEMON="-lsystemd-daemon", + LIBSYSTEMD_DAEMON="") +if test -n "$LIBSYSTEMD_DAEMON" ; then + AC_CHECK_HEADERS(systemd/sd-daemon.h) + if test "$ac_cv_header_systemd_sd_daemon_h" = yes; then + USE_SD_NOTIFY=1 + fi +fi +AC_SUBST(USE_SD_NOTIFY) +AC_SUBST(LIBSYSTEMD_DAEMON) + +AC_CHECK_LIB(nsl,gethostbyname) +AC_CHECK_LIB(socket,socket) +AC_CHECK_LIB(resolv, res_gethostbyname, RESOLV="-lresolv", RESOLV="") +if test x$RESOLV != x +then + AC_DEFINE(HAVE_RES_GETHOSTBYNAME, 1, [Define if you have the res_gethostbyname function.]) +else + AC_CHECK_LIB(resolv+, gethostbyname, RESOLV="-lresolv+", RESOLV="") +fi +AC_SUBST(RESOLV) + +dnl Checks for header files. +AC_HEADER_DIRENT +AC_HEADER_STDC +AC_HEADER_SYS_WAIT +AC_CHECK_HEADERS(fcntl.h paths.h sys/file.h sys/time.h syslog.h unistd.h) +AC_CHECK_HEADERS(getopt.h shadow.h rpc/clnt_soc.h rpc/svc_soc.h) +AC_CHECK_HEADERS(netinet/in.h alloca.h) +AC_CHECK_TYPE(in_addr_t, ,[AC_DEFINE(in_addr_t,int,[Define to int if you don't have in_addr_t])],[#include <netinet/in.h>]) + +dnl Checks for typedefs, structures, and compiler characteristics. +AC_C_CONST +AC_C_INLINE +AC_C___ATTRIBUTE__ +TYPE_SOCKLEN_T +AC_TYPE_PID_T +AC_TYPE_SIZE_T +AC_HEADER_TIME + +dnl Checks if resultproc_t has been defined +AC_MSG_CHECKING(for resultproc_t in rpc/clnt.h) +AC_EGREP_HEADER(resultproc_t,rpc/clnt.h,\ + AC_DEFINE(HAVE_RESULTPROC_T, 1, [Define if the systems has the resultproc_t type.]) AC_MSG_RESULT(yes),\ + AC_MSG_RESULT(no)) +AC_MSG_CHECKING(for resultproc_t in rpc/pmap_clnt.h) +AC_EGREP_HEADER(resultproc_t,rpc/pmap_clnt.h,\ + AC_DEFINE(HAVE_RESULTPROC_T) AC_MSG_RESULT(yes),\ + AC_MSG_RESULT(no)) + +dnl Checks for library functions. +AC_FUNC_MEMCMP +AC_FUNC_VPRINTF +AC_CHECK_FUNCS(setenv putenv) +AC_CHECK_FUNCS(fgetpwent putpwent fgetgrent getspnam) +AC_CHECK_FUNCS(inet_aton inet_pton vsyslog lckpwdf) +AC_CHECK_FUNCS(strdup strndup strerror strstr strsep stpcpy) +AC_CHECK_FUNCS(snprintf asprintf) +AC_CHECK_FUNCS(gethostname gettimeofday select socket uname getopt_long) +AC_CHECK_FUNCS(_rpc_dtablesize getdtablesize) +AC_CHECK_FUNCS(svc_getcaller svc_getrpccaller getline getdelim) +AC_CHECK_FUNCS(xdr_domainname xdr_ypxfrstat xdr_ypresp_xfr xdr_ypreq_xfr) +AC_CHECK_FUNCS(xdr_ypmap_parms xdr_ypreq_nokey xdr_ypresp_master xdr_mapname) +AC_CHECK_FUNCS(xdr_peername xdr_ypstat xdr_ypbind_binding xdr_yppushresp_xfr) +AC_CHECK_FUNCS(xdr_yppush_status) + +dnl +dnl Check for xsltproc +dnl +enable_man=yes +AC_PATH_PROG([XSLTPROC], [xsltproc]) +if test -z "$XSLTPROC"; then + enable_man=no +fi +AC_PATH_PROG([XMLLINT], [xmllint],[/bin/true]) +dnl check for DocBook DTD and stylesheets in the local catalog. +JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.3//EN], + [DocBook XML DTD V4.3], [], enable_man=no) +JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl], + [DocBook XSL Stylesheets], [], enable_man=no) +AM_CONDITIONAL(ENABLE_REGENERATE_MAN, test x$enable_man != xno) + +AC_CONFIG_FILES([Makefile + lib/Makefile etc/Makefile ypserv/Makefile + ypxfr/Makefile yppush/Makefile makedbm/Makefile mknetid/Makefile + revnetgroup/Makefile rpc.yppasswdd/Makefile rpc.ypxfrd/Makefile + yphelper/Makefile scripts/Makefile scripts/ypxfr_1perhour + scripts/ypxfr_1perday scripts/ypxfr_2perday scripts/pwupdate + scripts/create_printcap scripts/match_printcap + scripts/ypinit scripts/ypMakefile]) +AC_OUTPUT + +echo " +Configuration: + + Source code location: ${srcdir} + Compiler: ${CC} + Compiler flags: ${CFLAGS} + Preprocessor: ${CPP} + Preprocessor flags: ${CPPFLAGS} + Libraries: ${LIBS} ${LIBDBM} ${LIBCRYPT} ${LIBSYSTEMD_DAEMON} + Awk: ${AWK} + Shell: ${BASH} + NIS map dir: ${YPMAPDIR} + Install path prefix: ${prefix}" +if test ${sysconfdir} != '${prefix}/etc' +then + echo " Install ypserv.conf in: ${sysconfdir}" +else + echo " Install ypserv.conf in: ${prefix}/etc" +fi + echo " Allow root password: ${CHECKROOT}" + echo " Use FQDN as master name: ${USE_FQDN}" + echo " Notify systemd: ${USE_SD_NOTIFY}" +echo "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypserv-2.31/configure.in new/ypserv-2.32/configure.in --- old/ypserv-2.31/configure.in 2013-04-11 11:26:22.000000000 +0200 +++ new/ypserv-2.32/configure.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,389 +0,0 @@ -# -# Copyright (C) 1999-2013 Thorsten Kukuk <kukuk(a)linux-nis.org> -# -dnl Process this file with autoconf to produce a configure script. -AC_INIT([ypserv],[2.31],[kukuk(a)linux-nis.org]) -AM_INIT_AUTOMAKE -AC_CONFIG_SRCDIR([ypserv/ypserv.c]) -AC_CONFIG_HEADERS([config.h]) -AC_PREFIX_DEFAULT(/usr) -AH_BOTTOM([#include <conf_post.h>]) - -AC_SUBST(PACKAGE) -AC_SUBST(VERSION) - -dnl Some hacks... -test "${prefix}" = "NONE" && prefix="/usr" -if test ${prefix} = '/usr' -then -dnl If we use /usr as prefix, use /etc for ypserv.conf - if test ${sysconfdir} = '${prefix}/etc' - then - sysconfdir="/etc" - fi -dnl If we use /usr as prefix, use /usr/share/man for manual pages - if test ${mandir} = '${prefix}/man' - then - mandir='${prefix}/share/man' - fi -fi -dnl Change libexec to lib/yp -if test ${libexecdir} = '${exec_prefix}/libexec' -then - libexecdir='${exec_prefix}/lib/yp' - if test "${exec_prefix}" = "NONE" - then - YPBINDIR=/usr/lib/yp - else - YPBINDIR=${exec_prefix}/lib/yp - fi -else - YPBINDIR=${libexecdir} -fi -AC_SUBST(YPBINDIR) - -dnl Location of the NIS maps. default: /var/yp -AC_ARG_ENABLE([ypmapdir], - AS_HELP_STRING([--enable-ypmapdir=path], - [Location of NIS maps (default=/var/yp)]), - YPMAPDIR=$enableval, YPMAPDIR=/var/yp) -AC_SUBST(YPMAPDIR) - - -if test ${sbindir} = '${exec_prefix}/sbin' -then - if test "${exec_prefix}" = "NONE" - then - SBINDIR=/usr/sbin - else - SBINDIR=${exec_prefix}/sbin - fi -else - SBINDIR=${sbindir} -fi -AC_SUBST(SBINDIR) - -dnl Checks for programs. -AC_PROG_CC -AC_SEARCH_LIBS([strerror],[cposix]) -AC_PROG_CPP -AC_PROG_INSTALL -AC_PROG_MAKE_SET -AC_PROG_RANLIB -AM_PROG_CC_C_O -AC_USE_SYSTEM_EXTENSIONS - -if eval "test x$GCC = xyes"; then - for flag in \ - -pedantic \ - -W \ - -Wall \ - -Wbad-function-cast \ - -Wcast-align \ - -Wcast-qual \ - -Wmissing-declarations \ - -Wmissing-prototypes \ - -Wpointer-arith \ - -Wreturn-type \ - -Wstrict-prototypes - do - JAPHAR_GREP_CFLAGS($flag, [ CFLAGS="$CFLAGS $flag" ]) - done -fi - -AC_ARG_ENABLE(pie,AS_HELP_STRING([--disable-pie], - [Disable position-independent executeables (PIE)]), - USE_PIE=$enableval, USE_PIE=yes) - -AC_CACHE_CHECK(for -fpie, libc_cv_fpie, [dnl - cat > conftest.c <<EOF -int foo; -main () { return 0;} -EOF - if test "$USE_PIE" = "yes" && - AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -pie -fpie - -o conftest conftest.c 1>&AS_MESSAGE_LOG_FD]) - then - libc_cv_fpie=yes - PIE_CFLAGS="-fpie" - PIE_LDFLAGS="-pie" - else - libc_cv_fpie=no - PIE_CFLAGS="" - PIE_LDFLAGS="" - fi - rm -f conftest*]) -AC_SUBST(libc_cv_fpie) -AC_SUBST(PIE_CFLAGS) -AC_SUBST(PIE_LDFLAGS) - -AM_WITH_DMALLOC -AM_WITH_EFENCE - -dnl Check for big or little endian system -AC_C_BIGENDIAN -dnl Check for 64bit systems -AC_CHECK_SIZEOF(long) - -dnl Search a awk program -AC_PATH_PROGS(AWK, mawk gawk nawk awk, ERROR) -if test $AWK = ERROR -then - echo " " - echo "ERROR: You must have at last one of the following programs:" - echo " mawk, gawk, nawk or awk !" - echo " " - exit -fi - -dnl Search the bash -AC_PATH_PROGS(BASH, bash /sbin/sh, /bin/sh) - -dnl Search make -AC_PATH_PROGS(MAKE, gmake make, "", $PATH:/usr/ccs/bin:/usr/local/bin) -if test x$MAKE = x -then - echo " " - echo "Warning: No make on this system?" - echo " " - exit -fi -AC_SUBST(MAKE) - -dnl Check for aliases path -AC_PATH_PROG(ALIASES, aliases, /etc/mail/aliases, /etc/mail:/etc) - - - -dnl Should we use a gethostbyname after gethostname to use FQDN ? default yes -AC_ARG_ENABLE(fqdn, AS_HELP_STRING([--disable-fqdn], - [Always use FQDN (default=yes)]), - USE_PARAM_FQDN=$enableval, USE_PARAM_FQDN=yes) -if test "$USE_PARAM_FQDN" = "no"; then - USE_FQDN=0 -else - USE_FQDN=1 -fi -AC_SUBST(USE_FQDN) - -dnl Should we allow root to change a password with yppasswd ? default: yes -AC_ARG_ENABLE([checkroot],AS_HELP_STRING([--disable-checkroot], - [Disable check for root password (default=yes)]), - CHECKROOT=$enableval, CHECKROOT=yes) -AC_SUBST(CHECKROOT) - -# Check for --with-dbmliborder -dbmliborder="gdbm ndbm qdbm tokyocabinet" -AC_MSG_CHECKING(for --with-dbmliborder) -AC_ARG_WITH(dbmliborder, - AS_HELP_STRING([--with-dbmliborder=db1:db2:...], [order to check db backends for dbm. Valid value is a colon separated string with the backend names `ndbm', `gdbm', `qdbm' and `tokyocabinet'.]), -[ -if test x$with_dbmliborder = xyes -then - AC_MSG_ERROR([proper usage is --with-dbmliborder=db1:db2:...]) -else - dbmliborder=`echo $with_dbmliborder | sed 's/:/ /g'` - for db in $dbmliborder; do - if test x$db != xndbm && test x$db != xgdbm && test x$db != xqdbm && test x$db != xtokyocabinet - then - AC_MSG_ERROR([proper usage is --with-dbmliborder=db1:db2:...]) - fi - done -fi]) -AC_MSG_RESULT($with_dbmliborder) - -# find which dbm we have -for db in $dbmliborder; do - if test x$db = xqdbm - then - AC_CHECK_LIB(qdbm,gdbm_open,LIBDBM="$( pkg-config --libs qdbm )" ; CFLAGS="$( pkg-config --cflags qdbm ) $CFLAGS",LIBDBM="") - if test x"" != x"${LIBDBM}" - then - AC_DEFINE(HAVE_LIBQDBM, 1, [Use qdbm library as database]) - libdb_parameter=yes - break - fi - elif test x$db = xgdbm - then - AC_CHECK_LIB(gdbm,gdbm_open,LIBDBM="-lgdbm",LIBDBM="") - if test x"" != x"${LIBDBM}" - then - AC_DEFINE(HAVE_LIBGDBM, 1, [Use gdbm library as database]) - libdb_parameter=yes - break - fi - elif test x$db = xtokyocabinet - then - AC_CHECK_LIB(tokyocabinet,tcbdbopen,LIBDBM="-ltokyocabinet",LIBDBM="") - if test x"" != x"${LIBDBM}" - then - AC_DEFINE(HAVE_LIBTC, 1, [Use tokyocabinet library as database]) - libdb_parameter=yes - break - fi - elif test x$db = xndbm - then - AC_CHECK_FUNCS(dbm_open) - if test x$ac_cv_func_dbm_open = xyes - then - AC_DEFINE(HAVE_NDBM, 1, [Use ndbm library as database]) - libdb_parameter=yes - break - fi - fi -done -AC_SUBST(LIBDBM) - -if test x$libdb_parameter != xyes -then - echo " - - You need the GNU GDBM, QDBM, Tokyo Cabinet or the Solaris NDBM functions for this package !" - echo "" - echo "" - exit -fi - -AC_CHECK_LIB(xcrypt,crypt,LIBCRYPT="-lxcrypt",LIBCRYPT="") -if test -z "$LIBCRYPT" ; then - AC_CHECK_LIB(crypt,crypt,LIBCRYPT="-lcrypt",LIBCRYPT="") - AC_CHECK_HEADERS(crypt.h) -else - AC_CHECK_HEADERS(xcrypt.h crypt.h) -fi -AC_SUBST(LIBCRYPT) - -USE_SLP=0 -AC_CHECK_LIB(slp,SLPReg,LIBSLP="-lslp",LIBSLP="") -AC_SUBST(LIBSLP) -if test -n "$LIBSLP" ; then - AC_CHECK_HEADERS(slp.h) - if test "$ac_cv_header_slp_h" = yes; then - USE_SLP=1 - fi -fi -AC_SUBST(USE_SLP) - -AC_CHECK_FUNCS(getrpcport) -if test "$ac_cv_func_getrpcport" = no; then - AC_CHECK_LIB([rpcsvc], [getrpcport], - [ac_cv_func_getrpcport=yes; LIBS="-lrpcsvc $LIBS"]) -fi - -USE_SD_NOTIFY=0 -AC_SUBST(USE_SD_NOTIFY) -AC_CHECK_LIB(systemd-daemon,sd_notify,LIBSYSTEMD_DAEMON="-lsystemd-daemon", - LIBSYSTEMD_DAEMON="") -if test -n "$LIBSYSTEMD_DAEMON" ; then - AC_CHECK_HEADERS(systemd/sd-daemon.h) - if test "$ac_cv_header_systemd_sd_daemon_h" = yes; then - USE_SD_NOTIFY=1 - fi -fi -AC_SUBST(USE_SD_NOTIFY) -AC_SUBST(LIBSYSTEMD_DAEMON) - -AC_CHECK_LIB(nsl,gethostbyname) -AC_CHECK_LIB(socket,socket) -AC_CHECK_LIB(resolv, res_gethostbyname, RESOLV="-lresolv", RESOLV="") -if test x$RESOLV != x -then - AC_DEFINE(HAVE_RES_GETHOSTBYNAME, 1, [Define if you have the res_gethostbyname function.]) -else - AC_CHECK_LIB(resolv+, gethostbyname, RESOLV="-lresolv+", RESOLV="") -fi -AC_SUBST(RESOLV) - -dnl Checks for header files. -AC_HEADER_DIRENT -AC_HEADER_STDC -AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS(fcntl.h paths.h sys/file.h sys/time.h syslog.h unistd.h) -AC_CHECK_HEADERS(getopt.h shadow.h rpc/clnt_soc.h rpc/svc_soc.h) -AC_CHECK_HEADERS(netinet/in.h alloca.h) -AC_CHECK_TYPE(in_addr_t, ,[AC_DEFINE(in_addr_t,int,[Define to int if you don't have in_addr_t])],[#include <netinet/in.h>]) - -dnl Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST -AC_C_INLINE -AC_C___ATTRIBUTE__ -TYPE_SOCKLEN_T -AC_TYPE_PID_T -AC_TYPE_SIZE_T -AC_HEADER_TIME - -dnl Checks if resultproc_t has been defined -AC_MSG_CHECKING(for resultproc_t in rpc/clnt.h) -AC_EGREP_HEADER(resultproc_t,rpc/clnt.h,\ - AC_DEFINE(HAVE_RESULTPROC_T, 1, [Define if the systems has the resultproc_t type.]) AC_MSG_RESULT(yes),\ - AC_MSG_RESULT(no)) -AC_MSG_CHECKING(for resultproc_t in rpc/pmap_clnt.h) -AC_EGREP_HEADER(resultproc_t,rpc/pmap_clnt.h,\ - AC_DEFINE(HAVE_RESULTPROC_T) AC_MSG_RESULT(yes),\ - AC_MSG_RESULT(no)) - -dnl Checks for library functions. -AC_FUNC_MEMCMP -AC_FUNC_VPRINTF -AC_CHECK_FUNCS(setenv putenv) -AC_CHECK_FUNCS(fgetpwent putpwent fgetgrent getspnam) -AC_CHECK_FUNCS(inet_aton inet_pton vsyslog lckpwdf) -AC_CHECK_FUNCS(strdup strndup strerror strstr strsep stpcpy) -AC_CHECK_FUNCS(snprintf asprintf) -AC_CHECK_FUNCS(gethostname gettimeofday select socket uname getopt_long) -AC_CHECK_FUNCS(_rpc_dtablesize getdtablesize) -AC_CHECK_FUNCS(svc_getcaller svc_getrpccaller getline getdelim) -AC_CHECK_FUNCS(xdr_domainname xdr_ypxfrstat xdr_ypresp_xfr xdr_ypreq_xfr) -AC_CHECK_FUNCS(xdr_ypmap_parms xdr_ypreq_nokey xdr_ypresp_master xdr_mapname) -AC_CHECK_FUNCS(xdr_peername xdr_ypstat xdr_ypbind_binding xdr_yppushresp_xfr) -AC_CHECK_FUNCS(xdr_yppush_status) - -dnl -dnl Check for xsltproc -dnl -enable_man=yes -AC_PATH_PROG([XSLTPROC], [xsltproc]) -if test -z "$XSLTPROC"; then - enable_man=no -fi -AC_PATH_PROG([XMLLINT], [xmllint],[/bin/true]) -dnl check for DocBook DTD and stylesheets in the local catalog. -JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.3//EN], - [DocBook XML DTD V4.3], [], enable_man=no) -JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl], - [DocBook XSL Stylesheets], [], enable_man=no) -AM_CONDITIONAL(ENABLE_REGENERATE_MAN, test x$enable_man != xno) - -AC_CONFIG_FILES([Makefile - lib/Makefile etc/Makefile ypserv/Makefile - ypxfr/Makefile yppush/Makefile makedbm/Makefile mknetid/Makefile - revnetgroup/Makefile rpc.yppasswdd/Makefile rpc.ypxfrd/Makefile - yphelper/Makefile scripts/Makefile scripts/ypxfr_1perhour - scripts/ypxfr_1perday scripts/ypxfr_2perday scripts/pwupdate - scripts/create_printcap scripts/match_printcap - scripts/ypinit scripts/ypMakefile]) -AC_OUTPUT - -echo " -Configuration: - - Source code location: ${srcdir} - Compiler: ${CC} - Compiler flags: ${CFLAGS} - Preprocessor: ${CPP} - Preprocessor flags: ${CPPFLAGS} - Libraries: ${LIBS} ${LIBDBM} ${LIBCRYPT} ${LIBSYSTEMD_DAEMON} - Awk: ${AWK} - Shell: ${BASH} - NIS map dir: ${YPMAPDIR} - Install path prefix: ${prefix}" -if test ${sysconfdir} != '${prefix}/etc' -then - echo " Install ypserv.conf in: ${sysconfdir}" -else - echo " Install ypserv.conf in: ${prefix}/etc" -fi - echo " Allow root password: ${CHECKROOT}" - echo " Use FQDN as master name: ${USE_FQDN}" - echo " Notify systemd: ${USE_SD_NOTIFY}" -echo "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypserv-2.31/lib/Makefile.am new/ypserv-2.32/lib/Makefile.am --- old/ypserv-2.31/lib/Makefile.am 2013-04-09 16:38:20.000000000 +0200 +++ new/ypserv-2.32/lib/Makefile.am 2013-11-06 15:08:28.000000000 +0100 @@ -15,7 +15,7 @@ DEFS = @DEFS@ -D_REENTRANT=1 -DCONFDIR=\"$(sysconfdir)\" -DUSE_SLP=@USE_SLP@ \ -DUSE_SD_NOTIFY=@USE_SD_NOTIFY@ -INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) AM_CFLAGS = @PIE_CFLAGS@ libyp_a_SOURCES = log_msg.c ypserv_conf.c ypxfrd_xdr.c \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypserv-2.31/lib/yp_db.c new/ypserv-2.32/lib/yp_db.c --- old/ypserv-2.31/lib/yp_db.c 2013-04-10 16:42:21.000000000 +0200 +++ new/ypserv-2.32/lib/yp_db.c 2013-11-06 14:57:35.000000000 +0100 @@ -181,6 +181,12 @@ } else if (debug_flag) log_msg ("\t\t->Returning OK!"); + if ( !isok ) + { + /* DB not successful opened. Close database object and set return value to NULL. */ + tcbdbdel (dbp); + dbp = NULL; + } } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypserv-2.31/lib/ypserv_conf.c new/ypserv-2.32/lib/ypserv_conf.c --- old/ypserv-2.31/lib/ypserv_conf.c 2013-04-10 16:42:29.000000000 +0200 +++ new/ypserv-2.32/lib/ypserv_conf.c 2013-07-22 17:00:40.000000000 +0200 @@ -1,4 +1,4 @@ -/* Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2006, 2008, 2011 Thorsten Kukuk +/* Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2006, 2008, 2011, 2013 Thorsten Kukuk Author: Thorsten Kukuk <kukuk(a)suse.de> The YP Server is free software; you can redistribute it and/or @@ -169,7 +169,8 @@ load_ypserv_conf (const char *path) { FILE *in; - char c, *cp; + int c; + char *cp; char buf1[1025], buf2[1025] = "", buf3[1025]; long line = 0; conffile_t *ptr = NULL, *work = NULL; @@ -184,7 +185,7 @@ return NULL; } - while ((c = fgetc (in)) != (char) EOF) + while ((c = fgetc (in)) != EOF) { /*while */ line++; switch (tolower (c)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypserv-2.31/makedbm/Makefile.am new/ypserv-2.32/makedbm/Makefile.am --- old/ypserv-2.31/makedbm/Makefile.am 2007-10-01 14:12:29.000000000 +0200 +++ new/ypserv-2.32/makedbm/Makefile.am 2013-11-06 15:08:58.000000000 +0100 @@ -8,7 +8,7 @@ DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\" -DYPBINDIR=\"$(libexecdir)\" \ -DCONFDIR=\"$(sysconfdir)\" -DYPMAPDIR=\"/var/yp\" \ -DUSE_FQDN=@USE_FQDN@ -INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) +AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) CLEANFILES = *~ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypserv-2.31/mknetid/Makefile.am new/ypserv-2.32/mknetid/Makefile.am --- old/ypserv-2.31/mknetid/Makefile.am 2006-08-02 14:39:44.000000000 +0200 +++ new/ypserv-2.32/mknetid/Makefile.am 2013-11-06 15:09:06.000000000 +0100 @@ -8,7 +8,7 @@ DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\" -DYPBINDIR=\"$(libexecdir)\" \ -DCONFDIR=\"$(sysconfdir)\" -DYPMAPDIR=\"/var/yp\" -INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) +AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) CLEANFILES = *~ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypserv-2.31/revnetgroup/Makefile.am new/ypserv-2.32/revnetgroup/Makefile.am --- old/ypserv-2.31/revnetgroup/Makefile.am 2006-08-02 14:54:29.000000000 +0200 +++ new/ypserv-2.32/revnetgroup/Makefile.am 2013-11-06 15:09:13.000000000 +0100 @@ -8,7 +8,7 @@ DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\" -DYPBINDIR=\"$(libexecdir)\" \ -DCONFDIR=\"$(sysconfdir)\" -DYPMAPDIR=\"/var/yp\" -INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) +AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) CLEANFILES = *~ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypserv-2.31/rpc.yppasswdd/Makefile.am new/ypserv-2.32/rpc.yppasswdd/Makefile.am --- old/ypserv-2.31/rpc.yppasswdd/Makefile.am 2013-04-11 11:25:34.000000000 +0200 +++ new/ypserv-2.32/rpc.yppasswdd/Makefile.am 2013-11-06 15:09:19.000000000 +0100 @@ -9,7 +9,7 @@ DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\" -DYPBINDIR=\"$(libexecdir)\" \ -DCONFDIR=\"$(sysconfdir)\" -DYPMAPDIR=\"@YPMAPDIR@\" \ -DUSE_FQDN=@USE_FQDN@ -INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) +AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) CLEANFILES = *~ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypserv-2.31/rpc.ypxfrd/Makefile.am new/ypserv-2.32/rpc.ypxfrd/Makefile.am --- old/ypserv-2.31/rpc.ypxfrd/Makefile.am 2013-04-09 16:38:20.000000000 +0200 +++ new/ypserv-2.32/rpc.ypxfrd/Makefile.am 2013-11-06 15:09:26.000000000 +0100 @@ -9,7 +9,7 @@ DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\" -DYPBINDIR=\"$(libexecdir)\" \ -DCONFDIR=\"$(sysconfdir)\" -DYPMAPDIR=\"@YPMAPDIR@\" \ -DUSE_FQDN=@USE_FQDN@ -DXFRBLOCKSIZE=65535 -INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) +AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) CLEANFILES = *~ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypserv-2.31/scripts/ypMakefile.in new/ypserv-2.32/scripts/ypMakefile.in --- old/ypserv-2.31/scripts/ypMakefile.in 2012-01-27 15:53:03.000000000 +0100 +++ new/ypserv-2.32/scripts/ypMakefile.in 2013-11-06 15:00:12.000000000 +0100 @@ -37,8 +37,8 @@ # the passwd file. If no entry is found, this shadow entry is # ignored. # MINGID is the lowest gid that will be included in the group maps. -MINUID=500 -MINGID=500 +MINUID=$(shell TMP=`egrep '^UID_MIN\s+[0-9]+' /etc/login.defs|sed -e 's/^UID_MIN//'` ; [ -n "$$TMP" ] && echo "$$TMP" || echo 1000) +MINGID=$(shell TMP=`egrep '^GID_MIN\s+[0-9]+' /etc/login.defs|sed -e 's/^GID_MIN//'` ; [ -n "$$TMP" ] && echo "$$TMP" || echo 1000) # Should we merge the passwd file with the shadow file ? # MERGE_PASSWD=true|false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypserv-2.31/yphelper/Makefile.am new/ypserv-2.32/yphelper/Makefile.am --- old/ypserv-2.31/yphelper/Makefile.am 2009-05-12 11:57:16.000000000 +0200 +++ new/ypserv-2.32/yphelper/Makefile.am 2013-11-06 15:09:35.000000000 +0100 @@ -5,7 +5,7 @@ localedir = $(datadir)/locale -INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) +AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\" -DYPBINDIR=\"$(libexecdir)\" \ -DCONFDIR=\"$(sysconfdir)\" -DYPMAPDIR=\"/var/yp\" \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypserv-2.31/yppush/Makefile.am new/ypserv-2.32/yppush/Makefile.am --- old/ypserv-2.31/yppush/Makefile.am 2009-04-02 14:15:35.000000000 +0200 +++ new/ypserv-2.32/yppush/Makefile.am 2013-11-06 15:09:41.000000000 +0100 @@ -8,7 +8,7 @@ DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\" -DYPBINDIR=\"$(libexecdir)\" \ -DCONFDIR=\"$(sysconfdir)\" -DYPMAPDIR=\"/var/yp\" \ -DUSE_FQDN=@USE_FQDN@ -INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) +AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) CLEANFILES = *~ ${MANS} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypserv-2.31/yppush/yppush.8 new/ypserv-2.32/yppush/yppush.8 --- old/ypserv-2.31/yppush/yppush.8 2013-04-10 15:39:18.000000000 +0200 +++ new/ypserv-2.32/yppush/yppush.8 2013-10-07 14:31:44.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: yppush .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 04/10/2013 +.\" Date: 10/07/2013 .\" Manual: NIS Reference Manual .\" Source: NIS Reference Manual .\" Language: English .\" -.TH "YPPUSH" "8" "04/10/2013" "NIS Reference Manual" "NIS Reference Manual" +.TH "YPPUSH" "8" "10/07/2013" "NIS Reference Manual" "NIS Reference Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -49,7 +49,7 @@ \fBypservers\fR within the \fIdomain\&.\fR -A destination host (or a list of hosts with multiple \-h commands) can also be specified on the command line\&. A "transfer map" request is sent to the NIS serger at each slave, along with the information needed by the transfer agent ypxfr(8) to callback to yppush, which may be printed the result to stderr\&. Messages are also printed when a transfer is not possible; for instance when the request message is undeliverable\&. +A destination host (or a list of hosts with multiple \-h commands) can also be specified on the command line\&. A "transfer map" request is sent to the NIS server at each slave, along with the information needed by the transfer agent ypxfr(8) to callback to yppush, which may be printed the result to stderr\&. Messages are also printed when a transfer is not possible; for instance when the request message is undeliverable\&. .PP To specify a port number or use any other \fByppush\fR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypserv-2.31/yppush/yppush.8.xml new/ypserv-2.32/yppush/yppush.8.xml --- old/ypserv-2.31/yppush/yppush.8.xml 2012-01-27 15:55:29.000000000 +0100 +++ new/ypserv-2.32/yppush/yppush.8.xml 2013-10-07 14:30:58.000000000 +0200 @@ -53,7 +53,7 @@ <emphasis remap='I'>domain.</emphasis> A destination host (or a list of hosts with multiple -h commands) can also be specified on the command line. -A "transfer map" request is sent to the NIS serger at each slave, along +A "transfer map" request is sent to the NIS server at each slave, along with the information needed by the transfer agent ypxfr(8) to callback to yppush, which may be printed the result to stderr. Messages are also printed when a transfer is not possible; for instance when the request diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypserv-2.31/ypserv/Makefile.am new/ypserv-2.32/ypserv/Makefile.am --- old/ypserv-2.31/ypserv/Makefile.am 2013-04-09 16:38:20.000000000 +0200 +++ new/ypserv-2.32/ypserv/Makefile.am 2013-11-06 15:09:53.000000000 +0100 @@ -7,7 +7,7 @@ DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\" -DYPBINDIR=\"$(libexecdir)\" \ -DYPMAPDIR=\"@YPMAPDIR@\" -DUSE_FQDN=@USE_FQDN@ -DUSE_SLP=@USE_SLP@ -INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) +AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) CLEANFILES = *~ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypserv-2.31/ypserv/ypserv.8 new/ypserv-2.32/ypserv/ypserv.8 --- old/ypserv-2.31/ypserv/ypserv.8 2013-04-10 10:30:53.000000000 +0200 +++ new/ypserv-2.32/ypserv/ypserv.8 2013-11-06 13:56:25.000000000 +0100 @@ -1,13 +1,22 @@ '\" t .\" Title: ypserv .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 01/27/2010 +.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> +.\" Date: 11/06/2013 .\" Manual: NIS Reference Manual .\" Source: NIS Reference Manual .\" Language: English .\" -.TH "YPSERV" "8" "01/27/2010" "NIS Reference Manual" "NIS Reference Manual" +.TH "YPSERV" "8" "11/06/2013" "NIS Reference Manual" "NIS Reference Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -22,7 +31,7 @@ ypserv \- NIS Server .SH "SYNOPSIS" .HP \w'\fB/usr/sbin/ypserv\fR\ 'u -\fB/usr/sbin/ypserv\fR [\-d\] [\-p\ \fIport\fR] [\-f|\-\-foreground] +\fB/usr/sbin/ypserv\fR [\-d\ [\fIpath\fR]] [\-p\ \fIport\fR] .SH "DESCRIPTION" .PP .\" ypserv: ypserv \(em NIS server process @@ -58,11 +67,15 @@ /etc/ypserv\&.conf\&. .SH "OPTIONS" .PP -\fB\-d\fR, \fB\-\-debug +\fB\-d\fR, \fB\-\-debug \fR[\fIpath\fR] .RS 4 Causes the server to run in debugging mode\&. Normally, \fBypserv\fR reports only errors (access violations, dbm failures) using the syslog(3) facility\&. In debug mode, the server does not background itself and prints extra status messages to stderr for each request that it revceives\&. +\fBpath\fR +is an optionally parameter\&. +\fBypserv\fR +is using this directory instead of /var/yp .RE .PP \fB\-p\fR, \fB\-\-port\fR \fIport\fR @@ -75,11 +88,6 @@ .RS 4 Prints the version number .RE -.PP -\fB\-f\fR, \fB\-\-foreground\fR -.RS 4 -will not put itself into background\&. -.RE .SH "SECURITY" .PP In general, any remote user can issue an RPC to @@ -96,7 +104,6 @@ .PP A sample securenets file might look like this: .RS 4 - .sp .if n \{\ .RS 4 @@ -129,14 +136,9 @@ .PP In the /etc/ypserv\&.conf -you could specify some access rules for special maps and hosts\&. But it is not very secure, it makes the life only a little bit harder for a potential hacker\&. If a mapname doesn\'t match a rule, ypserv will look for the YP_SECURE key in the map\&. If it exists, ypserv will only allow requests on a reserved port\&. +you could specify some access rules for special maps and hosts\&. But it is not very secure, it makes the life only a little bit harder for a potential hacker\&. If a mapname doesn\*(Aqt match a rule, ypserv will look for the YP_SECURE key in the map\&. If it exists, ypserv will only allow requests on a reserved port\&. .PP For security reasons, ypserv will only accept ypproc_xfr requests for updating maps from the same master server as the old one\&. This means, you have to reinstall the slave servers if you change the master server for a map\&. -.SH "BUGS" -.PP -Sending the signal -\fBSIGHUP\fR -to the server can lead to a deadlock or crash\&. .SH "FILES" .PP /etc/ypserv\&.conf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypserv-2.31/ypserv/ypserv.8.xml new/ypserv-2.32/ypserv/ypserv.8.xml --- old/ypserv-2.31/ypserv/ypserv.8.xml 2010-01-27 13:07:03.000000000 +0100 +++ new/ypserv-2.32/ypserv/ypserv.8.xml 2013-11-06 13:55:14.000000000 +0100 @@ -164,11 +164,6 @@ for a map.</para> </refsect1> -<refsect1 id='bugs'><title>BUGS</title> -<para>Sending the signal <emphasis remap='B'>SIGHUP</emphasis> to the server can lead to -a deadlock or crash.</para> -</refsect1> - <refsect1 id='files'><title>FILES</title> <variablelist remap='TP'> <varlistentry> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypserv-2.31/ypserv/ypserv.c new/ypserv-2.32/ypserv/ypserv.c --- old/ypserv-2.31/ypserv/ypserv.c 2013-04-10 16:43:16.000000000 +0200 +++ new/ypserv-2.32/ypserv/ypserv.c 2013-11-06 13:54:41.000000000 +0100 @@ -286,22 +286,6 @@ exit (0); } -/* Reload securenets and config file */ -static void -sig_hup (int sig UNUSED) -{ - int save_errno = errno; - int old_cached_filehandles = cached_filehandles; - - load_securenets (); - load_config (); - /* Don't allow to decrease the number of max. cached files with - SIGHUP. */ - if (cached_filehandles < old_cached_filehandles) - cached_filehandles = old_cached_filehandles; - errno = save_errno; -} - /* Clean up after child processes signal their termination. */ static void sig_child (int sig UNUSED) @@ -467,9 +451,9 @@ signal (SIGTERM, sig_quit); signal (SIGINT, sig_quit); /* - * If we get a SIGHUP, reload the securenets and config file. + * Ignore SIGHUP, it's not safe and we cannot reload all variables */ - signal (SIGHUP, sig_hup); + signal (SIGHUP, SIG_IGN); /* * If we get a SIGUSR1, enable/disable debuging. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypserv-2.31/ypxfr/Makefile.am new/ypserv-2.32/ypxfr/Makefile.am --- old/ypserv-2.31/ypxfr/Makefile.am 2009-04-02 15:01:30.000000000 +0200 +++ new/ypserv-2.32/ypxfr/Makefile.am 2013-11-06 15:10:08.000000000 +0100 @@ -6,7 +6,7 @@ localedir = $(datadir)/locale DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\" -DYPMAPDIR=\"@YPMAPDIR@\" -INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) +AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) CLEANFILES = *~ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-ruby-bindings for openSUSE:Factory
by root＠hilbert.suse.de 07 Nov '13

07 Nov '13

Hello community, here is the log from the commit of package yast2-ruby-bindings for openSUSE:Factory checked in at 2013-11-07 09:15:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-ruby-bindings (Old) and /work/SRC/openSUSE:Factory/.yast2-ruby-bindings.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-ruby-bindings" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-ruby-bindings/yast2-ruby-bindings.changes 2013-10-19 11:21:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-ruby-bindings.new/yast2-ruby-bindings.changes 2013-11-07 09:15:34.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Oct 25 14:26:08 UTC 2013 - jreidinger(a)suse.com + +- report exceptions via Report.Error so there is no hidden failures +- detect invalid response type from clients + (gh#yast/yast-ruby-bindings#81) +- 3.1.2 + +------------------------------------------------------------------- Old: ---- yast2-ruby-bindings-3.1.1.tar.bz2 New: ---- yast2-ruby-bindings-3.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ruby-bindings.spec ++++++ --- /var/tmp/diff_new_pack.2y7uVk/_old 2013-11-07 09:15:35.000000000 +0100 +++ /var/tmp/diff_new_pack.2y7uVk/_new 2013-11-07 09:15:35.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-ruby-bindings -Version: 3.1.1 +Version: 3.1.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-ruby-bindings-%{version}.tar.bz2 ++++++ yast2-ruby-bindings-3.1.1.tar.bz2 -> yast2-ruby-bindings-3.1.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.1/CONTRIBUTING.md new/yast2-ruby-bindings-3.1.2/CONTRIBUTING.md --- old/yast2-ruby-bindings-3.1.1/CONTRIBUTING.md 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-ruby-bindings-3.1.2/CONTRIBUTING.md 2013-11-04 17:05:39.000000000 +0100 @@ -0,0 +1,87 @@ +YaST Contribution Guidelines +============================ + +YaST is an open source project and as such it welcomes all kinds of +contributions. If you decide to contribute, please follow these guidelines to +ensure the process is effective and pleasant both for you and YaST maintainers. + +There are two main forms of contribution: reporting bugs and performing code +changes. + +Bug Reports +----------- + +If you find a problem, please report it either using +[Bugzilla](https://bugzilla.novell.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2) +or [GitHub issues](../../issues). (For Bugzilla, use the [simplified +registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp) +if you don't have an account yet.) + +If you find a problem, please report it either using +[Bugzilla](https://bugzilla.novell.com/) or GitHub issues. We can't guarantee +that every bug will be fixed, but we'll try. + +When creating a bug report, please follow our [bug reporting +guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug). + +Code Changes +------------ + +We welcome all kinds of code contributions, from simple bug fixes to significant +refactorings and implementation of new features. However, before making any +non-trivial contribution, get in touch with us first — this can prevent wasted +effort on both sides. Also, have a look at our [development +documentation](http://en.opensuse.org/openSUSE:YaST_development). + +To send us your code change, use GitHub pull requests. The workflow is as +follows: + + 1. Fork the project. + + 2. Create a topic branch based on `master`. + + 3. Implement your change, including tests (if possible). Make sure you adhere + to the [Ruby style + guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md). + + 4. Make sure your change didn't break anything by building the RPM package + (`rake osc:build`). The build process includes running the full testsuite. + + 5. Publish the branch and create a pull request. + + 6. YaST developers will review your change and possibly point out issues. + Adapt the code under their guidance until they are all resolved. + + 7. Finally, the pull request will get merged or rejected. + +See also [GitHub's guide on +contributing](https://help.github.com/articles/fork-a-repo). + +If you want to do multiple unrelated changes, use separate branches and pull +requests. + +Do not change the `VERSION` and `*.changes` files as this could lead to +conflicts. + +### Commits + +Each commit in the pull request should do only one thing, which is clearly +described by its commit message. Especially avoid mixing formatting changes and +functional changes into one commit. When writing commit messages, adhere to +[widely used +conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html). + +If your commit is related to a bug in Buzgilla or an issue on GitHub, make sure +you mention it in the commit message for cross-reference. Use format like +bnc#775814 or gh#yast/yast-foo#42. See also [GitHub +autolinking](https://help.github.com/articles/github-flavored-markdown#references) +and [openSUSE abbreviation +reference](http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Current_set_of_abbreviations). + +Additional Information +---------------------- + +If you have any question, feel free to ask at the [development mailing +list](http://lists.opensuse.org/yast-devel/) or at the +[#yast](http://webchat.freenode.net/?channels=%23yast) IRC channel on freenode. +We'll do our best to provide a timely and accurate answer. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.1/VERSION new/yast2-ruby-bindings-3.1.2/VERSION --- old/yast2-ruby-bindings-3.1.1/VERSION 2013-10-15 15:26:18.000000000 +0200 +++ new/yast2-ruby-bindings-3.1.2/VERSION 2013-11-04 17:05:39.000000000 +0100 @@ -1 +1 @@ -3.1.1 +3.1.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.1/package/yast2-ruby-bindings.changes new/yast2-ruby-bindings-3.1.2/package/yast2-ruby-bindings.changes --- old/yast2-ruby-bindings-3.1.1/package/yast2-ruby-bindings.changes 2013-10-15 15:26:18.000000000 +0200 +++ new/yast2-ruby-bindings-3.1.2/package/yast2-ruby-bindings.changes 2013-11-04 17:05:39.000000000 +0100 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Oct 25 14:26:08 UTC 2013 - jreidinger(a)suse.com + +- report exceptions via Report.Error so there is no hidden failures +- detect invalid response type from clients + (gh#yast/yast-ruby-bindings#81) +- 3.1.2 + +------------------------------------------------------------------- Tue Oct 15 13:01:18 UTC 2013 - lslezak(a)suse.cz - float_to_lstring(): do not crash when glibc-locale is missing, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.1/package/yast2-ruby-bindings.spec new/yast2-ruby-bindings-3.1.2/package/yast2-ruby-bindings.spec --- old/yast2-ruby-bindings-3.1.1/package/yast2-ruby-bindings.spec 2013-10-15 15:26:18.000000000 +0200 +++ new/yast2-ruby-bindings-3.1.2/package/yast2-ruby-bindings.spec 2013-11-04 17:05:39.000000000 +0100 @@ -3,7 +3,7 @@ # Name: yast2-ruby-bindings -Version: 3.1.0 +Version: 3.1.2 Release: 0 License: GPL-2.0 Group: System/YaST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.1/src/binary/CMakeLists.txt new/yast2-ruby-bindings-3.1.2/src/binary/CMakeLists.txt --- old/yast2-ruby-bindings-3.1.1/src/binary/CMakeLists.txt 2013-10-15 15:26:18.000000000 +0200 +++ new/yast2-ruby-bindings-3.1.2/src/binary/CMakeLists.txt 2013-11-04 17:05:39.000000000 +0100 @@ -67,10 +67,9 @@ # tight control) CMake should be able to handle this. However, it somehow does # not work. # -#set_target_properties( yastx PROPERTIES SKIP_BUILD_RPATH FALSE) -#set_target_properties( yastx PROPERTIES BUILD_WITH_INSTALL_RPATH FALSE) -#set_target_properties( yastx PROPERTIES INSTALL_RPATH_USE_LINK_PATH FALSE) -#set_target_properties( yastx PROPERTIES INSTALL_RPATH "${YAST_PLUGIN_DIR}") +# jreidinger: new cmake start stripping it, so it need to be explicitelly added +set_target_properties( yastx PROPERTIES INSTALL_RPATH "${YAST_PLUGIN_DIR}") +set_target_properties( builtinx PROPERTIES INSTALL_RPATH "${YAST_PLUGIN_DIR}") # # So using an explicit linker option instead: # (http://www.cmake.org/pipermail/cmake/2008-January/019321.html) @@ -109,4 +108,5 @@ target_link_libraries( py2lang_ruby ${YAST_YCP_LIBRARY} ) target_link_libraries( py2lang_ruby ${YAST_PLUGIN_WFM_LIBRARY} ) target_link_libraries( py2lang_ruby ${RUBY_LIBRARY} ) +set_target_properties( py2lang_ruby PROPERTIES INSTALL_RPATH "${YAST_PLUGIN_DIR}") install(TARGETS py2lang_ruby LIBRARY DESTINATION ${YAST_PLUGIN_DIR} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.1/src/ruby/yast/scr.rb new/yast2-ruby-bindings-3.1.2/src/ruby/yast/scr.rb --- old/yast2-ruby-bindings-3.1.1/src/ruby/yast/scr.rb 2013-10-15 15:26:18.000000000 +0200 +++ new/yast2-ruby-bindings-3.1.2/src/ruby/yast/scr.rb 2013-11-04 17:05:39.000000000 +0100 @@ -4,47 +4,110 @@ # Wrapper class for SCR component in Yast # See yast documentation for SCR module SCR - def self.Read *args - call_builtin_wrapper("Read",*args) - end - - def self.Write *args - call_builtin_wrapper("Write", *args) - end - - def self.Execute *args - call_builtin_wrapper("Execute", *args) - end - - def self.Dir *args - call_builtin_wrapper("Dir", *args) - end - - def self.Error *args - call_builtin_wrapper("Error", *args) - end - - def self.RegisterAgent *args - call_builtin_wrapper("RegisterAgent", *args) - end - - def self.RegisterNewAgents *args - call_builtin_wrapper("RegisterNewAgents", *args) - end - - def self.UnregisterAgent *args - call_builtin_wrapper("UnregisterAgent", *args) - end - - def self.UnregisterAllAgents *args - call_builtin_wrapper("UnregisterAllAgents", *args) - end - def self.UnmountAgent *args - call_builtin_wrapper("UnmountAgent", *args) + # Reads data + # @param path[Yast::Path] path that is combination of path where agent is + # attached and path inside agent + # @param args additional arguments depending on agent, usually optional + # + # @example Get netcards discovered by probe agent + # SCR.Read(path(".probe.netcard")) + # @example Read content of file /tmp/test + # SCR.Read(path(".target.string"), "tmp/test") + def self.Read (path, *args) + call_builtin_wrapper("Read", path, *args) + end + + # Writes data + # @param path[Yast::Path] path that is combination of path where agent is + # attached and path inside agent + # @param args additional arguments depending on agent + # @return [true,false] success + # + # @example change default desktop in sysconfig to kde + # SCR.Write(path(".sysconfig.windowmanager.DEFAULT_WM"), "kde") + # @example write string s to file /tmp/f + # SCR.Write(path(".target.string"), "/tmp/f", "s") + def self.Write (path, *args) + call_builtin_wrapper("Write", path, *args) + end + + # Executes command + # @param path[Yast::Path] path to agent + # @param args additional arguments depending on agent + # @example halt computer + # SCR.Execute(path(".target.bash"), "/sbin/halt -f -n -p") + # @example umount /mnt path + # SCR.Execute(path(".target.umount"), "/mnt") + def self.Execute (path, *args) + call_builtin_wrapper("Execute", path, *args) + end + + # Gets array of all children attached directly below path + # @param path[Yast::Path] sub-path where to search for children + # @return [Array<String>] list of children names + # + # @example get all sysconfig agents + # SCR.Dir(path(".sysconfig")) + # @example get all keys in install inf + # SCR.Dir(path(".etc.install_inf")) + def self.Dir (path) + call_builtin_wrapper("Dir", path) + end + + # Gets detailled error description from agent + # @param path[Yast::Path] path to agent + # @return [Hash] with keys "code" and "summary" + def self.Error (path) + call_builtin_wrapper("Error", path) + end + + # Register an agent at given path with description + # + # @param path [Yast::Path] path to agent + # @param description [Yast::Term,String] path to file description or direct + # term with agent description + # @return [true,false] if succeed + def self.RegisterAgent (path, description) + call_builtin_wrapper("RegisterAgent", path, description) + end + + # Register new agents. (bnc#245508#c16) + # + # Rescan the scrconf registration directories and register any + # agents at new(!) paths. Agents, even new ones, on paths that + # are registered already, will not be replaced. This means that + # .oes.specific.agent will start to work but something like + # adding /usr/local/etc/sysconfig to .sysconfig.network would not. + # @return [true,false] if succeed + def self.RegisterNewAgents + call_builtin_wrapper("RegisterNewAgents") + end + + # Unregister agent from given path + # @param path [Yast::Path] path to agent + # @return [true,false] if succeed + def self.UnregisterAgent (path) + call_builtin_wrapper("UnregisterAgent", path) + end + + # Unregister all agents + # @return [true,false] if succeed + def self.UnregisterAllAgents + call_builtin_wrapper("UnregisterAllAgents") + end + + # Unmounts agent. The agent is detached, but when needed it is mounted again automatically. + # + # It sends to component result() which force to terminate component. + # If there is any lazy write, then it is properly finished. + # @param path[Yast::Path] path to agent + def self.UnmountAgent (path) + call_builtin_wrapper("UnmountAgent", path) end - def self.call_builtin_wrapper *args + # @private wrapper to C bindings + def self.call_builtin_wrapper (*args) # caller[0] is one of the functions above caller[1].match BACKTRACE_REGEXP call_builtin($1, $2.to_i, *args) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.1.1/src/ruby/yast/wfm.rb new/yast2-ruby-bindings-3.1.2/src/ruby/yast/wfm.rb --- old/yast2-ruby-bindings-3.1.1/src/ruby/yast/wfm.rb 2013-10-15 15:26:18.000000000 +0200 +++ new/yast2-ruby-bindings-3.1.2/src/ruby/yast/wfm.rb 2013-11-04 17:05:39.000000000 +0100 @@ -1,5 +1,6 @@ require "yast/builtinx" require "yast/builtins" +require "yast/ops" # @private we need it as clients is called in global contenxt GLOBAL_WFM_CONTEXT = Proc.new {} @@ -7,86 +8,204 @@ # Wrapper class for WFM component in Yast # See yast documentation for WFM module WFM + + # Returns list of arguments passed to client or element at given index + # + # @example Get all args + # Yast::WFM.Args + # + # @example Get only first argument + # Yast::WFM.Args 0 def self.Args *args call_builtin_wrapper("Args", *args) end - def self.ClientExists *args - call_builtin_wrapper("ClientExists", *args) - end - - def self.Execute *args - call_builtin_wrapper("Execute", *args) - end - - def self.GetEncoding *args - call_builtin_wrapper("GetEncoding", *args) - end - - def self.GetEnvironmentEncoding *args - call_builtin_wrapper("GetEnvironmentEncoding", *args) - end - - def self.GetLanguage *args - call_builtin_wrapper("GetLanguage", *args) - end - - def self.Read *args - call_builtin_wrapper("Read", *args) - end - - def self.SCRClose *args - call_builtin_wrapper("SCRClose", *args) - end - - def self.SCRGetDefault *args - call_builtin_wrapper("SCRGetDefault", *args) - end - - def self.SCRGetName *args - call_builtin_wrapper("SCRGetName", *args) - end - - def self.SCROpen *args - call_builtin_wrapper("SCROpen", *args) - end - - def self.SCRSetDefault *args - call_builtin_wrapper("SCRSetDefault", *args) - end - - def self.SetLanguage *args - call_builtin_wrapper("SetLanguage", *args) - end - - def self.Write *args - call_builtin_wrapper("Write", *args) + # Checks if client of given name exists on system + # + # @note useful for checking before calling given client + # @see Yast::WFM.CallFunction + # @return [true,false] + # + # @example Check if there is client "inst_bootloader" + # Yast::WFM.ClientExists "inst_bootloader" + def self.ClientExists client + call_builtin_wrapper("ClientExists", client) + end + + # Runs execute on local system agent operating on inst-sys + # + # @param path[Yast::Path] agent path + # @param args arguments to agent + # + # @note very limited use-case. It is needed only if installer switched to + # scr on target system and agent from inst-sys must be called + # + # @see SCR.Execute common agent execute + # + # @example Run command in bash in inst-sys + # Yast::WFM.Execute(Yast::Path.new(".local.bash"), "halt -p") + def self.Execute path, *args + call_builtin_wrapper("Execute", path, *args) + end + + # Returns current encoding code as string + # + # @deprecated enconding is now always UTF-8 + # @return [String] + def self.GetEncoding + call_builtin_wrapper("GetEncoding") + end + + # Returns enconding of environment where Yast start + # + # @return [String] + def self.GetEnvironmentEncoding + call_builtin_wrapper("GetEnvironmentEncoding") + end + + # Returns current language without modifiers as string + # + # @return [String] + # @example return value + # Yast::WFM.GetLanguage + # => "en_US.UTF-8" + def self.GetLanguage + call_builtin_wrapper("GetLanguage") + end + + # Runs read on local system agent operating on inst-sys + # + # @param path[Yast::Path] agent path + # @param args arguments to agent + # + # @note very limited use-case. It is needed only if installer switched to + # scr on target system and agent from inst-sys must be called + # + # @see SCR.Read common agent read + # + # @example Read kernel cmdline + # Yast::WFM.Read(path(".local.string"), "/proc/cmdline") + def self.Read path, *args + call_builtin_wrapper("Read", path, *args) + end + + # Closes SCR handle obtained via {SCROpen} + # + # If SCR is set as default, then try to switch to another reasonable SCR + # openned + def self.SCRClose handle + call_builtin_wrapper("SCRClose", handle) + end + + # Gets handle of current default SCR + def self.SCRGetDefault + call_builtin_wrapper("SCRGetDefault") + end + + # Gets name of SCR associated with handle + # + # @return [String] + def self.SCRGetName handle + call_builtin_wrapper("SCRGetName", handle) + end + + # Creates new SCR instance + # + # It is useful for installation where agents start operation on installed system + # + # @param name[String] name for instance. Currently it is supported on scr name + # with possible chrooting in format `"chroot=<path_to_chroot>:scr"` + # @param check_version[Boolean] check if chrooted version match current + # core version + # @return handle of SCR instance + # + # @example open SCR instance on /mnt root without version check + # Yast::WFM.SCROpen("chroot=/mnt:scr", false) + def self.SCROpen name, check_version + call_builtin_wrapper("SCROpen", name, check_version) + end + + # Sets the default SCR to given handle + def self.SCRSetDefault handle + call_builtin_wrapper("SCRSetDefault", handle) + end + + # Sets language for translate with optional enconding + def self.SetLanguage language, *args + call_builtin_wrapper("SetLanguage", language, *args) + end + + # Runs write on local system agent operating on inst-sys + # + # @param path[Yast::Path] agent path + # @param args arguments to agent + # + # @note very limited use-case. It is needed only if installer switched to + # scr on target system and agent from inst-sys must be called + # + # @see SCR.Read common agent execute + # + # @example Write yast inf file in inst-sys + # Yast::WFM.Write(path(".local.string"), "/etc/yast.inf", yast_inf) + def self.Write path, *args + call_builtin_wrapper("Write", path, *args) end + # @deprecated use {CallFunction} def self.call *args call_builtin_wrapper("call", *args) end - def self.CallFunction *args - call_builtin_wrapper("CallFunction", *args) + # calls client of given name with passed args + # + # @param client[String] name of client to run without suffix + # @param args additional args passed to client, that can be obtained with + # {WFM.Args} + # @return response from client + # + # @example call inst_moust client living in $Y2DIR/clients/inst_mouse.rb with parameter true + # Yast::WFM.CallFunction("inst_mouse", true) + def self.CallFunction client, *args + call_builtin_wrapper("CallFunction", client, *args) end + # @private wrapper to C code def self.call_builtin_wrapper *args # caller[0] is one of the functions above caller[1].match BACKTRACE_REGEXP call_builtin($1, $2.to_i, *args) end + # @private wrapper to run client in ruby def self.run_client client Builtins.y2milestone "Call client %1", client code = File.read client begin - return eval(code, GLOBAL_WFM_CONTEXT.binding, client) + result = eval(code, GLOBAL_WFM_CONTEXT.binding, client) + + allowed_types = Ops::TYPES_MAP.values.flatten + allowed_types.delete(::Object) #remove generic type for any + + # check if response is allowed + allowed = allowed_types.any? { |t| result.is_a? t } + + raise "Invalid type #{result.class} from client #{client}" unless allowed + + return result rescue Exception => e - Builtins.y2error("Client call failed with %1 and backtrace %2", - e.message, - e.backtrace - ) + begin + Builtins.y2error("Client call failed with '%1' and backtrace %2", + e.message, + e.backtrace + ) + Yast.import "Report" + Report.Error "Internal error. Please report a bug report with logs.\nDetails: #{e.message}" + rescue Exception => e + Builtins.y2internal("Error reporting failed with '%1' and backtrace %2", + e.message, + e.backtrace + ) + end return false ensure # unload the client class to ensure that the includes will be -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-network for openSUSE:Factory
by root＠hilbert.suse.de 07 Nov '13

07 Nov '13

Hello community, here is the log from the commit of package yast2-network for openSUSE:Factory checked in at 2013-11-07 09:15:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-network (Old) and /work/SRC/openSUSE:Factory/.yast2-network.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-network" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-network/yast2-network.changes 2013-10-20 10:55:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-network.new/yast2-network.changes 2013-11-07 09:15:28.000000000 +0100 @@ -1,0 +2,14 @@ +Wed Oct 30 21:43:14 UTC 2013 - mfilka(a)suse.com + +- bnc#847783 + - do not offer ifplugd devices as bridge port candidate +- 3.1.4 + +------------------------------------------------------------------- +Tue Oct 22 12:28:17 UTC 2013 - mfilka(a)suse.com + +- adapt to removal of NetworkInterfaces.HasAliases from yast2 + since 3.1.2 +- 3.1.3 + +------------------------------------------------------------------- Old: ---- yast2-network-3.1.2.tar.bz2 New: ---- yast2-network-3.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.qNeWJg/_old 2013-11-07 09:15:29.000000000 +0100 +++ /var/tmp/diff_new_pack.qNeWJg/_new 2013-11-07 09:15:29.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.2 +Version: 3.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-network-3.1.2.tar.bz2 -> yast2-network-3.1.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.2/CONTRIBUTING.md new/yast2-network-3.1.4/CONTRIBUTING.md --- old/yast2-network-3.1.2/CONTRIBUTING.md 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-network-3.1.4/CONTRIBUTING.md 2013-11-04 16:42:19.000000000 +0100 @@ -0,0 +1,87 @@ +YaST Contribution Guidelines +============================ + +YaST is an open source project and as such it welcomes all kinds of +contributions. If you decide to contribute, please follow these guidelines to +ensure the process is effective and pleasant both for you and YaST maintainers. + +There are two main forms of contribution: reporting bugs and performing code +changes. + +Bug Reports +----------- + +If you find a problem, please report it either using +[Bugzilla](https://bugzilla.novell.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2) +or [GitHub issues](../../issues). (For Bugzilla, use the [simplified +registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp) +if you don't have an account yet.) + +If you find a problem, please report it either using +[Bugzilla](https://bugzilla.novell.com/) or GitHub issues. We can't guarantee +that every bug will be fixed, but we'll try. + +When creating a bug report, please follow our [bug reporting +guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug). + +Code Changes +------------ + +We welcome all kinds of code contributions, from simple bug fixes to significant +refactorings and implementation of new features. However, before making any +non-trivial contribution, get in touch with us first — this can prevent wasted +effort on both sides. Also, have a look at our [development +documentation](http://en.opensuse.org/openSUSE:YaST_development). + +To send us your code change, use GitHub pull requests. The workflow is as +follows: + + 1. Fork the project. + + 2. Create a topic branch based on `master`. + + 3. Implement your change, including tests (if possible). Make sure you adhere + to the [Ruby style + guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md). + + 4. Make sure your change didn't break anything by building the RPM package + (`rake osc:build`). The build process includes running the full testsuite. + + 5. Publish the branch and create a pull request. + + 6. YaST developers will review your change and possibly point out issues. + Adapt the code under their guidance until they are all resolved. + + 7. Finally, the pull request will get merged or rejected. + +See also [GitHub's guide on +contributing](https://help.github.com/articles/fork-a-repo). + +If you want to do multiple unrelated changes, use separate branches and pull +requests. + +Do not change the `VERSION` and `*.changes` files as this could lead to +conflicts. + +### Commits + +Each commit in the pull request should do only one thing, which is clearly +described by its commit message. Especially avoid mixing formatting changes and +functional changes into one commit. When writing commit messages, adhere to +[widely used +conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html). + +If your commit is related to a bug in Buzgilla or an issue on GitHub, make sure +you mention it in the commit message for cross-reference. Use format like +bnc#775814 or gh#yast/yast-foo#42. See also [GitHub +autolinking](https://help.github.com/articles/github-flavored-markdown#references) +and [openSUSE abbreviation +reference](http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Current_set_of_abbreviations). + +Additional Information +---------------------- + +If you have any question, feel free to ask at the [development mailing +list](http://lists.opensuse.org/yast-devel/) or at the +[#yast](http://webchat.freenode.net/?channels=%23yast) IRC channel on freenode. +We'll do our best to provide a timely and accurate answer. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.2/VERSION new/yast2-network-3.1.4/VERSION --- old/yast2-network-3.1.2/VERSION 2013-10-16 10:28:51.000000000 +0200 +++ new/yast2-network-3.1.4/VERSION 2013-11-04 16:42:19.000000000 +0100 @@ -1 +1 @@ -3.1.2 +3.1.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.2/package/yast2-network.changes new/yast2-network-3.1.4/package/yast2-network.changes --- old/yast2-network-3.1.2/package/yast2-network.changes 2013-10-16 10:28:51.000000000 +0200 +++ new/yast2-network-3.1.4/package/yast2-network.changes 2013-11-04 16:42:19.000000000 +0100 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Wed Oct 30 21:43:14 UTC 2013 - mfilka(a)suse.com + +- bnc#847783 + - do not offer ifplugd devices as bridge port candidate +- 3.1.4 + +------------------------------------------------------------------- +Tue Oct 22 12:28:17 UTC 2013 - mfilka(a)suse.com + +- adapt to removal of NetworkInterfaces.HasAliases from yast2 + since 3.1.2 +- 3.1.3 + +------------------------------------------------------------------- Wed Oct 16 07:09:13 UTC 2013 - mfilka(a)suse.com - bnc#845534 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.2/package/yast2-network.spec new/yast2-network-3.1.4/package/yast2-network.spec --- old/yast2-network-3.1.2/package/yast2-network.spec 2013-10-16 10:28:51.000000000 +0200 +++ new/yast2-network-3.1.4/package/yast2-network.spec 2013-11-04 16:42:19.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.2 +Version: 3.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.2/src/include/network/lan/complex.rb new/yast2-network-3.1.4/src/include/network/lan/complex.rb --- old/yast2-network-3.1.2/src/include/network/lan/complex.rb 2013-10-16 10:28:51.000000000 +0200 +++ new/yast2-network-3.1.4/src/include/network/lan/complex.rb 2013-11-04 16:42:19.000000000 +0100 @@ -532,21 +532,6 @@ return :edit when :delete - @pop = Builtins.sformat( - _( - "All additional addresses belonging to the interface %1\n" + - "will be deleted as well.\n" + - "\n" + - "Really continue?\n" - ), - Ops.get_string(LanItems.getCurrentItem, "ifcfg", "") - ) - if LanItems.InterfaceHasAliases && - Popup.YesNoHeadline(Label.WarningMsg, @pop) != true - # y2r: cannot break from middle of switch - # but in this function return will do - return nil - end # warn user when device to delete has STARTMODE=nfsroot (bnc#433867) if NetworkInterfaces.GetValue( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.2/src/modules/LanItems.rb new/yast2-network-3.1.4/src/modules/LanItems.rb --- old/yast2-network-3.1.2/src/modules/LanItems.rb 2013-10-16 10:28:51.000000000 +0200 +++ new/yast2-network-3.1.4/src/modules/LanItems.rb 2013-11-04 16:42:19.000000000 +0100 @@ -725,11 +725,9 @@ devname = GetDeviceName(itemId) bonded = BuildBondIndex() - if Ops.get(bonded, devname) != nil + if bonded[ devname] Builtins.y2debug( - "IsBridgeable: excluding lan item (%1: %2) - is bonded", - itemId, - devname + "IsBridgeable: excluding lan item (#{itemId}: #{devname}) - is bonded", ) return false end @@ -739,23 +737,27 @@ # exclude forbidden configurations if devtype == "br" Builtins.y2debug( - "IsBridgeable: excluding lan item (%1: %2) - is bridge", - itemId, - devname + "IsBridgeable: excluding lan item (#{itemId}: #{devname}) - is bridge", ) return false end - if Ops.get_string(ifcfg, "STARTMODE", "") == "nfsroot" - Builtins.y2debug( - "IsBridgeable: excluding lan item (%1: %2) - is nfsroot", - itemId, - devname - ) - return false - end + case ifcfg[ "STARTMODE"] + when "nfsroot" + Builtins.y2debug( + "IsBridgeable: excluding lan item (#{itemId}: #{devname}) - is nfsroot", + ) + return false - true + when "ifplugd" + Builtins.y2debug( + "IsBridgeable: excluding lan item (#{itemId}: #{devname}) - ifplugd", + ) + return false + + else + return true + end end # Iterates over all items and lists those for which given validator returns @@ -1454,16 +1456,6 @@ Ops.get_string(@Items, [@current, "table_descr", "rich_descr"], "") end - - # Check if the given device has any virtual alias. - # @param dev device to be checked - # @return true if there are some aliases - def InterfaceHasAliases - NetworkInterfaces.HasAliases( - Ops.get_string(@Items, [@current, "ifcfg"], "") - ) - end - # Select the hardware component # @param hw the component def SelectHWMap(hardware) @@ -2647,7 +2639,6 @@ publish :function => :isCurrentHotplug, :type => "boolean ()" publish :function => :isCurrentDHCP, :type => "boolean ()" publish :function => :GetItemDescription, :type => "string ()" - publish :function => :InterfaceHasAliases, :type => "boolean ()" publish :function => :SelectHWMap, :type => "void (map)" publish :function => :SelectHW, :type => "void (integer)" publish :function => :FreeDevices, :type => "list (string)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.2/test/Makefile.am new/yast2-network-3.1.4/test/Makefile.am --- old/yast2-network-3.1.2/test/Makefile.am 2013-10-16 10:28:51.000000000 +0200 +++ new/yast2-network-3.1.4/test/Makefile.am 2013-11-04 16:42:19.000000000 +0100 @@ -1,7 +1,9 @@ TESTS = \ netcard_test.rb \ edit_nic_name_test.rb \ - lan_udev_auto_test.rb + lan_udev_auto_test.rb \ + bridge_test.rb \ + routing_test.rb TEST_EXTENSIONS = .rb RB_LOG_COMPILER = rspec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.2/test/bridge_test.rb new/yast2-network-3.1.4/test/bridge_test.rb --- old/yast2-network-3.1.2/test/bridge_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-network-3.1.4/test/bridge_test.rb 2013-11-04 16:42:19.000000000 +0100 @@ -0,0 +1,91 @@ +#! /usr/bin/env rspec + +ENV["Y2DIR"] = File.expand_path("../../src", __FILE__) + +require "yast" + +include Yast + +Yast.import "LanItems" + +module Yast + describe LanItems do + + NETCONFIG_ITEMS = { + "eth" => { + "eth1" => { "BOOTPROTO" => "none" }, + "eth2" => { "BOOTPROTO" => "none" }, + "eth4" => { + "BOOTPROTO" => "static", + "IPADDR" => "0.0.0.0", + "PREFIX" => "32" + }, + "eth5" => { "BOOTPROTO" => "static", "STARTMODE" => "nfsroot" }, + "eth6" => { "BOOTPROTO" => "static", "STARTMODE" => "ifplugd" }, + }, + "tun" => { + "tun0" => { + "BOOTPROTO" => "static", + "STARTMODE" => "onboot", + "TUNNEL" => "tun" + }, + }, + "tap" => { + "tap0" => { + "BOOTPROTO" => "static", + "STARTMODE" => "onboot", + "TUNNEL" => "tap" + }, + }, + "br" => { + "br0" => { "BOOTPROTO" => "dhcp" }, + }, + "bond" => { + "bond0" => { + "BOOTPROTO" => "static", + "BONDING_MASTER" => "yes", + "BONDING_SLAVE0" => "eth1", + "BONDING_SLAVE1" => "eth2" + } + } + } + + HWINFO_ITEMS = [ + { "dev_name" => "eth11" }, + { "dev_name" => "eth12" } + ] + + EXPECTED_BRIDGEABLE = [ + "bond0", + "eth4", + "eth11", + "eth12", + "tap0", + "tun0" + ] + + before(:each) do + NetworkInterfaces.stub(:FilterDevices).with("netcard") { NETCONFIG_ITEMS } + + LanItems.stub(:ReadHardware) { HWINFO_ITEMS } + LanItems.Read + end + + describe "#GetBridgeableInterfaces" do + + before(:each) do + # FindAndSelect initializes internal state of LanItems it + # is used internally by some helpers + LanItems.FindAndSelect("br0") + end + + it "returns list of slave candidates" do + expect( + LanItems + .GetBridgeableInterfaces(LanItems.GetCurrentName) + .map { |i| LanItems.GetDeviceName(i) } + ).to match_array EXPECTED_BRIDGEABLE + end + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.2/testsuite/tests/bridge.out new/yast2-network-3.1.4/testsuite/tests/bridge.out --- old/yast2-network-3.1.2/testsuite/tests/bridge.out 2013-10-16 10:28:51.000000000 +0200 +++ new/yast2-network-3.1.4/testsuite/tests/bridge.out 1970-01-01 01:00:00.000000000 +0100 @@ -1,104 +0,0 @@ -Read .target.tmpdir nil -Log Failed to set temporary directory: nil -Read .probe.architecture "i386" -Read .sysconfig.console.CONSOLE_ENCODING "UTF-8" -Execute .target.bash_output "locale -k charmap" $["exit":0, "stderr":"", "stdout":"charset=UTF-8"] -Read .target.size "/etc/install.inf" nil -Dir .etc.install_inf: [] -Read .target.string "/proc/cmdline" nil -Read .probe.netcard [$["bus":"PCI", "bus_hwcfg":"pci", "class_id":2, "dev_name":"eth11", "dev_names":["eth11"], "device_id":70914, "driver":"e1000e", "driver_module":"e1000e", "drivers":[$["active":true, "modprobe":true, "modules":[["e1000e", ""]]]], "modalias":"pci:v00008086d00001502sv000017AAsd000021F3bc02sc00i00", "model":"Intel Ethernet controller", "old_unique_key":"wH9Z.41x4AT4gee2", "resource":$["hwaddr":[$["addr":"00:01:02:03:04:05"]], "io":[$["active":true, "length":32, "mode":"rw", "start":24704]], "irq":[$["count":0, "enabled":true, "irq":20]], "mem":[$["active":true, "length":131072, "start":4087349248], $["active":true, "length":4096, "start":4087590912]]], "rev":"4", "slot_id":25, "sub_class_id":0, "sub_device_id":74227, "sub_vendor":"Vendor", "sub_vendor_id":7, "sysfs_bus_id":"0000:00:19.0", "sysfs_id":"/devices/pci0000:00/0000:00:19.0", "unique_key":"rBUF.41x4AT4gee2", "vendor":"Intel Corporation", "vendor_id":98438], $["bus":"PCI", "bus_hwcfg":"pci", "class_id":2, "dev_name":"eth12", "dev_names":["eth12"], "device_id":70914, "driver":"e1000e", "driver_module":"e1000e", "drivers":[$["active":true, "modprobe":true, "modules":[["e1000e", ""]]]], "modalias":"pci:v00008086d00001502sv000017AAsd000021F3bc02sc00i00", "model":"Intel Ethernet controller", "old_unique_key":"wH9Z.41x4AT4gee2", "resource":$["hwaddr":[$["addr":"00:11:12:13:14:15"]], "io":[$["active":true, "length":32, "mode":"rw", "start":24704]], "irq":[$["count":0, "enabled":true, "irq":20]], "mem":[$["active":true, "length":131072, "start":4087349248], $["active":true, "length":4096, "start":4087590912]]], "rev":"4", "slot_id":25, "sub_class_id":0, "sub_device_id":74227, "sub_vendor":"Vendor", "sub_vendor_id":7, "sysfs_bus_id":"0000:00:19.0", "sysfs_id":"/devices/pci0000:00/0000:00:19.0", "unique_key":"rBUF.41x4AT4gee2", "vendor":"Intel Corporation", "vendor_id":98438]] -Read .etc.install_inf.BrokenModules nil -Read .udev_persistent.net nil -Dir .modules.options: [] -Read .udev_persistent.drivers nil -Dir .network.section: ["bond0", "br0", "eth1", "eth2", "eth4", "eth5", "tap0", "tun0"] -Dir .network.value."bond0": ["BONDING_MASTER", "BONDING_SLAVE0", "BONDING_SLAVE1", "BOOTPROTO"] -Read .network.value."bond0".BONDING_MASTER "yes" -Read .network.value."bond0".BONDING_SLAVE0 "eth1" -Read .network.value."bond0".BONDING_SLAVE1 "eth2" -Read .network.value."bond0".BOOTPROTO "static" -Dir .network.value."br0": ["BOOTPROTO"] -Read .network.value."br0".BOOTPROTO "dhcp" -Read .target.stat "/sys/class/net/br0/type" nil -Read .target.string "/sys/class/net/br0/type" nil -Dir .network.value."eth1": ["BOOTPROTO"] -Read .network.value."eth1".BOOTPROTO "none" -Read .target.stat "/sys/class/net/eth1/type" nil -Read .target.string "/sys/class/net/eth1/type" nil -Dir .network.value."eth2": ["BOOTPROTO"] -Read .network.value."eth2".BOOTPROTO "none" -Read .target.stat "/sys/class/net/eth2/type" nil -Read .target.string "/sys/class/net/eth2/type" nil -Dir .network.value."eth4": ["BOOTPROTO", "IPADDR", "PREFIX"] -Read .network.value."eth4".BOOTPROTO "static" -Read .network.value."eth4".IPADDR "0.0.0.0" -Read .network.value."eth4".PREFIX "32" -Read .target.stat "/sys/class/net/eth4/type" nil -Read .target.string "/sys/class/net/eth4/type" nil -Dir .network.value."eth5": ["BOOTPROTO", "STARTMODE"] -Read .network.value."eth5".BOOTPROTO "static" -Read .network.value."eth5".STARTMODE "nfsroot" -Read .target.stat "/sys/class/net/eth5/type" nil -Read .target.string "/sys/class/net/eth5/type" nil -Dir .network.value."tap0": ["BOOTPROTO", "STARTMODE", "TUNNEL"] -Read .network.value."tap0".BOOTPROTO "static" -Read .network.value."tap0".STARTMODE "onboot" -Read .network.value."tap0".TUNNEL "tap" -Dir .network.value."tun0": ["BOOTPROTO", "STARTMODE", "TUNNEL"] -Read .network.value."tun0".BOOTPROTO "static" -Read .network.value."tun0".STARTMODE "onboot" -Read .network.value."tun0".TUNNEL "tun" -Read .target.lstat "/etc/sysconfig/network/ifcfg-eth-pcmcia" nil -Read .target.lstat "/etc/sysconfig/network/ifcfg-eth-usb" nil -Read .target.lstat "/etc/sysconfig/network/ifcfg-tr-pcmcia" nil -Read .target.lstat "/etc/sysconfig/network/ifcfg-tr-usb" nil -Return nil -Dump LanItems::GetBridgeableInterfaces -Read .target.stat "/sys/class/net/bond0/type" nil -Read .target.string "/sys/class/net/bond0/type" nil -Read .target.stat "/sys/class/net/bond0/type" nil -Read .target.string "/sys/class/net/bond0/type" nil -Read .target.stat "/sys/class/net/bond0/type" nil -Read .target.string "/sys/class/net/bond0/type" nil -Read .target.stat "/sys/class/net/bond0/type" nil -Read .target.string "/sys/class/net/bond0/type" nil -Read .target.stat "/sys/class/net/eth1/type" nil -Read .target.string "/sys/class/net/eth1/type" nil -Read .target.stat "/sys/class/net/eth1/type" nil -Read .target.string "/sys/class/net/eth1/type" nil -Read .target.stat "/sys/class/net/eth2/type" nil -Read .target.string "/sys/class/net/eth2/type" nil -Read .target.stat "/sys/class/net/eth2/type" nil -Read .target.string "/sys/class/net/eth2/type" nil -Read .target.stat "/sys/class/net/eth4/type" nil -Read .target.string "/sys/class/net/eth4/type" nil -Read .target.stat "/sys/class/net/eth4/type" nil -Read .target.string "/sys/class/net/eth4/type" nil -Read .target.stat "/sys/class/net/eth4/type" nil -Read .target.string "/sys/class/net/eth4/type" nil -Read .target.stat "/sys/class/net/eth4/type" nil -Read .target.string "/sys/class/net/eth4/type" nil -Read .target.stat "/sys/class/net/eth5/type" nil -Read .target.string "/sys/class/net/eth5/type" nil -Read .target.stat "/sys/class/net/eth5/type" nil -Read .target.string "/sys/class/net/eth5/type" nil -Read .target.stat "/sys/class/net/eth5/type" nil -Read .target.string "/sys/class/net/eth5/type" nil -Read .target.stat "/sys/class/net/eth5/type" nil -Read .target.string "/sys/class/net/eth5/type" nil -Read .target.stat "/sys/class/net/tun0/type" nil -Read .target.string "/sys/class/net/tun0/type" nil -Read .target.stat "/sys/class/net/tun0/type" nil -Read .target.string "/sys/class/net/tun0/type" nil -Read .target.stat "/sys/class/net/tun0/type" nil -Read .target.string "/sys/class/net/tun0/type" nil -Read .target.stat "/sys/class/net/tun0/type" nil -Read .target.string "/sys/class/net/tun0/type" nil -Read .target.stat "/sys/class/net/tap0/type" nil -Read .target.string "/sys/class/net/tap0/type" nil -Read .target.stat "/sys/class/net/tap0/type" nil -Read .target.string "/sys/class/net/tap0/type" nil -Read .target.stat "/sys/class/net/tap0/type" nil -Read .target.string "/sys/class/net/tap0/type" nil -Read .target.stat "/sys/class/net/tap0/type" nil -Read .target.string "/sys/class/net/tap0/type" nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.2/testsuite/tests/bridge.rb new/yast2-network-3.1.4/testsuite/tests/bridge.rb --- old/yast2-network-3.1.2/testsuite/tests/bridge.rb 2013-10-16 10:28:51.000000000 +0200 +++ new/yast2-network-3.1.4/testsuite/tests/bridge.rb 1970-01-01 01:00:00.000000000 +0100 @@ -1,196 +0,0 @@ -# encoding: utf-8 - -module Yast - class BridgeClient < Client - def main - Yast.import "Assert" - Yast.import "Testsuite" - - @READ = { - "network" => { - "section" => { - "eth1" => nil, - "eth2" => nil, - "eth4" => nil, - "eth5" => nil, - "tun0" => nil, - "tap0" => nil, - "br0" => nil, - "bond0" => nil - }, - "value" => { - "eth1" => { "BOOTPROTO" => "none" }, - "eth2" => { "BOOTPROTO" => "none" }, - "eth4" => { - "BOOTPROTO" => "static", - "IPADDR" => "0.0.0.0", - "PREFIX" => "32" - }, - "eth5" => { "BOOTPROTO" => "static", "STARTMODE" => "nfsroot" }, - "tun0" => { - "BOOTPROTO" => "static", - "STARTMODE" => "onboot", - "TUNNEL" => "tun" - }, - "tap0" => { - "BOOTPROTO" => "static", - "STARTMODE" => "onboot", - "TUNNEL" => "tap" - }, - "br0" => { "BOOTPROTO" => "dhcp" }, - "bond0" => { - "BOOTPROTO" => "static", - "BONDING_MASTER" => "yes", - "BONDING_SLAVE0" => "eth1", - "BONDING_SLAVE1" => "eth2" - } - } - }, - "probe" => { - "architecture" => "i386", - "netcard" => [ - # yast2-network lists those as "Not configured" devices (no matching ifcfg files are defined) - { - "bus" => "PCI", - "bus_hwcfg" => "pci", - "class_id" => 2, - "dev_name" => "eth11", - "dev_names" => ["eth11"], - "device_id" => 70914, - "driver" => "e1000e", - "driver_module" => "e1000e", - "drivers" => [ - { - "active" => true, - "modprobe" => true, - "modules" => [["e1000e", ""]] - } - ], - "modalias" => "pci:v00008086d00001502sv000017AAsd000021F3bc02sc00i00", - "model" => "Intel Ethernet controller", - "old_unique_key" => "wH9Z.41x4AT4gee2", - "resource" => { - "hwaddr" => [{ "addr" => "00:01:02:03:04:05" }], - "io" => [ - { - "active" => true, - "length" => 32, - "mode" => "rw", - "start" => 24704 - } - ], - "irq" => [{ "count" => 0, "enabled" => true, "irq" => 20 }], - "mem" => [ - { - "active" => true, - "length" => 131072, - "start" => 4087349248 - }, - { "active" => true, "length" => 4096, "start" => 4087590912 } - ] - }, - "rev" => "4", - "slot_id" => 25, - "sub_class_id" => 0, - "sub_device_id" => 74227, - "sub_vendor" => "Vendor", - "sub_vendor_id" => 7, - "sysfs_bus_id" => "0000:00:19.0", - "sysfs_id" => "/devices/pci0000:00/0000:00:19.0", - "unique_key" => "rBUF.41x4AT4gee2", - "vendor" => "Intel Corporation", - "vendor_id" => 98438 - }, - { - "bus" => "PCI", - "bus_hwcfg" => "pci", - "class_id" => 2, - "dev_name" => "eth12", - "dev_names" => ["eth12"], - "device_id" => 70914, - "driver" => "e1000e", - "driver_module" => "e1000e", - "drivers" => [ - { - "active" => true, - "modprobe" => true, - "modules" => [["e1000e", ""]] - } - ], - "modalias" => "pci:v00008086d00001502sv000017AAsd000021F3bc02sc00i00", - "model" => "Intel Ethernet controller", - "old_unique_key" => "wH9Z.41x4AT4gee2", - "resource" => { - "hwaddr" => [{ "addr" => "00:11:12:13:14:15" }], - "io" => [ - { - "active" => true, - "length" => 32, - "mode" => "rw", - "start" => 24704 - } - ], - "irq" => [{ "count" => 0, "enabled" => true, "irq" => 20 }], - "mem" => [ - { - "active" => true, - "length" => 131072, - "start" => 4087349248 - }, - { "active" => true, "length" => 4096, "start" => 4087590912 } - ] - }, - "rev" => "4", - "slot_id" => 25, - "sub_class_id" => 0, - "sub_device_id" => 74227, - "sub_vendor" => "Vendor", - "sub_vendor_id" => 7, - "sysfs_bus_id" => "0000:00:19.0", - "sysfs_id" => "/devices/pci0000:00/0000:00:19.0", - "unique_key" => "rBUF.41x4AT4gee2", - "vendor" => "Intel Corporation", - "vendor_id" => 98438 - } - ] - }, - "sysconfig" => { "console" => { "CONSOLE_ENCODING" => "UTF-8" } } - } - - @EXEC = { - "target" => { - "bash_output" => { - "exit" => 0, - "stdout" => "charset=UTF-8", - "stderr" => "" - } - } - } - - Testsuite.Init([@READ, {}, @EXEC], nil) - - Yast.import "NetworkInterfaces" - Yast.import "LanItems" - - Testsuite.Test(LanItems.Read, [@READ, {}, @EXEC], nil) - - Testsuite.Dump("LanItems::GetBridgeableInterfaces") - @expected_bridgeable = ["bond0", "eth11", "eth12", "eth4", "tap0", "tun0"] - @bridgeable_devs = [] - - # query bridgeable devices and make testsuite independent of internal sorting of LanItems - Assert.Equal(true, LanItems.FindAndSelect("br0")) # set up context for GetBondableInterfaces - - @bridgeable_devs = Builtins.maplist( - LanItems.GetBridgeableInterfaces(LanItems.GetCurrentName) - ) { |itemId| LanItems.GetDeviceName(itemId) } - @bridgeable_devs = Builtins.sort(@bridgeable_devs) - - Assert.Equal(@expected_bridgeable, @bridgeable_devs) - - nil - end - end -end - -Yast::BridgeClient.new.main -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-installation for openSUSE:Factory
by root＠hilbert.suse.de 07 Nov '13

07 Nov '13

Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2013-11-07 09:15:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old) and /work/SRC/openSUSE:Factory/.yast2-installation.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-installation" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes 2013-10-25 13:03:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes 2013-11-07 09:15:20.000000000 +0100 @@ -1,0 +2,26 @@ +Thu Oct 31 11:32:01 UTC 2013 - lslezak(a)suse.cz + +- install "perl-Bootloader-YAML" package +- removed "Use Automatic Configuration" option from the + installation mode dialog (the 2nd stage has been removed) +- 3.1.3 + +------------------------------------------------------------------- +Tue Oct 29 13:17:59 UTC 2013 - lslezak(a)suse.cz + +- install only "perl-YAML-LibYAML" and "perl-bootloader" packages + to the target system +- updated scr_switch_debugger.rb client + +------------------------------------------------------------------- +Fri Oct 26 11:39:17 UTC 2013 - jsrain(a)suse.cz + +- show release notes button (fate#314695) + +------------------------------------------------------------------- +Fri Oct 25 10:06:07 CEST 2013 - aschnell(a)suse.de + +- removed long obsolete EVMS entries from control file (see + fate#305007) + +------------------------------------------------------------------- @@ -5,0 +32,8 @@ +- 3.1.2 + +------------------------------------------------------------------- +Tue Oct 22 16:46:18 CEST 2013 - locilka(a)suse.com + +- Extended support for ignored_features: They can be also mentioned + in PTOptions and thus not appended to Kernel command line + (FATE#314982) Old: ---- yast2-installation-3.1.1.tar.bz2 New: ---- yast2-installation-3.1.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.pXqHNc/_old 2013-11-07 09:15:21.000000000 +0100 +++ /var/tmp/diff_new_pack.pXqHNc/_new 2013-11-07 09:15:21.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.1 +Version: 3.1.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -44,8 +44,8 @@ # xmllint BuildRequires: libxml2-tools -# /etc/YaST2/XVersion -BuildRequires: yast2 >= 2.16.52 +# Linuxrc.keys +BuildRequires: yast2 >= 3.1.1 # AutoinstConfig::getProposalList Requires: autoyast2-installation >= 2.17.1 ++++++ yast2-installation-3.1.1.tar.bz2 -> yast2-installation-3.1.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.1/VERSION new/yast2-installation-3.1.3/VERSION --- old/yast2-installation-3.1.1/VERSION 2013-10-23 09:40:31.000000000 +0200 +++ new/yast2-installation-3.1.3/VERSION 2013-11-01 13:10:18.000000000 +0100 @@ -1 +1 @@ -3.1.1 +3.1.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.1/control/README new/yast2-installation-3.1.3/control/README --- old/yast2-installation-3.1.1/control/README 2013-10-23 09:40:31.000000000 +0200 +++ new/yast2-installation-3.1.3/control/README 2013-11-01 13:10:18.000000000 +0100 @@ -5,7 +5,7 @@ products. Those special package are used when creating the CDs and they install the control file into the first CD of the product. - Any modification to the control file in the CVS tree of YaST wont + Any modification to the control file in the YaST Git tree will not appear in the respective products. Such changes have to be done in the following packages instead: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.1/control/control.SLED.xml new/yast2-installation-3.1.3/control/control.SLED.xml --- old/yast2-installation-3.1.1/control/control.SLED.xml 2013-10-23 09:40:31.000000000 +0200 +++ new/yast2-installation-3.1.3/control/control.SLED.xml 2013-11-01 13:10:18.000000000 +0100 @@ -309,17 +309,14 @@ </software> <partitioning> - <evms_config config:type="boolean">false</evms_config> <try_separate_home config:type="boolean">true</try_separate_home> <limit_try_home>14GB</limit_try_home> <root_space_percent>40</root_space_percent> <root_base_size>3GB</root_base_size> <root_max_size>10GB</root_max_size> <proposal_lvm config:type="boolean">false</proposal_lvm> - <proposal_evms config:type="boolean">false</proposal_evms> <vm_desired_size>15GB</vm_desired_size> <vm_home_max_size>25GB</vm_home_max_size> - <boot_evms config:type="boolean">false</boot_evms> <btrfs_increase_percentage config:type="integer">100</btrfs_increase_percentage> </partitioning> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.1/control/control.SLES-for-VMware.xml new/yast2-installation-3.1.3/control/control.SLES-for-VMware.xml --- old/yast2-installation-3.1.1/control/control.SLES-for-VMware.xml 2013-10-23 09:40:31.000000000 +0200 +++ new/yast2-installation-3.1.3/control/control.SLES-for-VMware.xml 2013-11-01 13:10:18.000000000 +0100 @@ -240,17 +240,14 @@ </software> <partitioning> - <evms_config config:type="boolean">true</evms_config> <try_separate_home config:type="boolean">false</try_separate_home> <limit_try_home>5GB</limit_try_home> <root_space_percent>40</root_space_percent> <root_base_size>3GB</root_base_size> <root_max_size>10GB</root_max_size> <proposal_lvm config:type="boolean">false</proposal_lvm> - <proposal_evms config:type="boolean">false</proposal_evms> <vm_desired_size>15GB</vm_desired_size> <vm_home_max_size>25GB</vm_home_max_size> - <boot_evms config:type="boolean">false</boot_evms> <btrfs_increase_percentage config:type="integer">100</btrfs_increase_percentage> </partitioning> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.1/control/control.SLES.xml new/yast2-installation-3.1.3/control/control.SLES.xml --- old/yast2-installation-3.1.1/control/control.SLES.xml 2013-10-23 09:40:31.000000000 +0200 +++ new/yast2-installation-3.1.3/control/control.SLES.xml 2013-11-01 13:10:18.000000000 +0100 @@ -263,17 +263,14 @@ </software> <partitioning> - <evms_config config:type="boolean">true</evms_config> <try_separate_home config:type="boolean">false</try_separate_home> <limit_try_home>5GB</limit_try_home> <root_space_percent>40</root_space_percent> <root_base_size>3GB</root_base_size> <root_max_size>10GB</root_max_size> <proposal_lvm config:type="boolean">false</proposal_lvm> - <proposal_evms config:type="boolean">false</proposal_evms> <vm_desired_size>15GB</vm_desired_size> <vm_home_max_size>25GB</vm_home_max_size> - <boot_evms config:type="boolean">false</boot_evms> <btrfs_increase_percentage config:type="integer">100</btrfs_increase_percentage> </partitioning> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.1/control/control.openSUSE.xml new/yast2-installation-3.1.3/control/control.openSUSE.xml --- old/yast2-installation-3.1.1/control/control.openSUSE.xml 2013-10-23 09:40:31.000000000 +0200 +++ new/yast2-installation-3.1.3/control/control.openSUSE.xml 2013-11-01 13:10:18.000000000 +0100 @@ -677,9 +677,30 @@ <label>System Analysis</label> <name>system_analysis</name> </module> + <module> + <label>Disk</label> + <name>disk_proposal</name> + <enable_back>yes</enable_back> + <enable_next>yes</enable_next> + </module> + + <module> + <label>Time Zone</label> + <name>timezone</name> + <arguments> + <first_run>yes</first_run> + </arguments> + <enable_back>yes</enable_back> </module>  <module> @@ -692,14 +713,6 @@ <name>add-on</name> <enable_back>yes</enable_back> </module> - <module> - <label>Time Zone</label> - <name>timezone</name> - <arguments> - <first_run>yes</first_run> - </arguments> - <enable_back>yes</enable_back> - </module> <module> <label>Desktop Selection</label> <name>new_desktop</name> @@ -712,12 +725,6 @@ <enable_next>yes</enable_next> </module> --> - <module> - <label>Disk</label> - <name>disk_proposal</name> - <enable_back>yes</enable_back> - <enable_next>yes</enable_next> - </module> <module> <label>User Settings</label> <name>user_first</name> @@ -742,7 +749,7 @@ <name>prepareprogress</name> </module> <module> - <label>Perform Installation</label> + <label>Perform Installation</label> <name>prepdisk</name> </module>  diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.1/control/control.rnc new/yast2-installation-3.1.3/control/control.rnc --- old/yast2-installation-3.1.1/control/control.rnc 2013-10-23 09:40:31.000000000 +0200 +++ new/yast2-installation-3.1.3/control/control.rnc 2013-11-01 13:10:18.000000000 +0100 @@ -403,17 +403,14 @@ # partitioning partitioning_elements = - evms_config - | try_separate_home + try_separate_home | limit_try_home | root_space_percent | root_base_size | root_max_size | proposal_lvm - | proposal_evms | vm_desired_size | vm_home_max_size - | boot_evms | use_separate_multipath_module | prefer_remove | vm_keep_unpartitioned_region @@ -421,17 +418,14 @@ | partitions | btrfs_increase_percentage -evms_config = element evms_config { BOOLEAN } try_separate_home = element try_separate_home { BOOLEAN } limit_try_home = element limit_try_home { text } root_space_percent = element root_space_percent { text } root_base_size = element root_base_size { text } root_max_size = element root_max_size { text } proposal_lvm = element proposal_lvm { BOOLEAN } -proposal_evms = element proposal_evms { BOOLEAN } vm_desired_size = element vm_desired_size { text } vm_home_max_size = element vm_home_max_size { text } -boot_evms = element boot_evms { BOOLEAN } prefer_remove = element prefer_remove { BOOLEAN } remove_special_partitions = element remove_special_partitions { BOOLEAN } vm_keep_unpartitioned_region = element vm_keep_unpartitioned_region { BOOLEAN } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.1/control/control.xml new/yast2-installation-3.1.3/control/control.xml --- old/yast2-installation-3.1.1/control/control.xml 2013-10-23 09:40:31.000000000 +0200 +++ new/yast2-installation-3.1.3/control/control.xml 2013-11-01 13:10:18.000000000 +0100 @@ -32,7 +32,6 @@ <selection_type config:type="symbol">auto</selection_type> </software> <partitioning> - <evms_config config:type="boolean">false</evms_config> <try_separate_home config:type="boolean">true</try_separate_home> <limit_try_home>5GB</limit_try_home> <root_space_percent>40</root_space_percent> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.1/control/docs/examples/update-difffileformat.xml new/yast2-installation-3.1.3/control/docs/examples/update-difffileformat.xml --- old/yast2-installation-3.1.1/control/docs/examples/update-difffileformat.xml 2013-10-23 09:40:31.000000000 +0200 +++ new/yast2-installation-3.1.3/control/docs/examples/update-difffileformat.xml 2013-11-01 13:10:18.000000000 +0100 @@ -1,4 +1,3 @@ - <?xml version="1.0"?> <productDefines xmlns="http://www.suse.com/1.0/yast2ns" xmlns:config="http://www.suse.com/1.0/configns"> @@ -12,7 +11,6 @@ <selection_type config:type="symbol">auto</selection_type> </software> <partitioning> - <evms_config config:type="boolean">false</evms_config> <root_max_size>10G</root_max_size> </partitioning> <network> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.1/control/examples/add-on-2.xml new/yast2-installation-3.1.3/control/examples/add-on-2.xml --- old/yast2-installation-3.1.1/control/examples/add-on-2.xml 2013-10-23 09:40:31.000000000 +0200 +++ new/yast2-installation-3.1.3/control/examples/add-on-2.xml 2013-11-01 13:10:18.000000000 +0100 @@ -11,7 +11,6 @@ <selection_type config:type="symbol">auto</selection_type> </software> <partitioning> - <evms_config config:type="boolean">false</evms_config> <root_max_size>10G</root_max_size> </partitioning> <network> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.1/control/examples/custom.xml new/yast2-installation-3.1.3/control/examples/custom.xml --- old/yast2-installation-3.1.1/control/examples/custom.xml 2013-10-23 09:40:31.000000000 +0200 +++ new/yast2-installation-3.1.3/control/examples/custom.xml 2013-11-01 13:10:18.000000000 +0100 @@ -25,7 +25,6 @@ <base_selection>Minimal+X11</base_selection> </software> <partitioning> - <evms_config config:type="boolean">false</evms_config> <partitions config:type="list"> <partition> <disk config:type="integer">2</disk> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.1/control/tests/test.xml new/yast2-installation-3.1.3/control/tests/test.xml --- old/yast2-installation-3.1.1/control/tests/test.xml 2013-10-23 09:40:31.000000000 +0200 +++ new/yast2-installation-3.1.3/control/tests/test.xml 2013-11-01 13:10:18.000000000 +0100 @@ -22,7 +22,6 @@ <selection_type config:type="symbol">auto</selection_type> </software> <partitioning> - <evms_config config:type="boolean">false</evms_config> </partitioning> <proposals config:type="list"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.1/package/yast2-installation.changes new/yast2-installation-3.1.3/package/yast2-installation.changes --- old/yast2-installation-3.1.1/package/yast2-installation.changes 2013-10-23 09:40:31.000000000 +0200 +++ new/yast2-installation-3.1.3/package/yast2-installation.changes 2013-11-01 13:10:18.000000000 +0100 @@ -1,8 +1,42 @@ ------------------------------------------------------------------- +Thu Oct 31 11:32:01 UTC 2013 - lslezak(a)suse.cz + +- install "perl-Bootloader-YAML" package +- removed "Use Automatic Configuration" option from the + installation mode dialog (the 2nd stage has been removed) +- 3.1.3 + +------------------------------------------------------------------- +Tue Oct 29 13:17:59 UTC 2013 - lslezak(a)suse.cz + +- install only "perl-YAML-LibYAML" and "perl-bootloader" packages + to the target system +- updated scr_switch_debugger.rb client + +------------------------------------------------------------------- +Fri Oct 26 11:39:17 UTC 2013 - jsrain(a)suse.cz + +- show release notes button (fate#314695) + +------------------------------------------------------------------- +Fri Oct 25 10:06:07 CEST 2013 - aschnell(a)suse.de + +- removed long obsolete EVMS entries from control file (see + fate#305007) + +------------------------------------------------------------------- Wed Oct 23 07:27:28 UTC 2013 - lslezak(a)suse.cz - removed autorepeat workaround for bnc#346186, not needed anymore, xset might not be installed (bnc#846768) +- 3.1.2 + +------------------------------------------------------------------- +Tue Oct 22 16:46:18 CEST 2013 - locilka(a)suse.com + +- Extended support for ignored_features: They can be also mentioned + in PTOptions and thus not appended to Kernel command line + (FATE#314982) ------------------------------------------------------------------- Tue Oct 15 14:15:31 CEST 2013 - locilka(a)suse.com diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.1/package/yast2-installation.spec new/yast2-installation-3.1.3/package/yast2-installation.spec --- old/yast2-installation-3.1.1/package/yast2-installation.spec 2013-10-23 09:40:31.000000000 +0200 +++ new/yast2-installation-3.1.3/package/yast2-installation.spec 2013-11-01 13:10:18.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.1 +Version: 3.1.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -41,8 +41,8 @@ # xmllint BuildRequires: libxml2-tools -# /etc/YaST2/XVersion -BuildRequires: yast2 >= 2.16.52 +# Linuxrc.keys +BuildRequires: yast2 >= 3.1.1 # AutoinstConfig::getProposalList Requires: autoyast2-installation >= 2.17.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.1/src/Makefile.am new/yast2-installation-3.1.3/src/Makefile.am --- old/yast2-installation-3.1.1/src/Makefile.am 2013-10-23 09:40:31.000000000 +0200 +++ new/yast2-installation-3.1.3/src/Makefile.am 2013-11-01 13:10:18.000000000 +0100 @@ -3,6 +3,7 @@ module_DATA = \ modules/ImageInstallation.rb \ modules/InstData.rb \ + modules/InstFunctions.rb \ modules/Vendor.rb \ modules/SystemFilesCopy.rb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.1/src/clients/inst_complex_welcome.rb new/yast2-installation-3.1.3/src/clients/inst_complex_welcome.rb --- old/yast2-installation-3.1.1/src/clients/inst_complex_welcome.rb 2013-10-23 09:40:31.000000000 +0200 +++ new/yast2-installation-3.1.3/src/clients/inst_complex_welcome.rb 2013-11-01 13:10:18.000000000 +0100 @@ -83,7 +83,7 @@ # Build dialog # ---------------------------------------------------------------------- # heading text - @heading_text = _("Welcome") + @heading_text = _("Language, Keyboard and License Agreement") @languagesel = ComboBox( Id(:language), @@ -119,29 +119,35 @@ VWeight(1, VStretch()), Left( HSquash( - VBox( - HBox( - HSquash(Icon.Simple("yast-language")), - @text_mode == true ? Empty() : HSpacing(2), - Left(@languagesel) - ), - VSpacing(1), - HBox( - HSquash(Icon.Simple("yast-keyboard")), - @text_mode == true ? Empty() : HSpacing(2), - Left(@keyboardsel) - ), - VSpacing(1) + HBox( + HSquash(Icon.Simple("yast-language")), + @text_mode ? Empty() : HSpacing(2), + Left(@languagesel), + HSpacing(1), + HSquash(Icon.Simple("yast-keyboard")), + @text_mode ? Empty() : HSpacing(2), + Left(@keyboardsel), + HSpacing(10) ) ) ), + VSpacing(1), VWeight(1, VStretch()), VWeight( 20, Left( HSquash( VBox( - Left(Label(Opt(:boldFont), _("License Agreement"))), + HBox( + Label(Opt(:boldFont), _("License Agreement")), + HStretch(), + # ID: #ICW_B1 button + PushButton( + Id(:show_fulscreen_license), + # TRANSLATORS: button label + _("License &Translations...") + ) + ), # bnc #438100 HSquash( MinWidth( @@ -154,17 +160,10 @@ MinHeight( 1, HBox( + HStretch(), # Will be replaced with license checkbox if required ReplacePoint(Id(:license_checkbox_rp), Empty()), - VSpacing(1), - # TRANSLATORS: button label - # ID: #ICW_B1 button - Right( - PushButton( - Id(:show_fulscreen_license), - _("License &Translations...") - ) - ) + HStretch() ) ) ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.1/src/clients/inst_mode.rb new/yast2-installation-3.1.3/src/clients/inst_mode.rb --- old/yast2-installation-3.1.1/src/clients/inst_mode.rb 2013-10-23 09:40:31.000000000 +0200 +++ new/yast2-installation-3.1.3/src/clients/inst_mode.rb 2013-11-01 13:10:18.000000000 +0100 @@ -125,11 +125,7 @@ end if !@in_textmode end - Builtins.y2milestone( - "Initial Mode: %1, AC: %2", - Mode.mode, - ProductControl.GetUseAutomaticConfiguration - ) + Builtins.y2milestone("Initial Mode: #{Mode.mode}") AdjustStepsAccordingToInstallationSettings() begin @ret = Convert.to_symbol(UI.UserInput) @@ -149,25 +145,6 @@ end @ret = nil next - # FIXME: this mode needs more RAM because it starts another YaST process. - # Warn user and/or disable the option if a machine has not enough memory. - - # Use-Automatic-Configuration status changed - elsif @ret == :use_automatic_configuration - if UI.WidgetExists(Id(:use_automatic_configuration)) - ProductControl.SetUseAutomaticConfiguration( - Convert.to_boolean( - UI.QueryWidget(Id(:use_automatic_configuration), :Value) - ) - ) - Builtins.y2milestone( - "GetUseAutomaticConfiguration: %1", - ProductControl.GetUseAutomaticConfiguration - ) - AdjustStepsAccordingToInstallationSettings() - end - @ret = nil - next # Use-Community-Repositories status changed elsif @ret == :productsources if UI.WidgetExists(Id(:productsources)) @@ -197,26 +174,12 @@ :productsources, Installation.productsources_selected, @show_online_repositories && @ret != :repair - ], - # automatic installation works only for new installation - [ - :use_automatic_configuration, - ProductControl.GetUseAutomaticConfiguration && @ret == :install, - @ret == :install ] ] ) do |one_item| - if UI.WidgetExists(Id(Ops.get_symbol(one_item, 0, :_inotdef_))) - UI.ChangeWidget( - Id(Ops.get_symbol(one_item, 0, :_inotdef_)), - :Enabled, - Ops.get_boolean(one_item, 2, false) - ) - UI.ChangeWidget( - Id(Ops.get_symbol(one_item, 0, :_inotdef_)), - :Value, - Ops.get_boolean(one_item, 1, false) - ) + if UI.WidgetExists(Id(one_item.first)) + UI.ChangeWidget(Id(one_item.first), :Enabled, one_item[2]) + UI.ChangeWidget(Id(one_item.first), :Value, one_item[1]) end end @@ -427,18 +390,7 @@ _("In&clude Add-on Products from Separate Media"), Installation.add_on_selected ) - ), - InstData.enable_autoconfiguration == true ? - Left( - CheckBox( - Id(:use_automatic_configuration), - Opt(:notify), - # check box - _("&Use Automatic Configuration"), - ProductControl.GetUseAutomaticConfiguration - ) - ) : - Empty() + ) ), HStretch() ) @@ -478,19 +430,6 @@ "Include Add-on Products from Separate Media.\n" ) + # help text for installation method - (InstData.enable_autoconfiguration == true ? - _( - "\n" + - "Select Use Automatic Configuration to let the installation program\n" + - "configure your network and hardware automatically. Otherwise you will\n" + - "be offered a configuration proposal with the possibility to tune all the\n" + - "settings manually. Inexperienced users are advised to use automatic\n" + - "configuration.\n" - ) + - # help text for installation method - _("Update mode does not support automatic configuration.") : - "") + - # help text for installation method _( "The feature Update is only\n" + "available if an existing Linux system has been detected.\n" + @@ -502,7 +441,6 @@ ) end - # BNC #469730: Installation requires some packages def SetRequiredPackages if @new_mode == :install Builtins.y2milestone( @@ -511,16 +449,7 @@ PackagesProposal.AddResolvables( "YaST-Installation", :package, - ["yast2-installation"] - ) - elsif @new_mode == :update - Builtins.y2milestone( - "Adding packages required for update to succeed..." - ) - PackagesProposal.AddResolvables( - "YaST-Update", - :package, - ["yast2-update"] + ["perl-Bootloader-YAML"] ) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.1/src/clients/inst_worker_initial.rb new/yast2-installation-3.1.3/src/clients/inst_worker_initial.rb --- old/yast2-installation-3.1.1/src/clients/inst_worker_initial.rb 2013-10-23 09:40:31.000000000 +0200 +++ new/yast2-installation-3.1.3/src/clients/inst_worker_initial.rb 2013-11-01 13:10:18.000000000 +0100 @@ -101,6 +101,9 @@ WFM.CallFunction("inst_check_autoinst_mode", []) end + # Show the "Release Notes" button + Wizard.ShowReleaseNotesButton(_("Re&lease Notes..."), "show_release_notes") + @ret = nil # --- Runing the installation workflow --- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.1/src/clients/installation.rb new/yast2-installation-3.1.3/src/clients/installation.rb --- old/yast2-installation-3.1.1/src/clients/installation.rb 2013-10-23 09:40:31.000000000 +0200 +++ new/yast2-installation-3.1.3/src/clients/installation.rb 2013-11-01 13:10:18.000000000 +0100 @@ -38,7 +38,7 @@ Yast.import "Report" # Initialize the UI - Wizard.OpenNextBackStepsDialog + Wizard.OpenNextBackDialog Wizard.SetContents( # title "", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.1/src/clients/kernel_finish.rb new/yast2-installation-3.1.3/src/clients/kernel_finish.rb --- old/yast2-installation-3.1.1/src/clients/kernel_finish.rb 2013-10-23 09:40:31.000000000 +0200 +++ new/yast2-installation-3.1.3/src/clients/kernel_finish.rb 2013-11-01 13:10:18.000000000 +0100 @@ -72,7 +72,7 @@ elsif @func == "Write" ModulesConf.Save(true) - # on SGI Altix add fetchop and mmtimer to MODULES_LOADED_ON_BOOT + # on SGI Altix add fetchop and mmtimer to /etc/modules.d/ if Ops.greater_than(SCR.Read(path(".target.size"), "/proc/sgi_sn"), 0) Builtins.y2milestone("found SGI Altix, adding fetchop and mmtimer") Kernel.AddModuleToLoad("fetchop") @@ -135,29 +135,6 @@ false end - - def adjust_kernel_modules - all_modules = Convert.to_string( - SCR.Read(path(".sysconfig.kernel.MODULES_LOADED_ON_BOOT")) - ) - all_modules = "" if all_modules == nil - modules = Builtins.splitstring(all_modules, " \t\n") - Builtins.y2milestone("Modules: %1", modules) - - # already there - return true if Builtins.contains(modules, @module_to_load_dell) - - Builtins.y2milestone( - "Adding '%1' module to sysconfig/kernel:MODULES_LOADED_ON_BOOT", - @module_to_load_dell - ) - modules = Builtins.add(modules, @module_to_load_dell) - SCR.Write( - path(".sysconfig.kernel.MODULES_LOADED_ON_BOOT"), - Builtins.mergestring(modules, " ") - ) - SCR.Write(path(".sysconfig.kernel"), nil) - end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.1/src/include/installation/inst_inc_first.rb new/yast2-installation-3.1.3/src/include/installation/inst_inc_first.rb --- old/yast2-installation-3.1.1/src/include/installation/inst_inc_first.rb 2013-10-23 09:40:31.000000000 +0200 +++ new/yast2-installation-3.1.3/src/include/installation/inst_inc_first.rb 2013-11-01 13:10:18.000000000 +0100 @@ -123,32 +123,6 @@ ProductControl.DisableModule("user_non_interactive") ProductControl.DisableModule("auth") - Builtins.y2milestone("Adjusting automatic configuration") - # FATE #303396, Make second stage non-interactive - enable_autoconfiguration = ProductFeatures.GetBooleanFeature( - "globals", - "enable_autoconfiguration" - ) - autoconfiguration_default = ProductFeatures.GetBooleanFeature( - "globals", - "autoconfiguration_default" - ) - - # bnc#679435: leave normal second stage for autoYaST - if Mode.autoinst - enable_autoconfiguration = false - autoconfiguration_default = false - end - - # Enabled only when AC is selected - InstData.enable_autoconfiguration = enable_autoconfiguration == true - # Default state - ProductControl.SetUseAutomaticConfiguration( - autoconfiguration_default == true - ) - # Enables or disables some modules, etc. - AdjustAutomaticConfiguration() - nil end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.1/src/include/installation/misc.rb new/yast2-installation-3.1.3/src/include/installation/misc.rb --- old/yast2-installation-3.1.1/src/include/installation/misc.rb 2013-10-23 09:40:31.000000000 +0200 +++ new/yast2-installation-3.1.3/src/include/installation/misc.rb 2013-11-01 13:10:18.000000000 +0100 @@ -344,33 +344,7 @@ nil end - def AdjustAutomaticConfiguration - # AC is supported in Mode::installation only - if Mode.installation && ProductControl.GetUseAutomaticConfiguration - Builtins.y2milestone("Using AC...") - - ProductControl.DisableAllModulesAndProposals("installation", "continue") - ProductControl.EnableModule("automatic_configuration") - - # Enable Modules that are required to run even if using AC, bnc #428190 - EnableRequiredModules() - - # Otherwise it is always disabled - else - Builtins.y2milestone("Not using AC...") - - ProductControl.UnDisableAllModulesAndProposals( - "installation", - "continue" - ) - ProductControl.DisableModule("automatic_configuration") - end - - nil - end - def AdjustStepsAccordingToInstallationSettings - AdjustAutomaticConfiguration() if Installation.add_on_selected == true || Linuxrc.InstallInf("addon") != nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.1/src/include/installation/scr_switch_debugger.rb new/yast2-installation-3.1.3/src/include/installation/scr_switch_debugger.rb --- old/yast2-installation-3.1.1/src/include/installation/scr_switch_debugger.rb 2013-10-23 09:40:31.000000000 +0200 +++ new/yast2-installation-3.1.3/src/include/installation/scr_switch_debugger.rb 2013-11-01 13:10:18.000000000 +0100 @@ -52,7 +52,7 @@ # test result (Checking for xyz... Passed) @result_ok = _("Passed") # test result (Checking for xyz... Failed) - @result_failed = "Failed" + @result_failed = _("Failed") # ********************************************************************* @@ -74,20 +74,12 @@ # any command for the chroot command @test_do_chroot = "/bin/ls -1 /" - # y2base path - @test_y2base = "/usr/lib/YaST2/bin/y2base" - # get all installed rpm packages @test_rpm = "rpm -qa" - # all needed rpm packages - @needed_rpm_packages = [ - "yast2", - "yast2-installation", - "yast2-core", - "yast2-bootloader", - "yast2-packager" - ] + # all needed rpm packages, Yast might not be installed at the target system, + # so only glibc seems to be really needed... + @needed_rpm_packages = ["glibc"] # is the package %1 installed? @test_one_rpm = "rpm -q %1" @@ -345,24 +337,6 @@ test_result end - # checks whether the y2base binary exists - def RunSCRSwitchTest_Y2BASE - y2basefile = Builtins.sformat("%1%2", @chroot_path, @test_y2base) - test_result = FileUtils.Exists(y2basefile) - - ReportTest( - # Test progress - Builtins.sformat( - _("Checking for %1 in %2..."), - @test_y2base, - @chroot_path - ), - test_result - ) - - test_result - end - def RunSCRSwitchTest_FreeSpace ReportProgress(_("Checking free space")) @@ -602,10 +576,9 @@ # checks a package, whether it is installed # if it is installed, whether is has installed requires def RunSCRSwitchTest_DoNeededRPMsCheck - ret = true # check whether all needed packages are installed - Builtins.foreach(Builtins.sort(@needed_rpm_packages)) do |package_name| + @needed_rpm_packages.sort.all? do |package_name| # Test progress ReportProgress( Builtins.sformat( @@ -613,18 +586,10 @@ package_name ) ) - # is the package installed? - if !RunSCRSwitchTest_CheckWhetherInstalled(package_name) - ret = false - raise Break - # if it is installed, check whetheris has all dependencies - elsif !RunSCRSwitchTest_DoNeededRPMsRequire(package_name) - ret = false - raise Break - end - end - ret + # is the package installed? all dependencies Ok? + RunSCRSwitchTest_CheckWhetherInstalled(package_name) && RunSCRSwitchTest_DoNeededRPMsRequire(package_name) + end end def PrintLinesFromTo(from_line, to_line) @@ -710,7 +675,6 @@ return false if !RunSCRSwitchTest_ListFilesInChroot() return false if !RunSCRSwitchTest_BinaryExists() return false if !RunSCRSwitchTest_DoChroot() - return false if !RunSCRSwitchTest_Y2BASE() return false if !RunSCRSwitchTest_FreeSpace() return false if !RunSCRSwitchTest_DoRPMCheck() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.1/src/modules/InstData.rb new/yast2-installation-3.1.3/src/modules/InstData.rb --- old/yast2-installation-3.1.1/src/modules/InstData.rb 2013-10-23 09:40:31.000000000 +0200 +++ new/yast2-installation-3.1.3/src/modules/InstData.rb 2013-11-01 13:10:18.000000000 +0100 @@ -82,10 +82,6 @@ @localDisabledModules = [] @localDisabledProposals = [] - # FATE #303396, Non-interactive second stage - # this variable enables a check box in dialog - @enable_autoconfiguration = false - # <-- other # --> copy files -- config @@ -112,7 +108,6 @@ publish :variable => :wizardsteps_disabled_ac_items, :type => "string" publish :variable => :localDisabledModules, :type => "list <string>" publish :variable => :localDisabledProposals, :type => "list <string>" - publish :variable => :enable_autoconfiguration, :type => "boolean" publish :variable => :copy_files_use_control_file, :type => "boolean" publish :variable => :additional_copy_files, :type => "list <map>" end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.1/src/modules/InstFunctions.rb new/yast2-installation-3.1.3/src/modules/InstFunctions.rb --- old/yast2-installation-3.1.1/src/modules/InstFunctions.rb 2013-10-23 09:40:31.000000000 +0200 +++ new/yast2-installation-3.1.3/src/modules/InstFunctions.rb 2013-11-01 13:10:18.000000000 +0100 @@ -40,22 +40,38 @@ # # - Allowed format is ignore[d][_]feature[s]=$feature1[,$feature2,[...]] # - Multiple ignored_features are allowed on one command line - # - Command and features are case-insensitive and all dashes - # and underscores are ignored + # - Command and features are case-insensitive and all dashes, + # underscores and dots are ignored to be compatible with Linuxrc, + # see #polish and http://en.opensuse.org/SDB:Linuxrc#Passing_parameters + # - If entries are also mentioned in PTOptions, they do not appear in + # 'Cmdline' but as separate entries, + # see http://en.opensuse.org/SDB:Linuxrc#p_ptoptions # # @return [Array] ignored features def ignored_features return @ignored_features if @ignored_features - cmdline = Linuxrc.InstallInf("Cmdline").downcase.tr("-_", "").split - ignored_features = cmdline.select do |cmd| + # Features defined as individual entries in install.inf + features_keys = Linuxrc.keys.select do |key| + polish(key) =~ /^ignored?features?$/ + end + + unparsed_features = features_keys.map do |key| + polish(Linuxrc.InstallInf(key)) + end + + # Features mentioned in 'Cmdline' entry + cmdline = polish(Linuxrc.InstallInf("Cmdline")).split + cmdline_features = cmdline.select do |cmd| cmd =~ /^ignored?features?=/i end - ignored_features.collect! do |feature| + cmdline_features.collect! do |feature| feature.gsub(/^ignored?features?=(.*)/i, '\1') end + # Both are supported together + ignored_features = unparsed_features + cmdline_features @ignored_features = ignored_features.map{ |f| f.split(',') }.flatten.uniq end @@ -75,12 +91,27 @@ return false end - feature = feature_name.downcase.tr("-_", "") + feature = polish(feature_name) ignored_features.include?(feature) end publish :function => :ignored_features, :type => "list ()" publish :function => :feature_ignored?, :type => "boolean (string)" + + private + + # Removes unneeded characters from the given string + # for easier handling + # + # These unneeded characters are entered by user on Linuxrc commandline + # we remove them everywhere, and down-case all strings so it's very easy + # to match given features with user-entered strings + # + # @param [String] feature + # @return [String] polished feature + def polish(feature) + feature.downcase.tr("-_\.", "") + end end InstFunctions = InstFunctionsClass.new diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.1/test/inst_functions.rb new/yast2-installation-3.1.3/test/inst_functions.rb --- old/yast2-installation-3.1.1/test/inst_functions.rb 2013-10-23 09:40:31.000000000 +0200 +++ new/yast2-installation-3.1.3/test/inst_functions.rb 2013-11-01 13:10:18.000000000 +0100 @@ -45,7 +45,7 @@ end it "returns list of features set on commandline by several entries, each feature in separate entry" do - linuxrc_commandline = "trash=install ignore_feature=feature1 ignored_features=feature2 ignore_features=feature3" + linuxrc_commandline = "trash=install ignore_feature=f.e.a.ture1 ig.n.o.red_features=feature2 ignore_features=feature3" ignored_features = ["feature1", "feature2", "feature3"].sort Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) @@ -67,9 +67,30 @@ Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) expect(Yast::InstFunctions.ignored_features.sort).to eq ignored_features end + + # PTOptions makes a command hidden from 'Cmdline' and creates + # a new install.inf entry using the exact name as it appears in PTOptions + # @see http://en.opensuse.org/SDB:Linuxrc#p_ptoptions + it "returns features set on commandline together with ptoptions" do + install_inf = { + 'ignored_features' => 'f1,f2,f3', + 'IgnoReDfEAtuRes' => 'f2,f4', + 'i.g.n.o.r.e.d.features' => 'f1,f5', + 'IGNORE-FEA-T-U-RE' => 'f6,f7,f7,f7', + 'another_feature' => 'another_value', + 'Cmdline' => 'splash=silent vga=0x314', + 'Keyboard' => '1', + } + Yast::Linuxrc.stub(:keys).and_return(install_inf.keys) + install_inf.keys.each do |key| + Yast::Linuxrc.stub(:InstallInf).with(key).and_return(install_inf[key]) + end + + expect(Yast::InstFunctions.ignored_features.sort).to eq(['f1','f2','f3','f4','f5','f6','f7']) + end end -describe "when checking whether feature is ignored" do +describe "#feature_ignored?" do before(:each) do Yast::InstFunctions.reset_ignored_features end @@ -115,4 +136,42 @@ Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline) expect(Yast::InstFunctions.feature_ignored?(nil)).to be_false end + + it "should be true if feature is mentioned as a separate install.inf entry or in Cmdline" do + install_inf = { + 'ignored_features' => 'f1,f2,f3', + 'IgnoReDfEAtuRes' => 'f2,f4', + 'i.g.n.o.r.e.d.features' => 'f1,f5', + 'IGNORED-FEA-T-U-RES' => 'f6,f7,f7,f7', + 'another_feature' => 'another_value', + 'Cmdline' => 'splash=silent vga=0x314 ignored_feature=f8', + 'Keyboard' => '1', + } + Yast::Linuxrc.stub(:keys).and_return(install_inf.keys) + install_inf.keys.each do |key| + Yast::Linuxrc.stub(:InstallInf).with(key).and_return(install_inf[key]) + end + + ['f1', 'f2', 'f3', 'f4', 'f5', 'f6', 'f7', 'f8'].each do |key| + expect(Yast::InstFunctions.feature_ignored?(key)).to be_true, "Key #{key} is not ignored" + end + end + + it "should be false if feature is not mentioned as a separate install.inf entry or in Cmdline" do + install_inf = { + 'ignored_features' => 'f1,f2,f3', + 'IgnoReDfEAtuRes' => 'f2,f4', + 'i.g.n.o.r.e.d.features' => 'f1,f5', + 'IGNORE-FEA-T-U-RE' => 'f6,f7,f7,f7', + 'another_feature' => 'another_value', + 'Cmdline' => 'splash=silent vga=0x314 ignored_feature=f8', + 'Keyboard' => '1', + } + Yast::Linuxrc.stub(:keys).and_return(install_inf.keys) + install_inf.keys.each do |key| + Yast::Linuxrc.stub(:InstallInf).with(key).and_return(install_inf[key]) + end + + expect(Yast::InstFunctions.feature_ignored?('f9')).to be_false + end end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-core for openSUSE:Factory
by root＠hilbert.suse.de 07 Nov '13

07 Nov '13

Hello community, here is the log from the commit of package yast2-core for openSUSE:Factory checked in at 2013-11-07 09:15:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-core (Old) and /work/SRC/openSUSE:Factory/.yast2-core.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-core" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-core/yast2-core.changes 2013-10-24 14:15:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-core.new/yast2-core.changes 2013-11-07 09:15:16.000000000 +0100 @@ -1,0 +2,14 @@ +Mon Nov 4 15:26:11 UTC 2013 - jreidinger(a)suse.com + +- remove remote libraries support on installed system. It requires + yast2-core on installed system which forbits goal for SLE12 to + not have yast on target system. The last piece that use it was + adapted since perl-Bootloader-0.800 . +- 3.1.4 + +------------------------------------------------------------------- +Wed Oct 23 11:32:20 UTC 2013 - lslezak(a)suse.cz + +- system-agent: handle chroot at more places + +------------------------------------------------------------------- @@ -7,0 +22,12 @@ +Fri Oct 18 12:03:31 UTC 2013 - jreidinger(a)suse.com + +- Do not delete agent outside of component in WFM otherwise + installation segfault + +------------------------------------------------------------------- +Thu Oct 17 14:16:09 UTC 2013 - jreidinger(a)suse.com + +- chdir("/") after chroot otherwise commands fail with unreachable + location after `cd ~` + +------------------------------------------------------------------- @@ -15,0 +42,6 @@ +Mon Oct 14 12:40:31 UTC 2013 - jreidinger(a)suse.com + +- minimal chroot: fixed System:: to actually chroot; hopefully + fixes bootloader setup at installation + +------------------------------------------------------------------- @@ -29,0 +62,5 @@ +Wed Sep 25 14:16:30 UTC 2013 - jreidinger(a)suse.com + +- respect target root in: ag_any(for processes), system_agent + +------------------------------------------------------------------- @@ -36,0 +74,6 @@ +Wed Sep 11 12:40:58 UTC 2013 - jreidinger(a)suse.com + +- respect target root in: ag_any, ag_ini, ag_modules, ag_resolver + + +------------------------------------------------------------------- @@ -40,0 +84,8 @@ + +------------------------------------------------------------------- +Tue Sep 3 13:28:44 UTC 2013 - jreidinger(a)suse.com + +- libscr: added "root" attribute to SCRAgent (FATE#314695). Agents + must be adapted to respect it instead of relying on chroot(2) + having been run. + Old: ---- yast2-core-3.1.3.tar.bz2 New: ---- yast2-core-3.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-core.spec ++++++ --- /var/tmp/diff_new_pack.eezopp/_old 2013-11-07 09:15:17.000000000 +0100 +++ /var/tmp/diff_new_pack.eezopp/_new 2013-11-07 09:15:17.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-core -Version: 3.1.3 +Version: 3.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -128,7 +128,6 @@ %dir %{yast_ybindir} %dir %{yast_plugindir} %dir %{yast_scrconfdir} -%dir %{yast_execcompdir}/servers %dir %{yast_execcompdir}/servers_non_y2 /usr/bin/ycpc @@ -140,7 +139,6 @@ %{yast_ybindir}/elf-arch %{yast_plugindir}/lib*.so.* %{yast_scrconfdir}/*.scr -%{yast_execcompdir}/servers/scr %{yast_execcompdir}/servers_non_y2/ag_* # perl part (stdio agents) # *: regular build compresses them, debug does not ++++++ yast2-core-3.1.3.tar.bz2 -> yast2-core-3.1.4.tar.bz2 ++++++ ++++ 7377 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0