April 2012 - openSUSE Commits - openSUSE Mailing Lists

commit freerdp for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package freerdp for openSUSE:Factory checked in at 2012-04-23 17:40:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/freerdp (Old) and /work/SRC/openSUSE:Factory/.freerdp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "freerdp", Maintainer is "LZWang(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/freerdp/freerdp.changes 2012-04-02 19:52:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.freerdp.new/freerdp.changes 2012-04-23 17:40:03.000000000 +0200 @@ -1,0 +2,14 @@ +Sun Apr 22 18:07:53 UTC 2012 - gber(a)opensuse.org + +- added freerdp-fix-FindPCSC-macro.patch which fixes the build by + setting PCSC_LIBRARIES and PCSC_INCLUDE_DIRS variables explicitly + which are otherwise empty + (https://github.com/FreeRDP/FreeRDP/issues/562) + +------------------------------------------------------------------- +Thu Apr 19 15:31:06 UTC 2012 - gber(a)opensuse.org + +- applied fix for a bug in freerdp-fix-bitmap-cache.patch from + upstream git + +------------------------------------------------------------------- New: ---- freerdp-fix-FindPCSC-macro.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ freerdp.spec ++++++ --- /var/tmp/diff_new_pack.wxFkzK/_old 2012-04-23 17:40:05.000000000 +0200 +++ /var/tmp/diff_new_pack.wxFkzK/_new 2012-04-23 17:40:05.000000000 +0200 @@ -28,6 +28,8 @@ Source0: https://github.com/downloads/FreeRDP/FreeRDP/%{name}-%{version}.tar.gz # PATCH-FIX-UPSTREAM freerdp-fix-bitmap-cache.patch zawertun(a)gmail.com -- Fix a problem with the bitmap cache resulting in garbled images (backported from upstream git) Patch0: freerdp-fix-bitmap-cache.patch +# PATCH-FIX-UPSTREAM freerdp-fix-FindPCSC-macro.patch https://github.com/FreeRDP/FreeRDP/issues/562 gberh(a)opensuse.org -- Fix the build by setting PCSC_LIBRARIES and PCSC_INCLUDE_DIRS variables explicitly which are otherwise empty +Patch1: freerdp-fix-FindPCSC-macro.patch BuildRequires: cmake BuildRequires: cups-devel BuildRequires: ed @@ -76,6 +78,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 # use a versioned subdirectory for plugins in order to comply with the shared # library policy ed -s CMakeLists.txt 2>/dev/null <<'EOF' @@ -98,7 +101,6 @@ -DWITH_FFMPEG=OFF \ -DWITH_SSE2=OFF \ .. - make %{?_smp_mflags} VERBOSE=1 %install ++++++ freerdp-fix-FindPCSC-macro.patch ++++++ Index: freerdp-1.0.1/cmake/FindPCSC.cmake =================================================================== --- freerdp-1.0.1.orig/cmake/FindPCSC.cmake +++ freerdp-1.0.1/cmake/FindPCSC.cmake @@ -8,6 +8,9 @@ find_path(PCSC_INCLUDE_DIR pcsclite.h PA PATH_SUFFIXES PCSC ) find_library(PCSC_LIBRARY pcsclite PATHS ${PCSC_LIBRARY_DIRS}) +set(PCSC_LIBRARIES ${PCSC_LIBRARY} ) +set(PCSC_INCLUDE_DIRS ${PCSC_INCLUDE_DIR} ) + FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCSC DEFAULT_MSG PCSC_INCLUDE_DIR PCSC_LIBRARY) mark_as_advanced(PCSC_INCLUDE_DIR PCSC_LIBRARY) ++++++ freerdp-fix-bitmap-cache.patch ++++++ --- /var/tmp/diff_new_pack.wxFkzK/_old 2012-04-23 17:40:05.000000000 +0200 +++ /var/tmp/diff_new_pack.wxFkzK/_new 2012-04-23 17:40:05.000000000 +0200 @@ -1,8 +1,8 @@ -diff --git a/libfreerdp-cache/bitmap.c b/libfreerdp-cache/bitmap.c -index 99c1005..e3e2303 100644 ---- a/libfreerdp-cache/bitmap.c -+++ b/libfreerdp-cache/bitmap.c -@@ -173,9 +173,10 @@ rdpBitmap* bitmap_cache_get(rdpBitmapCache* bitmap_cache, uint32 id, uint32 inde +Index: freerdp-1.0.1/libfreerdp-cache/bitmap.c +=================================================================== +--- freerdp-1.0.1.orig/libfreerdp-cache/bitmap.c ++++ freerdp-1.0.1/libfreerdp-cache/bitmap.c +@@ -162,9 +162,10 @@ rdpBitmap* bitmap_cache_get(rdpBitmapCac } if (index == BITMAP_CACHE_WAITING_LIST_INDEX) @@ -16,7 +16,7 @@ { printf("get invalid bitmap index %d in cell id: %d\n", index, id); return NULL; -@@ -195,9 +196,10 @@ void bitmap_cache_put(rdpBitmapCache* bitmap_cache, uint32 id, uint32 index, rdp +@@ -184,9 +185,10 @@ void bitmap_cache_put(rdpBitmapCache* bi } if (index == BITMAP_CACHE_WAITING_LIST_INDEX) @@ -30,17 +30,17 @@ { printf("put invalid bitmap index %d in cell id: %d\n", index, id); return; -@@ -255,7 +257,8 @@ rdpBitmapCache* bitmap_cache_new(rdpSettings* settings) +@@ -244,7 +246,8 @@ rdpBitmapCache* bitmap_cache_new(rdpSett for (i = 0; i < (int) bitmap_cache->maxCells; i++) { bitmap_cache->cells[i].number = settings->bitmapCacheV2CellInfo[i].numEntries; - bitmap_cache->cells[i].entries = (rdpBitmap**) xzalloc(sizeof(rdpBitmap*) * bitmap_cache->cells[i].number); + /* allocate an extra entry for BITMAP_CACHE_WAITING_LIST_INDEX */ -+ bitmap_cache->cells[i].entries = (rdpBitmap**) xzalloc(sizeof(rdpBitmap*) * bitmap_cache->cells[i].number + 1); ++ bitmap_cache->cells[i].entries = (rdpBitmap**) xzalloc(sizeof(rdpBitmap*) * (bitmap_cache->cells[i].number + 1)); } } -@@ -271,7 +274,7 @@ void bitmap_cache_free(rdpBitmapCache* bitmap_cache) +@@ -260,7 +263,7 @@ void bitmap_cache_free(rdpBitmapCache* b { for (i = 0; i < (int) bitmap_cache->maxCells; i++) { -- 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-qt for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package yast2-qt for openSUSE:Factory checked in at 2012-04-23 16:14:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-qt (Old) and /work/SRC/openSUSE:Factory/.yast2-qt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-qt", Maintainer is "TGoettlicher(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-qt/yast2-qt.changes 2012-02-24 06:54:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-qt.new/yast2-qt.changes 2012-04-23 16:14:30.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 10 15:40:58 CEST 2012 - tgoettlicher(a)suse.de + +- BuildRequire libxcrypt-devel only for < 12.2 +- Version: 2.22.5 + +------------------------------------------------------------------- Old: ---- yast2-qt-2.22.4.tar.bz2 New: ---- yast2-qt-2.22.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-qt.spec ++++++ --- /var/tmp/diff_new_pack.ylRUa1/_old 2012-04-23 16:14:31.000000000 +0200 +++ /var/tmp/diff_new_pack.ylRUa1/_new 2012-04-23 16:14:31.000000000 +0200 @@ -18,24 +18,26 @@ Name: yast2-qt -Version: 2.22.4 +Version: 2.22.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-qt-2.22.4.tar.bz2 +Source0: yast2-qt-2.22.5.tar.bz2 Group: System/YaST License: GPL-2.0 BuildRequires: docbook-xsl-stylesheets BuildRequires: doxygen BuildRequires: libdrm-devel BuildRequires: libjpeg-devel -BuildRequires: libxcrypt-devel BuildRequires: libxslt BuildRequires: perl-XML-Writer BuildRequires: libqt4-devel BuildRequires: sgml-skel BuildRequires: update-desktop-files BuildRequires: cmake +%if 0%{?suse_version} < 1220 +BuildRequires: libxcrypt-devel +%endif %requires_ge libqt4 Summary: YaST2 - Graphical User Interface ++++++ yast2-qt-2.22.4.tar.bz2 -> yast2-qt-2.22.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-2.22.4/VERSION.cmake new/yast2-qt-2.22.5/VERSION.cmake --- old/yast2-qt-2.22.4/VERSION.cmake 2012-02-23 15:16:05.000000000 +0100 +++ new/yast2-qt-2.22.5/VERSION.cmake 2012-04-10 15:42:07.000000000 +0200 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "22") -SET(VERSION_PATCH "4") +SET(VERSION_PATCH "5") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-2.22.4/package/yast2-qt.changes new/yast2-qt-2.22.5/package/yast2-qt.changes --- old/yast2-qt-2.22.4/package/yast2-qt.changes 2012-02-23 15:16:05.000000000 +0100 +++ new/yast2-qt-2.22.5/package/yast2-qt.changes 2012-04-10 15:42:07.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 10 15:40:58 CEST 2012 - tgoettlicher(a)suse.de + +- BuildRequire libxcrypt-devel only for < 12.2 +- Version: 2.22.5 + +------------------------------------------------------------------- Thu Feb 23 15:12:05 CET 2012 - tgoettlicher(a)suse.de - Fixed selection Table widget (bnc#746156) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-qt-2.22.4/yast2-qt.spec.in new/yast2-qt-2.22.5/yast2-qt.spec.in --- old/yast2-qt-2.22.4/yast2-qt.spec.in 2012-02-23 15:16:05.000000000 +0100 +++ new/yast2-qt-2.22.5/yast2-qt.spec.in 2012-04-10 15:42:07.000000000 +0200 @@ -8,13 +8,15 @@ BuildRequires: doxygen BuildRequires: libdrm-devel BuildRequires: libjpeg-devel -BuildRequires: libxcrypt-devel BuildRequires: libxslt BuildRequires: perl-XML-Writer BuildRequires: libqt4-devel BuildRequires: sgml-skel BuildRequires: update-desktop-files BuildRequires: cmake +%if 0%{?suse_version} < 1220 +BuildRequires: libxcrypt-devel +%endif %requires_ge libqt4 Summary: YaST2 - Graphical User Interface -- 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-proxy for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package yast2-proxy for openSUSE:Factory checked in at 2012-04-23 16:14:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-proxy (Old) and /work/SRC/openSUSE:Factory/.yast2-proxy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-proxy", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-proxy/yast2-proxy.changes 2012-04-12 10:00:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-proxy.new/yast2-proxy.changes 2012-04-23 16:14:27.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 11 11:15:23 CEST 2012 - mvidner(a)suse.cz + +- Moved over one forgotten file. +- 2.22.1 + +------------------------------------------------------------------- Old: ---- yast2-proxy-2.22.0.tar.bz2 New: ---- yast2-proxy-2.22.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-proxy.spec ++++++ --- /var/tmp/diff_new_pack.pgA2NC/_old 2012-04-23 16:14:29.000000000 +0200 +++ /var/tmp/diff_new_pack.pgA2NC/_new 2012-04-23 16:14:29.000000000 +0200 @@ -15,22 +15,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: yast2-proxy -Version: 2.22.0 +Version: 2.22.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-proxy-%{version}.tar.bz2 -Group: System/YaST -License: GPL-2.0+ # should be required by devtools -BuildRequires: perl-XML-Writer pkgconfig rpm +BuildRequires: perl-XML-Writer +BuildRequires: pkgconfig +BuildRequires: rpm BuildRequires: update-desktop-files -BuildRequires: yast2-devtools yast2-testsuite +BuildRequires: yast2-devtools +BuildRequires: yast2-testsuite BuildRequires: yast2 Requires: yast2 @@ -42,6 +41,8 @@ BuildArch: noarch Summary: YaST2 - Proxy Configuration +License: GPL-2.0+ +Group: System/YaST Url: http://en.opensuse.org/Portal:YaST %description @@ -58,7 +59,6 @@ export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -%{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) # so that RPM_OPT_FLAGS check works @@ -80,6 +80,7 @@ /usr/share/YaST2/clients/*.ycp /usr/share/YaST2/modules/*.ycp /usr/share/YaST2/modules/*.ybc +/usr/share/YaST2/include/proxy %{_prefix}/share/applications/YaST2/*.desktop /usr/share/YaST2/scrconf/*.scr /usr/share/YaST2/schema/autoyast/rnc/proxy.rnc ++++++ yast2-proxy-2.22.0.tar.bz2 -> yast2-proxy-2.22.1.tar.bz2 ++++++ ++++ 1870 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/yast2-proxy-2.22.0/VERSION new/yast2-proxy-2.22.1/VERSION --- old/yast2-proxy-2.22.0/VERSION 2012-04-10 13:21:28.000000000 +0200 +++ new/yast2-proxy-2.22.1/VERSION 2012-04-23 11:29:01.000000000 +0200 @@ -1 +1 @@ -2.22.0 +2.22.1 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/yast2-proxy-2.22.0/configure.in new/yast2-proxy-2.22.1/configure.in --- old/yast2-proxy-2.22.0/configure.in 2012-04-10 16:01:41.000000000 +0200 +++ new/yast2-proxy-2.22.1/configure.in 2012-04-23 11:29:01.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-proxy dnl -dnl -- This file is generated by y2autoconf 2.21.6 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.21.7 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-proxy, 2.22.0, http://bugs.opensuse.org/, yast2-proxy) +AC_INIT(yast2-proxy, 2.22.1, http://bugs.opensuse.org/, yast2-proxy) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.22.0" +VERSION="2.22.1" RPMNAME="yast2-proxy" MAINTAINER="Martin Vidner <mvidner(a)suse.cz>" @@ -152,6 +152,8 @@ AC_CONFIG_FILES(Makefile config/Makefile src/clients/Makefile +src/include/proxy/Makefile +src/include/Makefile src/modules/Makefile src/Makefile testsuite/Makefile) 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/yast2-proxy-2.22.0/src/Makefile.am new/yast2-proxy-2.22.1/src/Makefile.am --- old/yast2-proxy-2.22.0/src/Makefile.am 2012-04-10 13:21:28.000000000 +0200 +++ new/yast2-proxy-2.22.1/src/Makefile.am 2012-04-23 11:29:01.000000000 +0200 @@ -1 +1 @@ -SUBDIRS = clients modules +SUBDIRS = clients include modules 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/yast2-proxy-2.22.0/src/clients/proxy.ycp new/yast2-proxy-2.22.1/src/clients/proxy.ycp --- old/yast2-proxy-2.22.0/src/clients/proxy.ycp 2012-04-10 15:44:19.000000000 +0200 +++ new/yast2-proxy-2.22.1/src/clients/proxy.ycp 2012-04-23 11:29:01.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Proxy client * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: proxy.ycp 67875 2012-04-10 13:44:18Z mvidner $ + * $Id: proxy.ycp 67911 2012-04-11 09:21:56Z mvidner $ * * Main file for proxy configuration. * Uses all other files. @@ -32,8 +32,7 @@ } any ProxyGUI() { - include "network/runtime.ycp"; - include "network/services/proxy.ycp"; + include "proxy/dialogs.ycp"; Proxy::Read (); 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/yast2-proxy-2.22.0/src/clients/proxy_auto.ycp new/yast2-proxy-2.22.1/src/clients/proxy_auto.ycp --- old/yast2-proxy-2.22.0/src/clients/proxy_auto.ycp 2012-04-10 15:44:19.000000000 +0200 +++ new/yast2-proxy-2.22.1/src/clients/proxy_auto.ycp 2012-04-23 11:29:01.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Client for autoinstallation * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: proxy_auto.ycp 67875 2012-04-10 13:44:18Z mvidner $ + * $Id: proxy_auto.ycp 67911 2012-04-11 09:21:56Z mvidner $ * * This is a client for autoinstallation. It takes its arguments, * goes through the configuration and return the setting. @@ -30,7 +30,7 @@ import "Wizard"; import "Summary"; -include "network/services/proxy.ycp"; +include "proxy/dialogs.ycp"; /** * Return a modification status 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/yast2-proxy-2.22.0/src/clients/proxy_proposal.ycp new/yast2-proxy-2.22.1/src/clients/proxy_proposal.ycp --- old/yast2-proxy-2.22.0/src/clients/proxy_proposal.ycp 2012-04-10 15:44:19.000000000 +0200 +++ new/yast2-proxy-2.22.1/src/clients/proxy_proposal.ycp 2012-04-23 11:29:01.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Martin Vidner <mvidner(a)suse.cz> * Michal Svec <msvec(a)suse.cz> * - * $Id: proxy_proposal.ycp 67875 2012-04-10 13:44:18Z mvidner $ + * $Id: proxy_proposal.ycp 67911 2012-04-11 09:21:56Z mvidner $ * * Proposal function dispatcher for proxy configuration. * See source/installation/proposal/proposal-API.txt @@ -53,7 +53,7 @@ /* run the module */ else if(func == "AskUser") { - include "network/services/proxy.ycp"; + include "proxy/dialogs.ycp"; map stored = Proxy::Export(); 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/yast2-proxy-2.22.0/src/include/Makefile.am new/yast2-proxy-2.22.1/src/include/Makefile.am --- old/yast2-proxy-2.22.0/src/include/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-proxy-2.22.1/src/include/Makefile.am 2012-04-23 11:29:01.000000000 +0200 @@ -0,0 +1 @@ +SUBDIRS = proxy 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/yast2-proxy-2.22.0/src/include/proxy/Makefile.am new/yast2-proxy-2.22.1/src/include/proxy/Makefile.am --- old/yast2-proxy-2.22.0/src/include/proxy/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-proxy-2.22.1/src/include/proxy/Makefile.am 2012-04-23 11:29:01.000000000 +0200 @@ -0,0 +1,4 @@ +yncludedir = @yncludedir@/proxy +ynclude_DATA = dialogs.ycp + +EXTRA_DIST = $(ynclude_DATA) 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/yast2-proxy-2.22.0/src/include/proxy/dialogs.ycp new/yast2-proxy-2.22.1/src/include/proxy/dialogs.ycp --- old/yast2-proxy-2.22.0/src/include/proxy/dialogs.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-proxy-2.22.1/src/include/proxy/dialogs.ycp 2012-04-23 11:29:01.000000000 +0200 @@ -0,0 +1,667 @@ +/** + * File: include/proxy/dialogs.ycp + * Package: Proxy configuration + * Authors: Michal Svec <msvec(a)suse.cz> + * + * $Id: dialogs.ycp 67911 2012-04-11 09:21:56Z mvidner $ + */ + +{ + +textdomain "proxy"; + +import "Address"; +import "Hostname"; +import "Label"; +import "Mode"; +import "Netmask"; +import "Popup"; +import "Proxy"; +import "String"; +import "URL"; +import "Wizard"; + +boolean enabled = false; +string http = ""; +string https = ""; +string ftp = ""; +string no = ""; +string user = ""; +string pass = ""; +boolean same_proxy = false; +/* String to pre-filled into the proxy server field */ +string prefill = "http://"; + + +// from OnlineUpdateDialogs.ycp +/** + * Function opens the generic error dialog including the + * message with the [Details >>] button. It handles pressing + * the button itself. + * + * @param string message with the short error message + * @param string details with all of the error details + */ + +boolean modified() { + return !(Proxy::http == http && Proxy::ftp == ftp && Proxy::no == no && + Proxy::https == https && + Proxy::user == user && Proxy::pass == pass && + Proxy::enabled == enabled); +} + +define void ErrorPopupGeneric( string message, string details ) { + // Informative label + if ( size( details ) == 0 ) details = _("No details available."); + + // A push button + string detailsStringOn = _("&Details <<"); + // A push button + string detailsStringOff = _("&Details >>"); + + term detailsButton = `PushButton( `id( `details ), detailsStringOff ); + + string heading = Label::ErrorMsg (); + + term buttons = `HBox( + detailsButton, + `PushButton( `id( `ok ), Label::OKButton() ) + ); + + UI::OpenDialog( `opt( `decorated ), + `VBox( + `HBox( `HSpacing( 0.5 ), `Left( `Heading( heading ) ) ), + `VSpacing( 0.2 ), + `Left(`Label( message )), + `ReplacePoint( `id( `rp ), `Empty() ), + buttons + ) + ); + + any ret = nil; + boolean showDetails = false; + + while( ret != `ok ) { + ret = UI::UserInput(); + + if ( ret == `details ) { + if ( showDetails ) { + UI::ReplaceWidget( `id( `rp ), `Empty() ); + UI::ChangeWidget( `id( `details ), `Label, detailsStringOff ); + } else { + UI::ReplaceWidget( `id( `rp ), `HBox( `HSpacing( 0.5 ), + `HWeight( 1, `RichText(`opt(`plainText), details ) ), + `HSpacing( 0.5 ) ) + ); + UI::ChangeWidget( `id( `details ), `Label, detailsStringOn ); + } + showDetails = !showDetails; + } + } + + UI::CloseDialog(); +} + +/* Known return codes - good proxy response */ +list <string> return_codes_good = [ + "200", // OK + "201", // Created + "202", // Accepted + "203", // Non-Authorative Information + "204", // No Content + "205", // Reset Content + "206", // Partial Content + + "300", // Multiple Choices + "301", // Moved Permanently + "302", // Moved Temporarily + "303", // See Other + "304", // Not Modified + "305", // Use Proxy +]; + +/* Known return codes - bad proxy response */ +list <string> return_codes_bad = [ + // Proxy Errors + "400", // Bad Request + "401", // Authorization Required + "402", // Payment Required (not used yet) + "403", // Forbidden + "404", // Not Found + "405", // Method Not Allowed + "406", // Not Acceptable (encoding) + "407", // Proxy Authentication Required + "408", // Request Timed Out + "409", // Conflicting Request + "410", // Gone + "411", // Content Length Required + "412", // Precondition Failed + "413", // Request Entity Too Long + "414", // Request URI Too Long + "415", // Unsupported Media Type + + // Server Errors + "500", // Internal Server Error + "501", // Not Implemented + "502", // Bad Gateway + "503", // Service Unavailable + "504", // Gateway Timeout + "505", // HTTP Version Not Supported +]; + +/** + * Function checks the proxy-return code. + * + * @param string test_type HTTP, HTTPS or FTP + * @param string proxy_ret_stderr such as "HTTP/1.0 403 Forbidden" + * @return boolean true if the proxy response is a good one + */ +define boolean TestProxyReturnCode (string test_type, string proxy_ret_stderr) { + string proxy_retcode = ""; + // getting the return code string from the stderr + foreach (string proxy_stderr, splitstring(proxy_ret_stderr, "\r?\n"), { + if (regexpmatch(proxy_stderr, "HTTP/[0-9\.]+ [0-9]+")) { + proxy_retcode = regexpsub(proxy_stderr, ".*(HTTP.*)", "\\1"); + } + }); + + y2milestone("Proxy %1 test: %2", test_type, proxy_retcode); + + // The default error code, replaced with the current error code got from proxy if any code found + string retcode = _("Unknown Error Code"); + foreach(string ret_code_part, splitstring(proxy_retcode, " "), { + if (regexpmatch(ret_code_part, "^[0-9]+$") && size(ret_code_part)>=3) { + retcode = ret_code_part; + } + }); + + // known good return code + if (contains(return_codes_good, retcode)) { + return true; + // known bad return code + } else if (contains(return_codes_bad, retcode)) { + // Error message, + // %1 is a string "HTTP", "HTTPS" or "FTP" + // %2 is an error string such as "HTTP/1.0 403 Forbidden" + ErrorPopupGeneric(sformat(_("An error occurred during the %1 proxy test. +Proxy return code: %2. +"), test_type, proxy_retcode), proxy_ret_stderr); + return false; + + } else { + // Unknown return code, + // %1 is the string HTTP, "HTTPS" or FTP, + // %2 is an error string such as "HTTP/1.0 403 Forbidden" + ErrorPopupGeneric(sformat(_("An unknown error occurred during the %1 proxy test. +Proxy return code: %2. +"), test_type, proxy_retcode), proxy_ret_stderr); + } +} + +/** + * Function test the current HTTP and FTP proxy settings. + * It currently ignores the "No Proxy" value. + * + * @return boolean true if successful + */ +define boolean TestProxySettings () { + if (enabled) { + UI::OpenDialog( + // An informative popup label diring the proxy testings + `Left(`Label(_("Testing the current proxy settings..."))) + ); + map <string, map <string, any> > ret = Proxy::RunTestProxy (http, https, ftp, user, pass); + UI::CloseDialog(); + + // curl error + if (ret["HTTP","tested"]:true == true) { + if ((integer) ret["HTTP","exit"]:1 != 0) { + // TRANSLATORS: Error popup message + ErrorPopupGeneric(_("An error occurred during the HTTP proxy test."), ret["HTTP","stderr"]:""); + UI::SetFocus(`id(`http)); + return false; + } else { + // curl works - proxy error + if (! TestProxyReturnCode("HTTP", ret["HTTP","stderr"]:"")) { + UI::SetFocus(`id(`http)); + return false; + } + } + } + + if (ret["HTTPS","tested"]:true == true) { + // curl error + if ((integer) ret["HTTPS","exit"]:1 != 0) { + // TRANSLATORS: Error popup message + ErrorPopupGeneric(_("An error occurred during the HTTPS proxy test."), ret["HTTPS","stderr"]:""); + UI::SetFocus(`id(`https)); + return false; + } else { + // curl works - proxy error + if (! TestProxyReturnCode("HTTPS", ret["HTTPS","stderr"]:"")) { + UI::SetFocus(`id(`https)); + return false; + } + } + } + + if (ret["FTP","tested"]:true == true) { + // curl error + if ((integer) ret["FTP","exit"]:1 != 0) { + // TRANSLATORS: Error popup message + ErrorPopupGeneric(_("An error occurred during the FTP proxy test."), ret["FTP","stderr"]:""); + UI::SetFocus(`id(`ftp)); + return false; + } else { + // curl works - proxy error + if (! TestProxyReturnCode("FTP", ret["FTP","stderr"]:"")) { + UI::SetFocus(`id(`ftp)); + return false; + } + } + } + + // Popup message + Popup::Message(_("Proxy settings work correctly.")); + } else { + // Actually it doesn't make sense to test the proxy settings when proxy is off + return true; + } +} + +void InitSameProxy() { + //We have the same (non-empty) proxy URL for all protocols + if((http != prefill) && (http == https) && (https == ftp )){ + UI::ChangeWidget(`id(`same_proxy), `Value, true); + UI::ChangeWidget(`id(`https), `Enabled, false); + UI::ChangeWidget(`id(`https), `Value, prefill); + UI::ChangeWidget(`id(`ftp), `Enabled, false); + UI::ChangeWidget(`id(`ftp), `Value, prefill); + } +} + +void QueryWidgets() { + same_proxy = (boolean) UI::QueryWidget(`id(`same_proxy), `Value); + http = (string) UI::QueryWidget(`id(`http), `Value); + if (same_proxy) { + https = http; + ftp = http; + } + else { + https = (string) UI::QueryWidget(`id(`https), `Value); + ftp = (string) UI::QueryWidget(`id(`ftp), `Value); + } + + user = (string) UI::QueryWidget(`id(`user), `Value); + pass = (string) UI::QueryWidget(`id(`pass), `Value); + enabled = (boolean) UI::QueryWidget(`id(`enabled), `Value); + + no = (string) UI::QueryWidget(`id(`no), `Value); + +} + +boolean ValidateNoProxyDomains( string no_proxies ) { + list <string> proxy_list = splitstring( no_proxies, ","); + boolean validate = true; + string hostname = ""; + string netmask = ""; + + foreach( string one_proxy, proxy_list, { + one_proxy = String::CutBlanks( one_proxy ); + + // IP/netmask + if ( findfirstof( one_proxy, "/" ) != nil ) { + list <string> tmp = splitstring(one_proxy,"/"); + hostname = tmp[0]:""; + netmask = tmp[1]:""; + + if (!Netmask::Check( netmask )) + validate = false; + } + // hostname or domain name + else { + hostname = one_proxy; + // .domain.name case + if ( findfirstof( hostname, ".") == 0) + hostname = substring(hostname, 1); + } + y2milestone("hostname %1, netmask %2", hostname, netmask); + + if (!Address::Check(hostname)) + validate = false; + }); + + return validate; +} + +boolean UrlContainPassword( string url) +{ + map ret = URL::Parse( url); + + return size( ret[ "pass"]:"") > 0 ; +} + +/** + * If modified, ask for confirmation + * @return true if abort is confirmed + */ +boolean ReallyAbortCond() { + return !modified() || Popup::ReallyAbort(true); +} + +/** + * Proxy dialog + * @param standalone true if not run from another ycp client + * @return dialog result + */ +define any ProxyMainDialog(boolean standalone) ``{ + + enabled = Proxy::enabled; + http = Proxy::http; + https = Proxy::https; + ftp = Proxy::ftp; + no = Proxy::no; + user = Proxy::user; + pass = Proxy::pass; + + if(http == "") http = prefill; + if(https == "") https = prefill; + if(ftp == "") ftp = prefill; + + /* Proxy dialog caption */ + string caption = _("Proxy Configuration"); + + /* Proxy dialog help 1/8 */ + string help = _("Configure your Internet proxy (caching) settings here. +Note: It is generally recommended to relogin for the settings to take effect, +however in some cases the application may pick up new settings immediately. Please check +what your application (web browser, ftp client,...) supports. ") + + + /* Proxy dialog help 2/8 */ + _("HTTP Proxy URL is the name of the proxy server for your access +to the World Wide Web (WWW). +") + + + /* Proxy dialog help 3/8 */ + _("HTTPS Proxy URL is the name of the proxy server for your secured access +to the World Wide Web (WWW). +") + + + /* Proxy dialog help 3.5/8 */ + _("Example: http://proxy.example.com:3128/") + + + /* Proxy dialog help 4/8 */ + + _("FTP Proxy URL is the name of the proxy server for your access +to the file transfer services (FTP).") + + + /* Proxy dialog help 5/8 */ + + _("If you check Use the Same Proxy for All Protocols, it is +enough to fill in the HTTP proxy URL. It will be used for all protocols +(HTTP, HTTPS and FTP). +") + + + /* Proxy dialog help 6/8 */ + + sformat (_("No Proxy Domains is a comma-separated list of domains +for which the requests should be made directly without caching, +for example, %1. +"), + "localhost, .intranet.example.com, www.example.com") + + + /* Proxy dialog help 7/8 */ + _("If you are using a proxy server with authorization, enter +the Proxy User Name and Proxy Password. A valid username +consists of printable ASCII characters only (except for quotation marks). +") + + + /* Proxy dialog help 8/8 */ + + (!Mode::installation() ? _("Press Test Proxy Settings to test +the current configuration for HTTP, HTTPS, and FTP proxy. +") : ""); + + map display_info = UI::GetDisplayInfo(); + boolean textmode = display_info["TextMode"]:false; + + float s = (textmode) ? (0.2) : 0.5; + + /* Proxy dialog contents */ + term contents = `HBox( + `HSpacing(5), + `VBox( + /* CheckBox entry label */ + `Left(`CheckBox(`id(`enabled), `opt(`notify), _("&Enable Proxy"), enabled)), + `VSpacing(s), + /* Frame label */ + `Frame(`id(`frame1), _("Proxy Settings"), `HBox(`HSpacing(2), `VBox( + `VSpacing(0.2), + /* Text entry label */ + `TextEntry(`id(`http), _("&HTTP Proxy URL"), http), + `VSpacing(0.2), + `TextEntry(`id(`https), _("HTTP&S Proxy URL"), https), + `VSpacing(0.2), + /* Text entry label */ + `TextEntry(`id(`ftp), _("F&TP Proxy URL"), ftp), + `VSpacing(0.2), + `Left(`CheckBox(`id(`same_proxy), `opt(`notify), _("Us&e the Same Proxy for All Protocols"))), + /* Text entry label */ + // domains without proxying + `TextEntry(`id(`no), _("No Proxy &Domains"), no), + (textmode) ? `Empty() : `VSpacing(0.4) + ), `HSpacing(2))), + `VSpacing(s), + `Frame(`id(`frame2), _("Proxy Authentication"), `HBox(`HSpacing(2), `VBox( + /* Text entry label */ + `HBox ( + `InputField(`id(`user), `opt(`hstretch), _("Proxy &User Name"), user), + `HSpacing(0.5), + /* Password entry label */ + `Password( `id(`pass), `opt(`hstretch), _("Proxy &Password"), pass), + (textmode) ? `Empty() : `VSpacing(0.4) + )), `HSpacing(2))), + `VSpacing(s), + /* Test Proxy Settings - push button */ + (!Mode::installation()) ? + `PushButton(`id("test_proxy"), _("Test Pr&oxy Settings")): `Empty() + ), + `HSpacing(5) + ); + +// if(standalone == true) + Wizard::SetContentsButtons(caption, contents, help, + Label::BackButton(), Label::FinishButton()); + Wizard::SetNextButton(`next, Label::OKButton()); + Wizard::SetAbortButton(`abort, Label::CancelButton()); + Wizard::HideBackButton(); +/* + else + Wizard::SetContentsButtons(caption, contents, help, + Label::BackButton(), Label::OKButton()); +*/ + + // #103841, relaxed. now avoiding only quotes + // #337048 allow using space as well + // was CAlnum() + ".:_-/\\" + string ValidCharsUsername = deletechars (String::CGraph (), "'\"") + " "; + UI::ChangeWidget(`id(`http), `ValidChars, URL::ValidChars); + UI::ChangeWidget(`id(`https), `ValidChars, URL::ValidChars); + UI::ChangeWidget(`id(`ftp), `ValidChars, URL::ValidChars); + // '/' character for subnets definition - #490661 + UI::ChangeWidget(`id(`no), `ValidChars, Hostname::ValidCharsDomain + " ,/"); + UI::ChangeWidget(`id(`user), `ValidChars, ValidCharsUsername); + UI::ChangeWidget(`id(`frame1), `Enabled, enabled); + UI::ChangeWidget(`id(`frame2), `Enabled, enabled); + if ( !Mode::installation() ) + UI::ChangeWidget(`id("test_proxy"), `Enabled, enabled) ; + InitSameProxy(); + + if(enabled == true) UI::SetFocus(`id(`http)); + else UI::SetFocus(`id(`enabled)); + + any ret = nil; + while(true) { + + ret = UI::UserInput(); + QueryWidgets(); + + /* abort? */ + if(ret == `abort || ret == `cancel || ret == `back) { + if(ReallyAbortCond()) break; + else continue; + } + if(ret == `enabled) { + UI::ChangeWidget(`id(`frame1), `Enabled, enabled); + UI::ChangeWidget(`id(`frame2), `Enabled,enabled); + UI::ChangeWidget(`id("test_proxy"), `Enabled, enabled); + InitSameProxy(); + continue; + } + else if(ret == `same_proxy) { + UI::ChangeWidget(`id(`https), `Value, prefill); + UI::ChangeWidget(`id(`ftp), `Value, prefill); + UI::ChangeWidget(`id(`https), `Enabled, !same_proxy); + UI::ChangeWidget(`id(`ftp), `Enabled, !same_proxy); + continue; + } + /* next */ + else if (ret == `next || ret == "test_proxy") { + + if(http == prefill) http = ""; + if(https == prefill) https = ""; + if(ftp == prefill) ftp = ""; + + if(enabled == false) + break; + if((http == "") && (https == "") && (ftp == "") ){ + /* Popup error text - http, https and ftp proxy URLs are blank */ + if(!Popup::ContinueCancel(_("Proxy is enabled, but no proxy URL has been specified. +Really use these settings?"))) + continue; + } + // bnc#694582 - username and password in URL + else + { + boolean password_inside = UrlContainPassword( http) || + UrlContainPassword( https) || + UrlContainPassword( ftp); + + if( (password_inside) && ( ret != "test_proxy")) + { + if(!Popup::ContinueCancel(_("Security warning: +Username and password will be stored unencrypted +in a worldwide readable plaintext file. +Really use these settings?"))) + continue; + } + } + /* check_* */ + if(user == "" && pass != "") { + /* Popup::Error text */ + Popup::Error(_("You cannot enter a password and leave the user name empty.")); + UI::SetFocus(`id(`user)); + continue; + } + if(http != "" && http != prefill) { + if(!URL::Check(http)) { + /* Popup::Error text */ + Popup::Error(_("HTTP proxy URL is invalid.")); + UI::SetFocus(`id(`http)); + continue; + } + map urlmap = URL::Parse(http); + if(urlmap["scheme"]:"" == "") { + /* Popup::Error text */ + Popup::Error(_("HTTP proxy URL must contain a scheme specification (http).")); + UI::SetFocus(`id(`http)); + continue; + } + } + if(https != "" && https != prefill) { + if(!URL::Check(https)) { + /* Popup::Error text */ + Popup::Error(_("The HTTPS proxy URL is invalid.")); + UI::SetFocus(`id(`https)); + continue; + } + map urlmap = URL::Parse(https); + if(urlmap["scheme"]:"" == "") { + /* Popup::Error text */ + Popup::Error(_("The HTTPS proxy URL must contain a scheme specification (http).")); + UI::SetFocus(`id(`https)); + continue; + } + } + if(ftp != "" && ftp != prefill) { + if(!URL::Check(ftp)) { + /* Popup::Error text */ + Popup::Error(_("FTP proxy URL is invalid.")); + UI::SetFocus(`id(`ftp)); + continue; + } + map urlmap = URL::Parse(ftp); + if(urlmap["scheme"]:"" == "") { + /* Popup::Error text */ + Popup::Error(_("FTP proxy URL must contain a scheme specification (http).")); + UI::SetFocus(`id(`ftp)); + continue; + } + } + if ( no != "" && no != nil) { + if (!ValidateNoProxyDomains( no )) { + //Translators: no proxy domain is a domain that can be accessed without proxy + Popup::Error(_("One or more no proxy domains are invalid. +Check if all domains match one of the following: +* IP address +* IP address/netmask +* Fully qualified hostname +* Domain name prefixed by '.'")); + UI::SetFocus(`id(`no)); + continue; + } + } + + if (ret == `next) { + break; + } else if (ret == "test_proxy") { + TestProxySettings(); + } + } + /* back */ + else if(ret == `back) { + break; + } + else { + y2error("unexpected retcode: %1", ret); + continue; + } + } + + if(ret == `next) { + + if (!modified()){ + + y2debug("not modified"); + return ret; + } + + + Proxy::enabled = enabled; + if(enabled) { + Proxy::http = http; + Proxy::https = https; + Proxy::ftp = ftp; + Proxy::no = no; + Proxy::user = user; + Proxy::pass = pass; + } + + Proxy::SetModified(); + } + + return ret; +} + +/* EOF */ +} -- 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 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package yast2-network for openSUSE:Factory checked in at 2012-04-23 16:14:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-network (Old) and /work/SRC/openSUSE:Factory/.yast2-network.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-network", Maintainer is "mvidner(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-network/yast2-network.changes 2012-04-12 09:58:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-network.new/yast2-network.changes 2012-04-23 16:14:25.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 11 11:13:51 CEST 2012 - mvidner(a)suse.cz + +- Fixed a dead reference to proxy code; moved a forgotten file. +- 2.22.7 + +------------------------------------------------------------------- Old: ---- yast2-network-2.22.6.tar.bz2 New: ---- yast2-network-2.22.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.SHQe8f/_old 2012-04-23 16:14:27.000000000 +0200 +++ /var/tmp/diff_new_pack.SHQe8f/_new 2012-04-23 16:14:27.000000000 +0200 @@ -16,22 +16,22 @@ # - Name: yast2-network -Version: 2.22.6 +Version: 2.22.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-network-%{version}.tar.bz2 -Group: System/YaST -License: GPL-2.0+ # should be required by devtools -BuildRequires: perl-XML-Writer pkgconfig rpm +BuildRequires: perl-XML-Writer +BuildRequires: pkgconfig +BuildRequires: rpm BuildRequires: update-desktop-files -BuildRequires: yast2-devtools yast2-testsuite BuildRequires: yast2-country +BuildRequires: yast2-devtools BuildRequires: yast2-installation >= 2.15.27 +BuildRequires: yast2-testsuite # NetworkInterfaces::Write should write ifcfgs only once # Wizard::SetDesktopTitleAndIcon @@ -49,23 +49,16 @@ PreReq: /bin/rm -Provides: y2c_lan y2c_dial yast2-config-adsl y2c_adsl -Obsoletes: y2c_lan y2c_dial yast2-config-adsl y2c_adsl -Provides: yast2-lib-network yast2-config-network -Obsoletes: yast2-lib-network yast2-config-network -Provides: yast2-trans-network yast2-trans-adsl -Obsoletes: yast2-trans-network yast2-trans-adsl -Provides: y2t_lan y2t_adsl y2t_dial -Obsoletes: y2t_lan y2t_adsl y2t_dial - # carrier detection Conflicts: yast2-core < 2.10.6 Summary: YaST2 - Network Configuration +License: GPL-2.0+ +Group: System/YaST %package devel-doc -Group: System/YaST Summary: YaST2 - Developer documentation for yast2-network +Group: System/YaST %description This package contains the YaST2 component for network configuration. ++++++ yast2-network-2.22.6.tar.bz2 -> yast2-network-2.22.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.22.6/VERSION new/yast2-network-2.22.7/VERSION --- old/yast2-network-2.22.6/VERSION 2012-04-10 15:47:55.000000000 +0200 +++ new/yast2-network-2.22.7/VERSION 2012-04-23 11:30:22.000000000 +0200 @@ -1 +1 @@ -2.22.6 +2.22.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.22.6/configure new/yast2-network-2.22.7/configure --- old/yast2-network-2.22.6/configure 2012-04-10 15:47:58.000000000 +0200 +++ new/yast2-network-2.22.7/configure 2012-04-23 11:30:24.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for yast2-network 2.22.6. +# Generated by GNU Autoconf 2.68 for yast2-network 2.22.7. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-network' PACKAGE_TARNAME='yast2-network' -PACKAGE_VERSION='2.22.6' -PACKAGE_STRING='yast2-network 2.22.6' +PACKAGE_VERSION='2.22.7' +PACKAGE_STRING='yast2-network 2.22.7' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1229,7 +1229,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-network 2.22.6 to adapt to many kinds of systems. +\`configure' configures yast2-network 2.22.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1300,7 +1300,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-network 2.22.6:";; + short | recursive ) echo "Configuration of yast2-network 2.22.7:";; esac cat <<\_ACEOF @@ -1380,7 +1380,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-network configure 2.22.6 +yast2-network configure 2.22.7 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1397,7 +1397,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-network $as_me 2.22.6, which was +It was created by yast2-network $as_me 2.22.7, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2327,7 +2327,7 @@ # Define the identity of the package. PACKAGE='yast2-network' - VERSION='2.22.6' + VERSION='2.22.7' cat >>confdefs.h <<_ACEOF @@ -2449,7 +2449,7 @@ -VERSION="2.22.6" +VERSION="2.22.7" RPMNAME="yast2-network" MAINTAINER="Martin Vidner <mvidner(a)suse.cz>" @@ -3379,7 +3379,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-network $as_me 2.22.6, which was +This file was extended by yast2-network $as_me 2.22.7, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3432,7 +3432,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-network config.status 2.22.6 +yast2-network config.status 2.22.7 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.22.6/configure.in new/yast2-network-2.22.7/configure.in --- old/yast2-network-2.22.6/configure.in 2012-04-10 15:47:56.000000000 +0200 +++ new/yast2-network-2.22.7/configure.in 2012-04-23 11:30:22.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.21.7 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-network, 2.22.6, http://bugs.opensuse.org/, yast2-network) +AC_INIT(yast2-network, 2.22.7, http://bugs.opensuse.org/, yast2-network) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.22.6" +VERSION="2.22.7" RPMNAME="yast2-network" MAINTAINER="Martin Vidner <mvidner(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.22.6/src/lan/wizards.ycp new/yast2-network-2.22.7/src/lan/wizards.ycp --- old/yast2-network-2.22.6/src/lan/wizards.ycp 2012-04-10 15:47:53.000000000 +0200 +++ new/yast2-network-2.22.7/src/lan/wizards.ycp 2012-04-23 11:30:21.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Network cards configuration wizards * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: wizards.ycp 65909 2011-09-22 09:25:27Z visnov $ + * $Id: wizards.ycp 67911 2012-04-11 09:21:56Z mvidner $ */ { @@ -25,7 +25,6 @@ include "network/lan/wireless.ycp"; include "network/services/dns.ycp"; include "network/services/host.ycp"; -include "network/services/proxy.ycp"; define symbol NetworkCardSequence(string action); define symbol MainSequence(string mode); @@ -189,7 +188,6 @@ // "changedefaults": [ ``(ChangeDefaults()), true ], "address" : ``(AddressDialog()), "hosts" : ``(HostsMainDialog(false)), - "proxy" : ``(ProxyMainDialog(false)), "s390" : ``(S390Dialog()), "wire" : ``(WirelessDialog()), "expert" : ``(WirelessExpertDialog()), @@ -212,7 +210,6 @@ `next : "commit", `wire : "wire", `hosts : "hosts", - `proxy : "proxy", `s390 : "s390", `hardware : `hardware, ], @@ -224,10 +221,6 @@ `abort : `abort, `next : "address", ], - "proxy" : $[ - `abort : `abort, - `next : "address", - ], "wire" : $[ `next : "commit", `expert : "expert", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.22.6/src/services/proxy.ycp new/yast2-network-2.22.7/src/services/proxy.ycp --- old/yast2-network-2.22.6/src/services/proxy.ycp 2012-04-10 15:47:50.000000000 +0200 +++ new/yast2-network-2.22.7/src/services/proxy.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,663 +0,0 @@ -/** - * File: include/network/services/proxy.ycp - * Package: Network configuration - * Summary: Proxy configuration - * Authors: Michal Svec <msvec(a)suse.cz> - * - * $Id: proxy.ycp 67787 2012-03-29 13:26:58Z jsuchome $ - */ - -{ - -textdomain "network"; - -import "Address"; -import "Hostname"; -import "Label"; -import "Mode"; -import "Netmask"; -import "Popup"; -import "Proxy"; -import "String"; -import "URL"; -import "Wizard"; - -include "network/routines.ycp"; - -boolean enabled = false; -string http = ""; -string https = ""; -string ftp = ""; -string no = ""; -string user = ""; -string pass = ""; -boolean same_proxy = false; -/* String to pre-filled into the proxy server field */ -string prefill = "http://"; - - -// from OnlineUpdateDialogs.ycp -/** - * Function opens the generic error dialog including the - * message with the [Details >>] button. It handles pressing - * the button itself. - * - * @param string message with the short error message - * @param string details with all of the error details - */ - -boolean modified() { - return !(Proxy::http == http && Proxy::ftp == ftp && Proxy::no == no && - Proxy::https == https && - Proxy::user == user && Proxy::pass == pass && - Proxy::enabled == enabled); -} - -define void ErrorPopupGeneric( string message, string details ) { - // Informative label - if ( size( details ) == 0 ) details = _("No details available."); - - // A push button - string detailsStringOn = _("&Details <<"); - // A push button - string detailsStringOff = _("&Details >>"); - - term detailsButton = `PushButton( `id( `details ), detailsStringOff ); - - string heading = Label::ErrorMsg (); - - term buttons = `HBox( - detailsButton, - `PushButton( `id( `ok ), Label::OKButton() ) - ); - - UI::OpenDialog( `opt( `decorated ), - `VBox( - `HBox( `HSpacing( 0.5 ), `Left( `Heading( heading ) ) ), - `VSpacing( 0.2 ), - `Left(`Label( message )), - `ReplacePoint( `id( `rp ), `Empty() ), - buttons - ) - ); - - any ret = nil; - boolean showDetails = false; - - while( ret != `ok ) { - ret = UI::UserInput(); - - if ( ret == `details ) { - if ( showDetails ) { - UI::ReplaceWidget( `id( `rp ), `Empty() ); - UI::ChangeWidget( `id( `details ), `Label, detailsStringOff ); - } else { - UI::ReplaceWidget( `id( `rp ), `HBox( `HSpacing( 0.5 ), - `HWeight( 1, `RichText(`opt(`plainText), details ) ), - `HSpacing( 0.5 ) ) - ); - UI::ChangeWidget( `id( `details ), `Label, detailsStringOn ); - } - showDetails = !showDetails; - } - } - - UI::CloseDialog(); -} - -/* Known return codes - good proxy response */ -list <string> return_codes_good = [ - "200", // OK - "201", // Created - "202", // Accepted - "203", // Non-Authorative Information - "204", // No Content - "205", // Reset Content - "206", // Partial Content - - "300", // Multiple Choices - "301", // Moved Permanently - "302", // Moved Temporarily - "303", // See Other - "304", // Not Modified - "305", // Use Proxy -]; - -/* Known return codes - bad proxy response */ -list <string> return_codes_bad = [ - // Proxy Errors - "400", // Bad Request - "401", // Authorization Required - "402", // Payment Required (not used yet) - "403", // Forbidden - "404", // Not Found - "405", // Method Not Allowed - "406", // Not Acceptable (encoding) - "407", // Proxy Authentication Required - "408", // Request Timed Out - "409", // Conflicting Request - "410", // Gone - "411", // Content Length Required - "412", // Precondition Failed - "413", // Request Entity Too Long - "414", // Request URI Too Long - "415", // Unsupported Media Type - - // Server Errors - "500", // Internal Server Error - "501", // Not Implemented - "502", // Bad Gateway - "503", // Service Unavailable - "504", // Gateway Timeout - "505", // HTTP Version Not Supported -]; - -/** - * Function checks the proxy-return code. - * - * @param string test_type HTTP, HTTPS or FTP - * @param string proxy_ret_stderr such as "HTTP/1.0 403 Forbidden" - * @return boolean true if the proxy response is a good one - */ -define boolean TestProxyReturnCode (string test_type, string proxy_ret_stderr) { - string proxy_retcode = ""; - // getting the return code string from the stderr - foreach (string proxy_stderr, splitstring(proxy_ret_stderr, "\r?\n"), { - if (regexpmatch(proxy_stderr, "HTTP/[0-9\.]+ [0-9]+")) { - proxy_retcode = regexpsub(proxy_stderr, ".*(HTTP.*)", "\\1"); - } - }); - - y2milestone("Proxy %1 test: %2", test_type, proxy_retcode); - - // The default error code, replaced with the current error code got from proxy if any code found - string retcode = _("Unknown Error Code"); - foreach(string ret_code_part, splitstring(proxy_retcode, " "), { - if (regexpmatch(ret_code_part, "^[0-9]+$") && size(ret_code_part)>=3) { - retcode = ret_code_part; - } - }); - - // known good return code - if (contains(return_codes_good, retcode)) { - return true; - // known bad return code - } else if (contains(return_codes_bad, retcode)) { - // Error message, - // %1 is a string "HTTP", "HTTPS" or "FTP" - // %2 is an error string such as "HTTP/1.0 403 Forbidden" - ErrorPopupGeneric(sformat(_("An error occurred during the %1 proxy test. -Proxy return code: %2. -"), test_type, proxy_retcode), proxy_ret_stderr); - return false; - - } else { - // Unknown return code, - // %1 is the string HTTP, "HTTPS" or FTP, - // %2 is an error string such as "HTTP/1.0 403 Forbidden" - ErrorPopupGeneric(sformat(_("An unknown error occurred during the %1 proxy test. -Proxy return code: %2. -"), test_type, proxy_retcode), proxy_ret_stderr); - } -} - -/** - * Function test the current HTTP and FTP proxy settings. - * It currently ignores the "No Proxy" value. - * - * @return boolean true if successful - */ -define boolean TestProxySettings () { - if (enabled) { - UI::OpenDialog( - // An informative popup label diring the proxy testings - `Left(`Label(_("Testing the current proxy settings..."))) - ); - map <string, map <string, any> > ret = Proxy::RunTestProxy (http, https, ftp, user, pass); - UI::CloseDialog(); - - // curl error - if (ret["HTTP","tested"]:true == true) { - if ((integer) ret["HTTP","exit"]:1 != 0) { - // TRANSLATORS: Error popup message - ErrorPopupGeneric(_("An error occurred during the HTTP proxy test."), ret["HTTP","stderr"]:""); - UI::SetFocus(`id(`http)); - return false; - } else { - // curl works - proxy error - if (! TestProxyReturnCode("HTTP", ret["HTTP","stderr"]:"")) { - UI::SetFocus(`id(`http)); - return false; - } - } - } - - if (ret["HTTPS","tested"]:true == true) { - // curl error - if ((integer) ret["HTTPS","exit"]:1 != 0) { - // TRANSLATORS: Error popup message - ErrorPopupGeneric(_("An error occurred during the HTTPS proxy test."), ret["HTTPS","stderr"]:""); - UI::SetFocus(`id(`https)); - return false; - } else { - // curl works - proxy error - if (! TestProxyReturnCode("HTTPS", ret["HTTPS","stderr"]:"")) { - UI::SetFocus(`id(`https)); - return false; - } - } - } - - if (ret["FTP","tested"]:true == true) { - // curl error - if ((integer) ret["FTP","exit"]:1 != 0) { - // TRANSLATORS: Error popup message - ErrorPopupGeneric(_("An error occurred during the FTP proxy test."), ret["FTP","stderr"]:""); - UI::SetFocus(`id(`ftp)); - return false; - } else { - // curl works - proxy error - if (! TestProxyReturnCode("FTP", ret["FTP","stderr"]:"")) { - UI::SetFocus(`id(`ftp)); - return false; - } - } - } - - // Popup message - Popup::Message(_("Proxy settings work correctly.")); - } else { - // Actually it doesn't make sense to test the proxy settings when proxy is off - return true; - } -} - -void InitSameProxy() { - //We have the same (non-empty) proxy URL for all protocols - if((http != prefill) && (http == https) && (https == ftp )){ - UI::ChangeWidget(`id(`same_proxy), `Value, true); - UI::ChangeWidget(`id(`https), `Enabled, false); - UI::ChangeWidget(`id(`https), `Value, prefill); - UI::ChangeWidget(`id(`ftp), `Enabled, false); - UI::ChangeWidget(`id(`ftp), `Value, prefill); - } -} - -void QueryWidgets() { - same_proxy = (boolean) UI::QueryWidget(`id(`same_proxy), `Value); - http = (string) UI::QueryWidget(`id(`http), `Value); - if (same_proxy) { - https = http; - ftp = http; - } - else { - https = (string) UI::QueryWidget(`id(`https), `Value); - ftp = (string) UI::QueryWidget(`id(`ftp), `Value); - } - - user = (string) UI::QueryWidget(`id(`user), `Value); - pass = (string) UI::QueryWidget(`id(`pass), `Value); - enabled = (boolean) UI::QueryWidget(`id(`enabled), `Value); - - no = (string) UI::QueryWidget(`id(`no), `Value); - -} - -boolean ValidateNoProxyDomains( string no_proxies ) { - list <string> proxy_list = splitstring( no_proxies, ","); - boolean validate = true; - string hostname = ""; - string netmask = ""; - - foreach( string one_proxy, proxy_list, { - one_proxy = String::CutBlanks( one_proxy ); - - // IP/netmask - if ( findfirstof( one_proxy, "/" ) != nil ) { - list <string> tmp = splitstring(one_proxy,"/"); - hostname = tmp[0]:""; - netmask = tmp[1]:""; - - if (!Netmask::Check( netmask )) - validate = false; - } - // hostname or domain name - else { - hostname = one_proxy; - // .domain.name case - if ( findfirstof( hostname, ".") == 0) - hostname = substring(hostname, 1); - } - y2milestone("hostname %1, netmask %2", hostname, netmask); - - if (!Address::Check(hostname)) - validate = false; - }); - - return validate; -} - -boolean UrlContainPassword( string url) -{ - map ret = URL::Parse( url); - - return size( ret[ "pass"]:"") > 0 ; -} -/** - * Proxy dialog - * @param standalone true if not run from another ycp client - * @return dialog result - */ -define any ProxyMainDialog(boolean standalone) ``{ - - enabled = Proxy::enabled; - http = Proxy::http; - https = Proxy::https; - ftp = Proxy::ftp; - no = Proxy::no; - user = Proxy::user; - pass = Proxy::pass; - - ScreenName("proxy"); - - if(http == "") http = prefill; - if(https == "") https = prefill; - if(ftp == "") ftp = prefill; - - /* Proxy dialog caption */ - string caption = _("Proxy Configuration"); - - /* Proxy dialog help 1/8 */ - string help = _("Configure your Internet proxy (caching) settings here. -Note: It is generally recommended to relogin for the settings to take effect, -however in some cases the application may pick up new settings immediately. Please check -what your application (web browser, ftp client,...) supports. ") + - - /* Proxy dialog help 2/8 */ - _("HTTP Proxy URL is the name of the proxy server for your access -to the World Wide Web (WWW). -") + - - /* Proxy dialog help 3/8 */ - _("HTTPS Proxy URL is the name of the proxy server for your secured access -to the World Wide Web (WWW). -") + - - /* Proxy dialog help 3.5/8 */ - _("Example: http://proxy.example.com:3128/") + - - /* Proxy dialog help 4/8 */ - - _("FTP Proxy URL is the name of the proxy server for your access -to the file transfer services (FTP).") + - - /* Proxy dialog help 5/8 */ - - _("If you check Use the Same Proxy for All Protocols, it is -enough to fill in the HTTP proxy URL. It will be used for all protocols -(HTTP, HTTPS and FTP). -") + - - /* Proxy dialog help 6/8 */ - - sformat (_("No Proxy Domains is a comma-separated list of domains -for which the requests should be made directly without caching, -for example, %1. -"), - "localhost, .intranet.example.com, www.example.com") + - - /* Proxy dialog help 7/8 */ - _("If you are using a proxy server with authorization, enter -the Proxy User Name and Proxy Password. A valid username -consists of printable ASCII characters only (except for quotation marks). -") + - - /* Proxy dialog help 8/8 */ - - (!Mode::installation() ? _("Press Test Proxy Settings to test -the current configuration for HTTP, HTTPS, and FTP proxy. -") : ""); - - map display_info = UI::GetDisplayInfo(); - boolean textmode = display_info["TextMode"]:false; - - float s = (textmode) ? (0.2) : 0.5; - - /* Proxy dialog contents */ - term contents = `HBox( - `HSpacing(5), - `VBox( - /* CheckBox entry label */ - `Left(`CheckBox(`id(`enabled), `opt(`notify), _("&Enable Proxy"), enabled)), - `VSpacing(s), - /* Frame label */ - `Frame(`id(`frame1), _("Proxy Settings"), `HBox(`HSpacing(2), `VBox( - `VSpacing(0.2), - /* Text entry label */ - `TextEntry(`id(`http), _("&HTTP Proxy URL"), http), - `VSpacing(0.2), - `TextEntry(`id(`https), _("HTTP&S Proxy URL"), https), - `VSpacing(0.2), - /* Text entry label */ - `TextEntry(`id(`ftp), _("F&TP Proxy URL"), ftp), - `VSpacing(0.2), - `Left(`CheckBox(`id(`same_proxy), `opt(`notify), _("Us&e the Same Proxy for All Protocols"))), - /* Text entry label */ - // domains without proxying - `TextEntry(`id(`no), _("No Proxy &Domains"), no), - (textmode) ? `Empty() : `VSpacing(0.4) - ), `HSpacing(2))), - `VSpacing(s), - `Frame(`id(`frame2), _("Proxy Authentication"), `HBox(`HSpacing(2), `VBox( - /* Text entry label */ - `HBox ( - `InputField(`id(`user), `opt(`hstretch), _("Proxy &User Name"), user), - `HSpacing(0.5), - /* Password entry label */ - `Password( `id(`pass), `opt(`hstretch), _("Proxy &Password"), pass), - (textmode) ? `Empty() : `VSpacing(0.4) - )), `HSpacing(2))), - `VSpacing(s), - /* Test Proxy Settings - push button */ - (!Mode::installation()) ? - `PushButton(`id("test_proxy"), _("Test Pr&oxy Settings")): `Empty() - ), - `HSpacing(5) - ); - -// if(standalone == true) - Wizard::SetContentsButtons(caption, contents, help, - Label::BackButton(), Label::FinishButton()); - Wizard::SetNextButton(`next, Label::OKButton()); - Wizard::SetAbortButton(`abort, Label::CancelButton()); - Wizard::HideBackButton(); -/* - else - Wizard::SetContentsButtons(caption, contents, help, - Label::BackButton(), Label::OKButton()); -*/ - - // #103841, relaxed. now avoiding only quotes - // #337048 allow using space as well - // was CAlnum() + ".:_-/\\" - string ValidCharsUsername = deletechars (String::CGraph (), "'\"") + " "; - UI::ChangeWidget(`id(`http), `ValidChars, URL::ValidChars); - UI::ChangeWidget(`id(`https), `ValidChars, URL::ValidChars); - UI::ChangeWidget(`id(`ftp), `ValidChars, URL::ValidChars); - // '/' character for subnets definition - #490661 - UI::ChangeWidget(`id(`no), `ValidChars, Hostname::ValidCharsDomain + " ,/"); - UI::ChangeWidget(`id(`user), `ValidChars, ValidCharsUsername); - UI::ChangeWidget(`id(`frame1), `Enabled, enabled); - UI::ChangeWidget(`id(`frame2), `Enabled, enabled); - if ( !Mode::installation() ) - UI::ChangeWidget(`id("test_proxy"), `Enabled, enabled) ; - InitSameProxy(); - - if(enabled == true) UI::SetFocus(`id(`http)); - else UI::SetFocus(`id(`enabled)); - - any ret = nil; - while(true) { - - ret = UI::UserInput(); - QueryWidgets(); - - /* abort? */ - if(ret == `abort || ret == `cancel || ret == `back) { - if(ReallyAbortCond( modified() )) break; - else continue; - } - if(ret == `enabled) { - UI::ChangeWidget(`id(`frame1), `Enabled, enabled); - UI::ChangeWidget(`id(`frame2), `Enabled,enabled); - UI::ChangeWidget(`id("test_proxy"), `Enabled, enabled); - InitSameProxy(); - continue; - } - else if(ret == `same_proxy) { - UI::ChangeWidget(`id(`https), `Value, prefill); - UI::ChangeWidget(`id(`ftp), `Value, prefill); - UI::ChangeWidget(`id(`https), `Enabled, !same_proxy); - UI::ChangeWidget(`id(`ftp), `Enabled, !same_proxy); - continue; - } - /* next */ - else if (ret == `next || ret == "test_proxy") { - - if(http == prefill) http = ""; - if(https == prefill) https = ""; - if(ftp == prefill) ftp = ""; - - if(enabled == false) - break; - if((http == "") && (https == "") && (ftp == "") ){ - /* Popup error text - http, https and ftp proxy URLs are blank */ - if(!Popup::ContinueCancel(_("Proxy is enabled, but no proxy URL has been specified. -Really use these settings?"))) - continue; - } - // bnc#694582 - username and password in URL - else - { - boolean password_inside = UrlContainPassword( http) || - UrlContainPassword( https) || - UrlContainPassword( ftp); - - if( (password_inside) && ( ret != "test_proxy")) - { - if(!Popup::ContinueCancel(_("Security warning: -Username and password will be stored unencrypted -in a worldwide readable plaintext file. -Really use these settings?"))) - continue; - } - } - /* check_* */ - if(user == "" && pass != "") { - /* Popup::Error text */ - Popup::Error(_("You cannot enter a password and leave the user name empty.")); - UI::SetFocus(`id(`user)); - continue; - } - if(http != "" && http != prefill) { - if(!URL::Check(http)) { - /* Popup::Error text */ - Popup::Error(_("HTTP proxy URL is invalid.")); - UI::SetFocus(`id(`http)); - continue; - } - map urlmap = URL::Parse(http); - if(urlmap["scheme"]:"" == "") { - /* Popup::Error text */ - Popup::Error(_("HTTP proxy URL must contain a scheme specification (http).")); - UI::SetFocus(`id(`http)); - continue; - } - } - if(https != "" && https != prefill) { - if(!URL::Check(https)) { - /* Popup::Error text */ - Popup::Error(_("The HTTPS proxy URL is invalid.")); - UI::SetFocus(`id(`https)); - continue; - } - map urlmap = URL::Parse(https); - if(urlmap["scheme"]:"" == "") { - /* Popup::Error text */ - Popup::Error(_("The HTTPS proxy URL must contain a scheme specification (http).")); - UI::SetFocus(`id(`https)); - continue; - } - } - if(ftp != "" && ftp != prefill) { - if(!URL::Check(ftp)) { - /* Popup::Error text */ - Popup::Error(_("FTP proxy URL is invalid.")); - UI::SetFocus(`id(`ftp)); - continue; - } - map urlmap = URL::Parse(ftp); - if(urlmap["scheme"]:"" == "") { - /* Popup::Error text */ - Popup::Error(_("FTP proxy URL must contain a scheme specification (http).")); - UI::SetFocus(`id(`ftp)); - continue; - } - } - if ( no != "" && no != nil) { - if (!ValidateNoProxyDomains( no )) { - //Translators: no proxy domain is a domain that can be accessed without proxy - Popup::Error(_("One or more no proxy domains are invalid. -Check if all domains match one of the following: -* IP address -* IP address/netmask -* Fully qualified hostname -* Domain name prefixed by '.'")); - UI::SetFocus(`id(`no)); - continue; - } - } - - if (ret == `next) { - break; - } else if (ret == "test_proxy") { - TestProxySettings(); - } - } - /* back */ - else if(ret == `back) { - break; - } - else { - y2error("unexpected retcode: %1", ret); - continue; - } - } - - if(ret == `next) { - - if (!modified()){ - - y2debug("not modified"); - return ret; - } - - - Proxy::enabled = enabled; - if(enabled) { - Proxy::http = http; - Proxy::https = https; - Proxy::ftp = ftp; - Proxy::no = no; - Proxy::user = user; - Proxy::pass = pass; - } - - Proxy::SetModified(); - } - - return ret; -} - -/* EOF */ -} -- 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-bootloader for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2012-04-23 16:14:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old) and /work/SRC/openSUSE:Factory/.yast2-bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-bootloader", Maintainer is "snwint(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes 2012-04-02 10:32:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2012-04-23 16:14:22.000000000 +0200 @@ -1,0 +2,18 @@ +Mon Apr 23 12:40:24 CEST 2012 - mchang(a)suse.com + +- add "Boot Loader Options" dialog for grub2-efi that provides widgets for + manipulating global options. These options include timeout, vgamode, + append and default. +- add widgets for enabling serial console and specify it's arguments on + "Boot Loader Options" dialog. +- add "Boot Loader Options" dialog for grub2 that provides widgets for + manipulating global options. These options include activate, generic_mbr, + timeout, vgamode, append and default. +- 2.23.2 + +------------------------------------------------------------------- +Mon Apr 23 11:35:06 CEST 2012 - snwint(a)suse.de + +- adapted ssh command for 2nd stage ssh installation (bnc#745340) + +------------------------------------------------------------------- Old: ---- yast2-bootloader-2.23.1.tar.bz2 New: ---- yast2-bootloader-2.23.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.0b5VWw/_old 2012-04-23 16:14:24.000000000 +0200 +++ /var/tmp/diff_new_pack.0b5VWw/_new 2012-04-23 16:14:24.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 2.23.1 +Version: 2.23.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-bootloader-2.23.1.tar.bz2 -> yast2-bootloader-2.23.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.1/VERSION new/yast2-bootloader-2.23.2/VERSION --- old/yast2-bootloader-2.23.1/VERSION 2012-03-30 13:06:02.000000000 +0200 +++ new/yast2-bootloader-2.23.2/VERSION 2012-04-23 12:40:21.000000000 +0200 @@ -1 +1 @@ -2.23.1 +2.23.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.1/src/clients/bootloader_finish.ycp new/yast2-bootloader-2.23.2/src/clients/bootloader_finish.ycp --- old/yast2-bootloader-2.23.1/src/clients/bootloader_finish.ycp 2012-03-30 12:09:08.000000000 +0200 +++ new/yast2-bootloader-2.23.2/src/clients/bootloader_finish.ycp 2012-04-23 11:33:44.000000000 +0200 @@ -9,7 +9,7 @@ * Jiri Srain <jsrain(a)suse.cz> * Olaf Dabrunz <od(a)suse.de> * - * $Id: bootloader_finish.ycp 67632 2012-03-15 09:29:51Z aschnell $ + * $Id: bootloader_finish.ycp 67934 2012-04-13 13:36:57Z aschnell $ * */ @@ -151,9 +151,9 @@ // and we're ready to start (boot into) the installed system // Message that will be displayed along with information // how the boot loader was installed - Misc::boot_msg = _("The system will reboot now. + Misc::boot_msg = sformat(_("The system will reboot now. After reboot, reconnect and run the following: -/usr/lib/YaST2/startup/YaST2.ssh"); +%1"), "yast.ssh"); else // Final message after all packages from CD1 are installed // and we're ready to start (boot into) the installed system diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.1/src/grub2/Makefile.am new/yast2-bootloader-2.23.2/src/grub2/Makefile.am --- old/yast2-bootloader-2.23.1/src/grub2/Makefile.am 2012-03-05 15:09:25.000000000 +0100 +++ new/yast2-bootloader-2.23.2/src/grub2/Makefile.am 2012-04-23 11:44:51.000000000 +0200 @@ -4,8 +4,10 @@ yncludedir = @yncludedir@/bootloader/grub2 -ynclude_DATA = \ - dialogs.ycp +ynclude_DATA = \ + dialogs.ycp \ + options.ycp \ + helps.ycp EXTRA_DIST = \ $(ynclude_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.1/src/grub2/Makefile.in new/yast2-bootloader-2.23.2/src/grub2/Makefile.in --- old/yast2-bootloader-2.23.1/src/grub2/Makefile.in 2012-03-05 15:09:52.000000000 +0100 +++ new/yast2-bootloader-2.23.2/src/grub2/Makefile.in 2012-04-23 11:44:51.000000000 +0200 @@ -246,8 +246,10 @@ ydatadir = @ydatadir@ yncludedir = @yncludedir@/bootloader/grub2 ystartupdir = @ystartupdir@ -ynclude_DATA = \ - dialogs.ycp +ynclude_DATA = \ + dialogs.ycp \ + options.ycp \ + helps.ycp EXTRA_DIST = \ $(ynclude_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.1/src/grub2/dialogs.ycp new/yast2-bootloader-2.23.2/src/grub2/dialogs.ycp --- old/yast2-bootloader-2.23.1/src/grub2/dialogs.ycp 2012-03-05 15:09:25.000000000 +0100 +++ new/yast2-bootloader-2.23.2/src/grub2/dialogs.ycp 2012-04-23 11:49:07.000000000 +0200 @@ -26,6 +26,51 @@ import "BootCommon"; import "Stage"; +include "bootloader/grub2/options.ycp"; + +/** + * Run dialog for loader installation details for Grub2 + * @return symbol for wizard sequencer + */ +symbol Grub2LoaderDetailsDialog () +{ + y2milestone ("Running Grub2 loader details dialog"); + term contents = `HBox ( + `HSpacing (2), + `VBox ( + `VStretch (), + `Left("activate"), + `Left("generic_mbr"), + `Left("hiddenmenu"), + `HBox ( + `Left(`HSquash("timeout")), + `Left(`HWeight(1, "vgamode")) + ), + `Left("append"), + `Left("default"), + `Left("console"), + `VStretch () + ), + `HSpacing (2) + ); + + string lt = BootCommon::getLoaderType (false); + list<string> widget_names = (lt == "grub2-efi") + ? ["hiddenmenu", "timeout", "append", "default", "vgamode"] + : ["activate","generic_mbr", "hiddenmenu", "timeout", "append", "console", "default", "vgamode"]; + + string caption = _("Boot Loader Options"); + return CWM::ShowAndRun ($[ + "widget_descr" : Grub2Options(), + "widget_names" : widget_names, + "contents" : contents, + "caption" : caption, + "back_button" : Label::BackButton (), + "abort_button" : Label::CancelButton (), + "next_button" : Label::OKButton (), + ]); +} + include "bootloader/grub/options.ycp"; /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.1/src/grub2/helps.ycp new/yast2-bootloader-2.23.2/src/grub2/helps.ycp --- old/yast2-bootloader-2.23.1/src/grub2/helps.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-bootloader-2.23.2/src/grub2/helps.ycp 2012-04-23 11:44:51.000000000 +0200 @@ -0,0 +1,43 @@ +/** + * File: + * include/bootloader/grup2/helps.ycp + * + * Module: + * Bootloader installation and configuration + * + * Summary: + * Help and label strings for bootloader installation and configuration + * + * Authors: + * Joachim Plack <jplack(a)suse.de> + * + * $Id: helps.ycp 58279 2009-08-04 16:01:51Z juhliarik $ + * + */ + +{ +textdomain "bootloader"; + +global map<string,string> grub2_help_messages = $[ + "append" : + _("Optional Kernel Command Line Parameter lets you define additional parameters to pass to the kernel."), + "vgamode" : + _("Vga Mode defines the VGA mode the kernel should set the console to when booting."), +]; + +global map<string,string> grub2_descriptions = $[ + "append" : _("O&ptional Kernel Command Line Parameter"), + "vgamode" : _("&Vga Mode"), +]; + +} //EOF + +/* + * Local variables: + * mode: ycp + * mode: font-lock + * mode: auto-fill + * indent-level: 4 + * fill-column: 78 + * End: + */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.1/src/grub2/options.ycp new/yast2-bootloader-2.23.2/src/grub2/options.ycp --- old/yast2-bootloader-2.23.1/src/grub2/options.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-bootloader-2.23.2/src/grub2/options.ycp 2012-04-23 11:46:59.000000000 +0200 @@ -0,0 +1,150 @@ +/** + * File: + * include/bootloader/routines/grub2/options.ycp + * + * Module: + * Bootloader installation and configuration + * + * Summary: + * Grub2 widgets for bootloader options. + * + * Authors: + * Josef Reidinger<jreidinger(a)suse.cz> + * + * $Id: $ + * + */ + +{ +textdomain "bootloader"; + +import "Label"; +import "Initrd"; +import "System::Bootloader_API"; + +include "bootloader/routines/common_options.ycp"; +include "bootloader/grub/helps.ycp"; +include "bootloader/grub2/helps.ycp"; + +/** + * Init function of widget + * @param widget any id of the widget + */ +void VgaModeInit (string widget) { + list<map> vga_modes = Initrd::VgaModes (); + list items = maplist (map m, vga_modes, { + return `item (`id (sformat ("%1", tohexstring(m["mode"]:0))), + // combo box item + // %1 is X resolution (width) in pixels + // %2 is Y resolution (height) in pixels + // %3 is color depth (usually one of 8, 16, 24, 32) + // %4 is the VGA mode ID (hexadecimal number) + sformat (_("%1x%2, %3 bits (mode %4)"), + m["width"]:0, m["height"]:0, m["color"]:0, tohexstring(m["mode"]:0))); + }); + items = prepend(items,`item(`id("ask"), _("Ask for resolution during boot."))); + items = prepend(items,`item(`id("extended"), _("Standard 8-pixel font mode."))); + // item of a combo box + items = prepend (items, `item (`id ("normal"), _("Text Mode"))); + items = prepend (items, `item (`id (""), _("Unspecified"))); + UI::ChangeWidget (`id (widget), `Items, items); + InitGlobalStr (widget); +} + +void DefaultEntryInit (string widget) { + list items = []; + + foreach (map<string,any> s, BootCommon::sections, { + items = add (items, `item(`id(s["menuentry"]:""), s["menuentry"]:"")); + }); + + UI::ChangeWidget (`id (widget), `Items, items); + InitGlobalStr (widget); + return; +} + +/** + * Init function for console + * @param string widget + */ +void ConsoleInit(string widget){ + boolean enable = BootCommon::globals["terminal"]:"" == "serial"; + UI::ChangeWidget(`id(`console_frame),`Value, enable); + string args = BootCommon::globals["serial"]:""; + UI::ChangeWidget(`id(`console_args),`Value, args); +} + +/** + * Store function of a console + * @param widget any widget key + * @param event map event description of event that occured + */ +void ConsoleStore(string widget, map event){ + boolean use_serial = (boolean) UI::QueryWidget(`id(`console_frame),`Value); + if (use_serial) + { + BootCommon::globals["terminal"] = "serial"; + string console_value = (string) UI::QueryWidget(`id(`console_args),`Value); + if (console_value != "") + BootCommon::globals["serial"] = console_value; + } else { + if (haskey(BootCommon::globals, "terminal")) + BootCommon::globals = remove(BootCommon::globals, "terminal"); + if (haskey(BootCommon::globals, "serial")) + BootCommon::globals = remove(BootCommon::globals, "serial"); + } + + // FATE: #110038: Serial console + // add or remove console key with value for sections + BootCommon::HandleConsole2(); +} + +map<string,map<string,any> > Grub2Options(){ + map<string,map<string,any> > grub2_specific = $[ + "activate" : CommonCheckboxWidget(grub_descriptions["activate"]:"activate", + grub_help_messages["activate"]:""), + "generic_mbr" : CommonCheckboxWidget(grub_descriptions["generic_mbr"]:"generic mbr", + grub_help_messages["generic_mbr"]:""), + "hiddenmenu" : CommonCheckboxWidget(grub_descriptions["hiddenmenu"]:"hidden menu", + grub_help_messages["hiddenmenu"]:""), + "append" : CommonInputFieldWidget(grub2_descriptions["append"]:"append", + grub2_help_messages["append"]:""), + "vgamode" : $[ + "widget" : `combobox, + "label" : grub2_descriptions["vgamode"]:"vgamode", + "opt" : [ `editable, `hstretch ], + "init" : VgaModeInit, + "store" : StoreGlobalStr, + "help" : grub2_help_messages["vgamode"]:"", + ], + + "default" : $[ + "widget" : `combobox, + "label" : grub_descriptions["default"]:"default", + "opt" : [ `editable, `hstretch ], + "init" : DefaultEntryInit, + "store" : StoreGlobalStr, + "help" : grub_help_messages["default"]:"", + ], + + "console" : $[ + "widget" : `custom, + "custom_widget" : `HBox( + `CheckBoxFrame(`id(`console_frame),_("Use &serial console"),true, + `HBox( + `HSpacing(2), + `InputField(`id(`console_args),`opt(`hstretch), _("&Console arguments")), + `HStretch())) + ), + "init" : ConsoleInit, + "store" : ConsoleStore, + "help" : grub_help_messages["serial"]:"" + ], + + ]; + + return (map<string,map<string,any> >)union(grub2_specific,CommonOptions()); +} + +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.1/src/modules/BootGRUB2.ycp new/yast2-bootloader-2.23.2/src/modules/BootGRUB2.ycp --- old/yast2-bootloader-2.23.1/src/modules/BootGRUB2.ycp 2012-03-30 13:03:57.000000000 +0200 +++ new/yast2-bootloader-2.23.2/src/modules/BootGRUB2.ycp 2012-04-23 11:44:51.000000000 +0200 @@ -43,6 +43,16 @@ // general functions /** + * Propose global options of bootloader + */ +global map<string,string> StandardGlobals () { + return $[ + "timeout" : "8", + "default" : "0", + ]; +} + +/** * Read settings from disk * @param reread boolean true to force reread settings from system * @param avoid_reading_device_map do not read new device map from file, use @@ -121,6 +131,12 @@ global define void Propose () { y2milestone ("Proposed globals: %1", BootCommon::globals); + + if (BootCommon::globals == nil || size (BootCommon::globals) == 0) + { + BootCommon::globals = StandardGlobals(); + } + grub_LocationProposal (); map<string, integer> swap_sizes = BootCommon::getSwapPartitions (); @@ -177,6 +193,13 @@ return result; } +global map<string,symbol()> Dialogs () { + y2milestone ("Called GRUB2 Dialogs"); + return $[ + "loader" : Grub2LoaderDetailsDialog, + ]; +} + /** * Return map of provided functions * @return a map of functions (eg. $["write":BootGRUB2::Write]) @@ -189,6 +212,7 @@ "summary" : Summary, "update" : Update, "widgets" : grub2Widgets, + "dialogs" : Dialogs, "write" : Write, ]; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.1/src/modules/BootGRUB2EFI.ycp new/yast2-bootloader-2.23.2/src/modules/BootGRUB2EFI.ycp --- old/yast2-bootloader-2.23.1/src/modules/BootGRUB2EFI.ycp 2012-03-30 13:03:57.000000000 +0200 +++ new/yast2-bootloader-2.23.2/src/modules/BootGRUB2EFI.ycp 2012-04-23 11:49:07.000000000 +0200 @@ -39,10 +39,20 @@ // for shared some routines with grub // include "bootloader/grub/misc.ycp"; // for simplified widgets than other -// include "bootloader/grub2efi/dialogs.ycp"; +include "bootloader/grub2/dialogs.ycp"; // general functions /** + * Propose global options of bootloader + */ +global map<string,string> StandardGlobals () { + return $[ + "timeout" : "8", + "default" : "0", + ]; +} + +/** * Read settings from disk * @param reread boolean true to force reread settings from system * @param avoid_reading_device_map do not read new device map from file, use @@ -117,6 +127,11 @@ global define void Propose () { y2milestone ("Proposed globals: %1", BootCommon::globals); + if (BootCommon::globals == nil || size (BootCommon::globals) == 0) + { + BootCommon::globals = StandardGlobals(); + } + map<string, integer> swap_sizes = BootCommon::getSwapPartitions (); list<string> swap_parts = (list<string>) maplist (string name, integer size, swap_sizes, ``(name)); @@ -155,6 +170,13 @@ return result; } +global map<string,symbol()> Dialogs () { + y2milestone ("Called GRUB2 Dialogs"); + return $[ + "loader" : Grub2LoaderDetailsDialog, + ]; +} + /** * Return map of provided functions * @return a map of functions (eg. $["write":BootGRUB2EFI::Write]) @@ -168,6 +190,7 @@ "update" : Update, #TODO grub2widgets #"widgets" : grub2Widgets, + "dialogs" : Dialogs, "widgets" : $[], "write" : Write, ]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.1/src/routines/global_widgets.ycp new/yast2-bootloader-2.23.2/src/routines/global_widgets.ycp --- old/yast2-bootloader-2.23.1/src/routines/global_widgets.ycp 2012-03-30 13:02:55.000000000 +0200 +++ new/yast2-bootloader-2.23.2/src/routines/global_widgets.ycp 2012-04-23 11:50:13.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: global_widgets.ycp 67833 2012-03-30 11:02:53Z snwint $ + * $Id: global_widgets.ycp 67986 2012-04-23 09:50:12Z snwint $ * */ @@ -736,7 +736,7 @@ `HStretch (), `VBox ( `Label (""), - (lt == "none" || lt == "default" || lt == "zipl" || lt == "lilo" || lt == "grub2" || lt == "grub2-efi") + (lt == "none" || lt == "default" || lt == "zipl" || lt == "lilo") ? `Empty() : "loader_options" ), `HSpacing (2) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.23.1/src/routines/misc.ycp new/yast2-bootloader-2.23.2/src/routines/misc.ycp --- old/yast2-bootloader-2.23.1/src/routines/misc.ycp 2012-03-05 15:09:25.000000000 +0100 +++ new/yast2-bootloader-2.23.2/src/routines/misc.ycp 2012-04-23 11:48:42.000000000 +0200 @@ -12,7 +12,7 @@ * Jiri Srain <jsrain(a)suse.cz> * Olaf Dabrunz <od(a)suse.de> * - * $Id: misc.ycp 61035 2010-02-26 09:20:36Z juhliarik $ + * $Id: misc.ycp 67985 2012-04-23 09:48:41Z snwint $ * * WARNING: * To be included to BootCommon.ycp only, requires function @@ -1976,6 +1976,28 @@ } +/** FATE #110038: Serial console + * Add console arg for kernel if there is defined serial console + * - add key console with value to section type image and xen + */ + +global define void HandleConsole2() +{ + string console_value = getConsoleValue(); + + if (globals["append"]:nil != nil) + { + string updated_append = ""; + if ((console_value != "") || (console_value != nil)) + updated_append = BootCommon::UpdateSerialConsole(globals["append"]:"", console_value); + else + updated_append = BootCommon::UpdateSerialConsole(globals["append"]:"", ""); + if (updated_append != nil) + { + globals["append"]=updated_append; + } + } +} /** bnc #450153 - support for installation kernel from add-on * fucntion call client from add-on and update proposal for -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xulrunner for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package xulrunner for openSUSE:Factory checked in at 2012-04-23 16:14:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xulrunner (Old) and /work/SRC/openSUSE:Factory/.xulrunner.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xulrunner", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/xulrunner/xulrunner.changes 2012-03-16 13:28:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xulrunner.new/xulrunner.changes 2012-04-23 16:14:14.000000000 +0200 @@ -1,0 +2,11 @@ +Sat Apr 21 10:03:42 UTC 2012 - wr(a)rosenauer.org + +- update to 12.0 (bnc#758408) + * rebased patches +- added mozilla-libnotify.patch to allow fallback from libnotify + to xul based events if no notification-daemon is running +- gcc 4.7 fixes + * mozilla-gcc47.patch + * disabled crashreporter temporarily for Factory + +------------------------------------------------------------------- Old: ---- l10n-11.0.tar.bz2 mozilla-sle11-gcc.patch xulrunner-11.0-source.tar.bz2 New: ---- l10n-12.0.tar.bz2 mozilla-gcc47.patch mozilla-libnotify.patch mozilla-revert_621446.patch xulrunner-12.0-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xulrunner.spec ++++++ --- /var/tmp/diff_new_pack.jiIUyd/_old 2012-04-23 16:14:20.000000000 +0200 +++ /var/tmp/diff_new_pack.jiIUyd/_new 2012-04-23 16:14:20.000000000 +0200 @@ -44,12 +44,12 @@ %endif BuildRequires: mozilla-nspr-devel >= 4.9.0 BuildRequires: mozilla-nss-devel >= 3.13.3 -Version: 11.0 +Version: 12.0 Release: 0 -%define releasedate 2012031200 -%define version_internal 11.0 -%define apiversion 11 -%define uaweight 1100000 +%define releasedate 2012042100 +%define version_internal 12.0 +%define apiversion 12 +%define uaweight 1200000 Summary: Mozilla Runtime Environment License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ Group: Productivity/Other @@ -79,8 +79,10 @@ Patch13: mozilla-sle11.patch Patch14: mozilla-linux3.patch Patch15: mozilla-arm-cpu-detection.patch +Patch16: mozilla-revert_621446.patch Patch17: mozilla-yarr-pcre.patch -Patch18: mozilla-sle11-gcc.patch +Patch18: mozilla-libnotify.patch +Patch19: mozilla-gcc47.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: mozilla-js = %{version} Requires(post): update-alternatives coreutils @@ -97,6 +99,10 @@ %define crashreporter 1 %define plugincontainer 1 %endif +# temporary (gcc 4.7) +%if %suse_version > 1210 +%define crashreporter 0 +%endif ### configuration end ### %define _use_internal_dependency_generator 0 %define __find_requires sh %{SOURCE2} @@ -162,7 +168,7 @@ Summary: Extra translations for XULRunner Group: System/Localization Requires: %{name} = %{version} -Provides: locale(%{name}:af;ak;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;el;en_ZA;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;kn;ku;lg;lij;lt;lv;mai;mk;ml;mn;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;sw;ta;ta_LK;te;th;tr;uk;vi;zu) +Provides: locale(%{name}:af;ak;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;el;en_ZA;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;km;kn;ku;lg;lij;lt;lv;mai;mk;ml;mn;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;sw;ta;ta_LK;te;th;tr;uk;vi;zu) Obsoletes: %{name}-translations < %{version}-%{release} %description translations-other @@ -199,8 +205,10 @@ %endif %patch14 -p1 %patch15 -p1 +%patch16 -p1 #%patch17 -p1 %patch18 -p1 +%patch19 -p1 %build # no need to add build time to binaries ++++++ compare-locales.tar.bz2 ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.jiIUyd/_old 2012-04-23 16:14:21.000000000 +0200 +++ /var/tmp/diff_new_pack.jiIUyd/_new 2012-04-23 16:14:21.000000000 +0200 @@ -2,8 +2,8 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_11_0_RELEASE" -VERSION="11.0" +RELEASE_TAG="FIREFOX_12_0_RELEASE" +VERSION="12.0" # mozilla hg clone http://hg.mozilla.org/$BRANCH mozilla ++++++ l10n-11.0.tar.bz2 -> l10n-12.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/xulrunner/l10n-11.0.tar.bz2 /work/SRC/openSUSE:Factory/.xulrunner.new/l10n-12.0.tar.bz2 differ: char 11, line 1 ++++++ mozilla-sle11-gcc.patch -> mozilla-gcc47.patch ++++++ --- /work/SRC/openSUSE:Factory/xulrunner/mozilla-sle11-gcc.patch 2012-03-16 13:28:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xulrunner.new/mozilla-gcc47.patch 2012-04-23 16:14:12.000000000 +0200 @@ -1,24 +1,174 @@ # HG changeset patch -# Parent 39e596b823926b5add22bb263734c6c872ee2aad -diff --git a/layout/xul/base/src/nsXULTooltipListener.h b/layout/xul/base/src/nsXULTooltipListener.h ---- a/layout/xul/base/src/nsXULTooltipListener.h -+++ b/layout/xul/base/src/nsXULTooltipListener.h -@@ -107,17 +107,17 @@ protected: - static void sTooltipCallback (nsITimer* aTimer, void* aListener); - - // screen coordinates of the last mousemove event, stored so that the - // tooltip can be opened at this location. - PRInt32 mMouseScreenX, mMouseScreenY; - - // various constants for tooltips - enum { -- kTooltipMouseMoveTolerance = 7, // 7 pixel tolerance for mousemove event -+ kTooltipMouseMoveTolerance = 7 // 7 pixel tolerance for mousemove event - }; - - // flag specifying if the tooltip has already been displayed by a MouseMove - // event. The flag is reset on MouseOut so that the tooltip will display - // the next time the mouse enters the node (bug #395668). - bool mTooltipShownOnce; +# Parent debab900e37fdd4f8981c06beef6f193a04bd2b7 +Patch to make Mozilla build with gcc 4.7, including +- Bug 725655 - gcc 4.7 build failures (missing headers) (TM: Mozilla13) +- Bug 734490 - "no viable overloaded 'PRIxPTR'" when building with Clang or GCC 4.7 (TM: Mozilla14) + +diff --git a/ipc/chromium/src/base/file_util_linux.cc b/ipc/chromium/src/base/file_util_linux.cc +--- a/ipc/chromium/src/base/file_util_linux.cc ++++ b/ipc/chromium/src/base/file_util_linux.cc +@@ -1,15 +1,18 @@ + // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. - #ifdef MOZ_XUL + #include "base/file_util.h" + + #include <fcntl.h> ++#if defined(ANDROID) || defined(OS_POSIX) ++#include <unistd.h> ++#endif + + #include <string> + #include <vector> + + #include "base/eintr_wrapper.h" + #include "base/file_path.h" + #include "base/string_util.h" + +diff --git a/ipc/chromium/src/base/message_pump_libevent.cc b/ipc/chromium/src/base/message_pump_libevent.cc +--- a/ipc/chromium/src/base/message_pump_libevent.cc ++++ b/ipc/chromium/src/base/message_pump_libevent.cc +@@ -1,16 +1,19 @@ + // Copyright (c) 2008 The Chromium Authors. All rights reserved. + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + + #include "base/message_pump_libevent.h" + + #include <errno.h> + #include <fcntl.h> ++#if defined(ANDROID) || defined(OS_POSIX) ++#include <unistd.h> ++#endif + + #include "eintr_wrapper.h" + #include "base/logging.h" + #include "base/scoped_nsautorelease_pool.h" + #include "base/scoped_ptr.h" + #include "base/time.h" + #include "third_party/libevent/event.h" + +diff --git a/ipc/chromium/src/base/time_posix.cc b/ipc/chromium/src/base/time_posix.cc +--- a/ipc/chromium/src/base/time_posix.cc ++++ b/ipc/chromium/src/base/time_posix.cc +@@ -8,16 +8,19 @@ + #include <mach/mach_time.h> + #endif + #include <sys/time.h> + #ifdef ANDROID + #include <time64.h> + #else + #include <time.h> + #endif ++#if defined(ANDROID) || defined(OS_POSIX) ++#include <unistd.h> ++#endif + + #include <limits> + + #include "base/basictypes.h" + #include "base/logging.h" + + namespace base { + +diff --git a/layout/base/tests/TestPoisonArea.cpp b/layout/base/tests/TestPoisonArea.cpp +--- a/layout/base/tests/TestPoisonArea.cpp ++++ b/layout/base/tests/TestPoisonArea.cpp +@@ -392,53 +392,53 @@ ReservePoisonArea() + { + if (sizeof(uintptr_t) == 8) { + // Use the hardware-inaccessible region. + // We have to avoid 64-bit constants and shifts by 32 bits, since this + // code is compiled in 32-bit mode, although it is never executed there. + uintptr_t result = (((uintptr_t(0x7FFFFFFFu) << 31) << 1 | + uintptr_t(0xF0DEAFFFu)) & + ~uintptr_t(PAGESIZE-1)); +- printf("INFO | poison area assumed at 0x%.*"PRIxPTR"\n", SIZxPTR, result); ++ printf("INFO | poison area assumed at 0x%.*" PRIxPTR "\n", SIZxPTR, result); + return result; + } else { + // First see if we can allocate the preferred poison address from the OS. + uintptr_t candidate = (0xF0DEAFFF & ~(PAGESIZE-1)); + void *result = ReserveRegion(candidate, false); + if (result == (void *)candidate) { + // success - inaccessible page allocated +- printf("INFO | poison area allocated at 0x%.*"PRIxPTR ++ printf("INFO | poison area allocated at 0x%.*" PRIxPTR + " (preferred addr)\n", SIZxPTR, (uintptr_t)result); + return candidate; + } + + // That didn't work, so see if the preferred address is within a range + // of permanently inacessible memory. + if (ProbeRegion(candidate)) { + // success - selected page cannot be usable memory + if (result != MAP_FAILED) + ReleaseRegion(result); +- printf("INFO | poison area assumed at 0x%.*"PRIxPTR ++ printf("INFO | poison area assumed at 0x%.*" PRIxPTR + " (preferred addr)\n", SIZxPTR, candidate); + return candidate; + } + + // The preferred address is already in use. Did the OS give us a + // consolation prize? + if (result != MAP_FAILED) { +- printf("INFO | poison area allocated at 0x%.*"PRIxPTR ++ printf("INFO | poison area allocated at 0x%.*" PRIxPTR + " (consolation prize)\n", SIZxPTR, (uintptr_t)result); + return (uintptr_t)result; + } + + // It didn't, so try to allocate again, without any constraint on + // the address. + result = ReserveRegion(0, false); + if (result != MAP_FAILED) { +- printf("INFO | poison area allocated at 0x%.*"PRIxPTR ++ printf("INFO | poison area allocated at 0x%.*" PRIxPTR + " (fallback)\n", SIZxPTR, (uintptr_t)result); + return (uintptr_t)result; + } + + printf("ERROR | no usable poison area found\n"); + return 0; + } + } +@@ -450,17 +450,17 @@ static uintptr_t + ReservePositiveControl() + { + + void *result = ReserveRegion(0, false); + if (result == MAP_FAILED) { + printf("ERROR | allocating positive control | %s\n", LastErrMsg()); + return 0; + } +- printf("INFO | positive control allocated at 0x%.*"PRIxPTR"\n", ++ printf("INFO | positive control allocated at 0x%.*" PRIxPTR "\n", + SIZxPTR, (uintptr_t)result); + return (uintptr_t)result; + } + + /* The "negative control" area confirms that our probe logic does detect a + * page that is readable, writable, or executable. + */ + static uintptr_t +@@ -481,17 +481,17 @@ ReserveNegativeControl() + // Now mark it executable as well as readable and writable. + // (mmap(PROT_EXEC) may fail when applied to anonymous memory.) + + if (MakeRegionExecutable(result)) { + printf("ERROR | making negative control executable | %s\n", LastErrMsg()); + return 0; + } + +- printf("INFO | negative control allocated at 0x%.*"PRIxPTR"\n", ++ printf("INFO | negative control allocated at 0x%.*" PRIxPTR "\n", + SIZxPTR, (uintptr_t)result); + return (uintptr_t)result; + } + + static void + JumpTo(uintptr_t opaddr) + { + #ifdef __ia64 ++++++ mozilla-libnotify.patch ++++++ # HG changeset patch # User Wolfgang Rosenauer <wr(a)rosenauer.org> # Parent c684863b1eb3bcae92ef24bc2ac511985b1ad7e4 Bug 737646 - no biff notification if notification-daemon not running diff --git a/toolkit/system/gnome/nsAlertsIconListener.cpp b/toolkit/system/gnome/nsAlertsIconListener.cpp --- a/toolkit/system/gnome/nsAlertsIconListener.cpp +++ b/toolkit/system/gnome/nsAlertsIconListener.cpp @@ -47,16 +47,17 @@ #include <gdk/gdk.h> // Compatibility macro for <libnotify-0.7 #ifndef NOTIFY_CHECK_VERSION #define NOTIFY_CHECK_VERSION(x,y,z) 0 #endif static bool gHasActions = false; +static bool gHasCaps = false; static void notify_action_cb(NotifyNotification *notification, gchar *action, gpointer user_data) { nsAlertsIconListener* alert = static_cast<nsAlertsIconListener*> (user_data); alert->SendCallback(); } @@ -338,27 +339,34 @@ nsAlertsIconListener::InitAlertAsync(con appShortName.AssignLiteral("Mozilla"); } if (!notify_init(appShortName.get())) return NS_ERROR_FAILURE; GList *server_caps = notify_get_server_caps(); if (server_caps) { + gHasCaps = true; for (GList* cap = server_caps; cap != NULL; cap = cap->next) { if (!strcmp((char*) cap->data, "actions")) { gHasActions = true; break; } } g_list_foreach(server_caps, (GFunc)g_free, NULL); g_list_free(server_caps); } } + if (!gHasCaps) { + // if notify_get_server_caps() failed above we need to assume + // there is no notification-server to display anything + return NS_ERROR_FAILURE; + } + if (!gHasActions && aAlertTextClickable) return NS_ERROR_FAILURE; // No good, fallback to XUL nsCOMPtr<nsIObserverService> obsServ = do_GetService("@mozilla.org/observer-service;1"); if (obsServ) obsServ->AddObserver(this, "quit-application", true); ++++++ mozilla-pkgconfig.patch ++++++ --- /var/tmp/diff_new_pack.jiIUyd/_old 2012-04-23 16:14:21.000000000 +0200 +++ /var/tmp/diff_new_pack.jiIUyd/_new 2012-04-23 16:14:21.000000000 +0200 @@ -4,17 +4,17 @@ diff --git a/xulrunner/installer/Makefile.in b/xulrunner/installer/Makefile.in --- a/xulrunner/installer/Makefile.in +++ b/xulrunner/installer/Makefile.in -@@ -68,16 +68,19 @@ INSTALL_SDK = 1 - ifndef MOZ_PLATFORM_MAEMO +@@ -69,16 +69,19 @@ ifndef MOZ_PLATFORM_MAEMO GENERATE_CACHE = 1 endif + include $(topsrcdir)/toolkit/mozapps/installer/signing.mk include $(topsrcdir)/toolkit/mozapps/installer/packager.mk # Add pkg-config files to the install:: target +# the apilibdir always ends with 1.9 as every patch update will provide a link -+apilibdir = $(dir $(installdir))xulrunner-11 ++apilibdir = $(dir $(installdir))xulrunner-12 + pkg_config_files = \ libxul.pc \ @@ -24,7 +24,7 @@ $(NULL) ifdef MOZ_NATIVE_NSPR -@@ -105,16 +108,17 @@ pkg_config_files += mozilla-nss.pc +@@ -106,16 +109,17 @@ pkg_config_files += mozilla-nss.pc endif %.pc: $(srcdir)/%.pc.in $(GLOBAL_DEPS) ++++++ mozilla-revert_621446.patch ++++++ # HG changeset patch # Parent 8da41a2cee774ce4d00b9ac1032a495b8bc560a0 Revert investigation patch for bmo#621446; as it is useless on desktop and breaks the build for certain compilers diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp --- a/netwerk/protocol/http/HttpChannelParent.cpp +++ b/netwerk/protocol/http/HttpChannelParent.cpp @@ -52,29 +52,25 @@ #include "nsIBadCertListener2.h" #include "nsICacheEntryDescriptor.h" #include "nsSerializationHelper.h" #include "nsISerializable.h" #include "nsIAssociatedContentSecurity.h" #include "nsIApplicationCacheService.h" #include "nsIOfflineCacheUpdate.h" #include "nsIRedirectChannelRegistrar.h" -#include "prinit.h" namespace mozilla { namespace net { HttpChannelParent::HttpChannelParent(PBrowserParent* iframeEmbedding) : mIPCClosed(false) , mStoredStatus(0) , mStoredProgress(0) , mStoredProgressMax(0) - , mSentRedirect1Begin(false) - , mSentRedirect1BeginFailed(false) - , mReceivedRedirect2Verify(false) { // Ensure gHttpHandler is initialized: we need the atom table up and running. nsIHttpProtocolHandler* handler; CallGetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "http", &handler); NS_ASSERTION(handler, "no http handler"); mTabParent = do_QueryObject(static_cast<TabParent*>(iframeEmbedding)); } @@ -326,21 +322,16 @@ HttpChannelParent::RecvUpdateAssociatedC mAssociatedContentSecurity->SetCountSubRequestsHighSecurity(high); mAssociatedContentSecurity->SetCountSubRequestsLowSecurity(low); mAssociatedContentSecurity->SetCountSubRequestsBrokenSecurity(broken); mAssociatedContentSecurity->SetCountSubRequestsNoSecurity(no); } return true; } -// Bug 621446 investigation, we don't want conditional PR_Aborts bellow to be -// merged to a single address. -#pragma warning(disable : 4068) -#pragma GCC optimize ("O0") - bool HttpChannelParent::RecvRedirect2Verify(const nsresult& result, const RequestHeaderTuples& changedHeaders) { if (NS_SUCCEEDED(result)) { nsCOMPtr<nsIHttpChannel> newHttpChannel = do_QueryInterface(mRedirectChannel); @@ -348,40 +339,21 @@ HttpChannelParent::RecvRedirect2Verify(c for (PRUint32 i = 0; i < changedHeaders.Length(); i++) { newHttpChannel->SetRequestHeader(changedHeaders[i].mHeader, changedHeaders[i].mValue, changedHeaders[i].mMerge); } } } - if (!mRedirectCallback) { - // Bug 621446 investigation (optimization turned off above) - if (mReceivedRedirect2Verify) - NS_RUNTIMEABORT("Duplicate fire"); - if (mSentRedirect1BeginFailed) - NS_RUNTIMEABORT("Send to child failed"); - if (mSentRedirect1Begin && NS_FAILED(result)) - NS_RUNTIMEABORT("Redirect failed"); - if (mSentRedirect1Begin && NS_SUCCEEDED(result)) - NS_RUNTIMEABORT("Redirect succeeded"); - if (!mRedirectChannel) - NS_RUNTIMEABORT("Missing redirect channel"); - } - - mReceivedRedirect2Verify = true; - mRedirectCallback->OnRedirectVerifyCallback(result); mRedirectCallback = nsnull; return true; } -// Bug 621446 investigation -#pragma GCC reset_options - bool HttpChannelParent::RecvDocumentChannelCleanup() { // From now on only using mAssociatedContentSecurity. Free everything else. mChannel = 0; // Reclaim some memory sooner. mCacheDescriptor = 0; // Else we'll block other channels reading same URI return true; } @@ -583,24 +555,18 @@ HttpChannelParent::StartRedirect(PRUint3 nsHttpChannel *httpChan = static_cast<nsHttpChannel *>(mChannel.get()); nsHttpResponseHead *responseHead = httpChan->GetResponseHead(); bool result = SendRedirect1Begin(newChannelId, IPC::URI(newURI), redirectFlags, responseHead ? *responseHead : nsHttpResponseHead()); - if (!result) { - // Bug 621446 investigation - mSentRedirect1BeginFailed = true; + if (!result) return NS_BINDING_ABORTED; - } - - // Bug 621446 investigation - mSentRedirect1Begin = true; // Result is handled in RecvRedirect2Verify above mRedirectChannel = newChannel; mRedirectCallback = callback; return NS_OK; } diff --git a/netwerk/protocol/http/HttpChannelParent.h b/netwerk/protocol/http/HttpChannelParent.h --- a/netwerk/protocol/http/HttpChannelParent.h +++ b/netwerk/protocol/http/HttpChannelParent.h @@ -128,18 +128,14 @@ private: nsCOMPtr<nsIChannel> mRedirectChannel; nsCOMPtr<nsIAsyncVerifyRedirectCallback> mRedirectCallback; // state for combining OnStatus/OnProgress with OnDataAvailable // into one IPDL call to child. nsresult mStoredStatus; PRUint64 mStoredProgress; PRUint64 mStoredProgressMax; - - bool mSentRedirect1Begin : 1; - bool mSentRedirect1BeginFailed : 1; - bool mReceivedRedirect2Verify : 1; }; } // namespace net } // namespace mozilla #endif // mozilla_net_HttpChannelParent_h ++++++ source-stamp.txt ++++++ --- /var/tmp/diff_new_pack.jiIUyd/_old 2012-04-23 16:14:21.000000000 +0200 +++ /var/tmp/diff_new_pack.jiIUyd/_new 2012-04-23 16:14:21.000000000 +0200 @@ -1,2 +1,2 @@ -REV=b967d9c07377 +REV=a294a5b4f12d REPO=http://hg.mozilla.org/releases/mozilla-release ++++++ xulrunner-11.0-source.tar.bz2 -> xulrunner-12.0-source.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/xulrunner/xulrunner-11.0-source.tar.bz2 /work/SRC/openSUSE:Factory/.xulrunner.new/xulrunner-12.0-source.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 v4l-utils for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package v4l-utils for openSUSE:Factory checked in at 2012-04-23 16:13:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/v4l-utils (Old) and /work/SRC/openSUSE:Factory/.v4l-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "v4l-utils", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/v4l-utils/v4l-utils.changes 2012-04-17 22:04:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.v4l-utils.new/v4l-utils.changes 2012-04-23 16:13:59.000000000 +0200 @@ -1,0 +2,13 @@ +Sun Apr 22 17:15:15 UTC 2012 - asterios.dramis(a)gmail.com + +- Update to v0.8.8 + Utils changes: + * dvb-format-convert: fix argument check and helper message + libv4l changes: + * tinyjpeg: Better luminance quantization table for Pixart JPEG + * tinyjpeg: Fix out of bounds array usage + * libv4lconvert: Use bytesperline instead of width + * libv4lconvert: Revert Lenovo X201 upside down table entry + * libv4lconver: Add 06f8:301b pac7302 based cam to the quirk table + +------------------------------------------------------------------- Old: ---- v4l-utils-0.8.7.tar.bz2 New: ---- v4l-utils-0.8.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ v4l-utils.spec ++++++ --- /var/tmp/diff_new_pack.JvaS8e/_old 2012-04-23 16:14:00.000000000 +0200 +++ /var/tmp/diff_new_pack.JvaS8e/_new 2012-04-23 16:14:00.000000000 +0200 @@ -17,7 +17,7 @@ Name: v4l-utils -Version: 0.8.7 +Version: 0.8.8 Release: 0 Summary: Utilities for video4linux and DVB devices License: GPL-2.0+ and GPL-2.0 ++++++ v4l-utils-0.8.7.tar.bz2 -> v4l-utils-0.8.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/v4l-utils-0.8.7/ChangeLog new/v4l-utils-0.8.8/ChangeLog --- old/v4l-utils-0.8.7/ChangeLog 2012-04-06 18:55:44.000000000 +0200 +++ new/v4l-utils-0.8.8/ChangeLog 2012-04-14 19:33:44.000000000 +0200 @@ -1,3 +1,14 @@ +v4l-utils-0.8.8 +--------------- +* Utils changes (0.9.x backports) + * dvb-format-convert: fix argument check and helper message +* libv4l changes (0.9.x backports) + * tinyjpeg: Better luminance quantization table for Pixart JPEG (Jean-Francois Moine) + * tinyjpeg: Fix out of bounds array usage + * libv4lconvert: Use bytesperline instead of width (Robert Abel) + * libv4lconvert: Revert Lenovo X201 upside down table entry + * libv4lconver: Add 06f8:301b pac7302 based cam to the quirk table + v4l-utils-0.8.7 --------------- * Utils changes (0.9.x backports) @@ -5,6 +16,7 @@ * qv4l2: fix segfault when there are no inputs or outputs * dvb: Merged DVB tools from development branch * libv4l changes (0.9.x backports) + * Prevent GCC 4.7 inlining error * Add some more laptop models to the upside down devices table v4l-utils-0.8.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/v4l-utils-0.8.7/Make.rules new/v4l-utils-0.8.8/Make.rules --- old/v4l-utils-0.8.7/Make.rules 2012-04-06 18:55:44.000000000 +0200 +++ new/v4l-utils-0.8.8/Make.rules 2012-04-14 19:33:44.000000000 +0200 @@ -1,4 +1,4 @@ -V4L_UTILS_VERSION=0.8.7 +V4L_UTILS_VERSION=0.8.8 # These ones can be overriden from the cmdline diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/v4l-utils-0.8.7/README.lib new/v4l-utils-0.8.8/README.lib --- old/v4l-utils-0.8.7/README.lib 2012-04-06 18:55:44.000000000 +0200 +++ new/v4l-utils-0.8.8/README.lib 2012-04-14 19:33:44.000000000 +0200 @@ -4,7 +4,7 @@ libv4l is a collection of libraries which adds a thin abstraction layer on top of video4linux2 devices. The purpose of this (thin) layer is to make it easy for application writers to support a wide variety of devices without -having to write seperate code for different devices in the same class. +having to write separate code for different devices in the same class. All libv4l components are licensed under the GNU Lesser General Public License version 2 or (at your option) any later version. @@ -121,7 +121,7 @@ the bayer compression used by the spca561 and the (different) compression used by the pac207 and the (again different) compression used by the sn9c102. Adding support for all these formats should not be done at the application level, as -then it needs to be written for each application seperately. Licensing issues +then it needs to be written for each application separately. Licensing issues with the decompressors will then also become a problem as just cut and pasting from one application to another is bound to hit license incompatibilities. @@ -156,14 +156,14 @@ combined with libv4lconvert? A: libv4l2 is mainly meant for quickly and easily adding support for more pixelformats to existing v4l2 applications. So if you feel better directly -accessing the device in combination with libv4lconvert thats fine too. +accessing the device in combination with libv4lconvert that's fine too. Notice that libv4l2 also does emulation of the read() call on devices which do not support it in the driver. In the background this uses mmap buffers (even on devices which do support the read call). This mmap gives libv4lconvert zero-copy access to the captured frame, and then it can write the converted data directly to the buffer the application provided to v4l2_read(). Thus -another reason to use liv4l2 is to get the no memcpy advantage of the mmap +another reason to use libv4l2 is to get the no memcpy advantage of the mmap capture method combined with the simplicity of making a simple read() call. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/v4l-utils-0.8.7/README.lib-multi-threading new/v4l-utils-0.8.8/README.lib-multi-threading --- old/v4l-utils-0.8.7/README.lib-multi-threading 2012-04-06 18:55:44.000000000 +0200 +++ new/v4l-utils-0.8.8/README.lib-multi-threading 2012-04-14 19:33:44.000000000 +0200 @@ -1,7 +1,7 @@ libv4lconvert is not safe for using one convert instance as returned by v4lconvert_create from multiple threads, if you want to use one v4lconvert instance from multiple threads you must provide your own locking and make -sure no simultanious calls are made. +sure no simultaneous calls are made. libv4l1 and libv4l2 are safe for multithread use *under* *the* *following* *conditions* : diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/v4l-utils-0.8.7/lib/libv4lconvert/bayer.c new/v4l-utils-0.8.8/lib/libv4lconvert/bayer.c --- old/v4l-utils-0.8.7/lib/libv4lconvert/bayer.c 2012-04-06 18:55:44.000000000 +0200 +++ new/v4l-utils-0.8.8/lib/libv4lconvert/bayer.c 2012-04-14 19:33:44.000000000 +0200 @@ -44,7 +44,7 @@ /* inspired by OpenCV's Bayer decoding */ static void v4lconvert_border_bayer_line_to_bgr24( const unsigned char *bayer, const unsigned char *adjacent_bayer, - unsigned char *bgr, int width, int start_with_green, int blue_line) + unsigned char *bgr, int width, const int start_with_green, const int blue_line) { int t0, t1; @@ -164,11 +164,11 @@ /* From libdc1394, which on turn was based on OpenCV's Bayer decoding */ static void bayer_to_rgbbgr24(const unsigned char *bayer, - unsigned char *bgr, int width, int height, unsigned int pixfmt, + unsigned char *bgr, int width, int height, const unsigned int stride, unsigned int pixfmt, int start_with_green, int blue_line) { /* render the first line */ - v4lconvert_border_bayer_line_to_bgr24(bayer, bayer + width, bgr, width, + v4lconvert_border_bayer_line_to_bgr24(bayer, bayer + stride, bgr, width, start_with_green, blue_line); bgr += width * 3; @@ -179,139 +179,141 @@ const unsigned char *bayer_end = bayer + (width - 2); if (start_with_green) { - /* OpenCV has a bug in the next line, which was - t0 = (bayer[0] + bayer[width * 2] + 1) >> 1; */ - t0 = (bayer[1] + bayer[width * 2 + 1] + 1) >> 1; + + t0 = (bayer[1] + bayer[stride * 2 + 1] + 1) >> 1; /* Write first pixel */ - t1 = (bayer[0] + bayer[width * 2] + bayer[width + 1] + 1) / 3; + t1 = (bayer[0] + bayer[stride * 2] + bayer[stride + 1] + 1) / 3; if (blue_line) { *bgr++ = t0; *bgr++ = t1; - *bgr++ = bayer[width]; + *bgr++ = bayer[stride]; } else { - *bgr++ = bayer[width]; + *bgr++ = bayer[stride]; *bgr++ = t1; *bgr++ = t0; } /* Write second pixel */ - t1 = (bayer[width] + bayer[width + 2] + 1) >> 1; + t1 = (bayer[stride] + bayer[stride + 2] + 1) >> 1; if (blue_line) { *bgr++ = t0; - *bgr++ = bayer[width + 1]; + *bgr++ = bayer[stride + 1]; *bgr++ = t1; } else { *bgr++ = t1; - *bgr++ = bayer[width + 1]; + *bgr++ = bayer[stride + 1]; *bgr++ = t0; } bayer++; } else { /* Write first pixel */ - t0 = (bayer[0] + bayer[width * 2] + 1) >> 1; + t0 = (bayer[0] + bayer[stride * 2] + 1) >> 1; if (blue_line) { *bgr++ = t0; - *bgr++ = bayer[width]; - *bgr++ = bayer[width + 1]; + *bgr++ = bayer[stride]; + *bgr++ = bayer[stride + 1]; } else { - *bgr++ = bayer[width + 1]; - *bgr++ = bayer[width]; + *bgr++ = bayer[stride + 1]; + *bgr++ = bayer[stride]; *bgr++ = t0; } } if (blue_line) { for (; bayer <= bayer_end - 2; bayer += 2) { - t0 = (bayer[0] + bayer[2] + bayer[width * 2] + - bayer[width * 2 + 2] + 2) >> 2; - t1 = (bayer[1] + bayer[width] + bayer[width + 2] + - bayer[width * 2 + 1] + 2) >> 2; + t0 = (bayer[0] + bayer[2] + bayer[stride * 2] + + bayer[stride * 2 + 2] + 2) >> 2; + t1 = (bayer[1] + bayer[stride] + bayer[stride + 2] + + bayer[stride * 2 + 1] + 2) >> 2; *bgr++ = t0; *bgr++ = t1; - *bgr++ = bayer[width + 1]; + *bgr++ = bayer[stride + 1]; - t0 = (bayer[2] + bayer[width * 2 + 2] + 1) >> 1; - t1 = (bayer[width + 1] + bayer[width + 3] + 1) >> 1; + t0 = (bayer[2] + bayer[stride * 2 + 2] + 1) >> 1; + t1 = (bayer[stride + 1] + bayer[stride + 3] + 1) >> 1; *bgr++ = t0; - *bgr++ = bayer[width + 2]; + *bgr++ = bayer[stride + 2]; *bgr++ = t1; } } else { for (; bayer <= bayer_end - 2; bayer += 2) { - t0 = (bayer[0] + bayer[2] + bayer[width * 2] + - bayer[width * 2 + 2] + 2) >> 2; - t1 = (bayer[1] + bayer[width] + bayer[width + 2] + - bayer[width * 2 + 1] + 2) >> 2; - *bgr++ = bayer[width + 1]; + t0 = (bayer[0] + bayer[2] + bayer[stride * 2] + + bayer[stride * 2 + 2] + 2) >> 2; + t1 = (bayer[1] + bayer[stride] + bayer[stride + 2] + + bayer[stride * 2 + 1] + 2) >> 2; + *bgr++ = bayer[stride + 1]; *bgr++ = t1; *bgr++ = t0; - t0 = (bayer[2] + bayer[width * 2 + 2] + 1) >> 1; - t1 = (bayer[width + 1] + bayer[width + 3] + 1) >> 1; + t0 = (bayer[2] + bayer[stride * 2 + 2] + 1) >> 1; + t1 = (bayer[stride + 1] + bayer[stride + 3] + 1) >> 1; *bgr++ = t1; - *bgr++ = bayer[width + 2]; + *bgr++ = bayer[stride + 2]; *bgr++ = t0; } } if (bayer < bayer_end) { /* write second to last pixel */ - t0 = (bayer[0] + bayer[2] + bayer[width * 2] + - bayer[width * 2 + 2] + 2) >> 2; - t1 = (bayer[1] + bayer[width] + bayer[width + 2] + - bayer[width * 2 + 1] + 2) >> 2; + t0 = (bayer[0] + bayer[2] + bayer[stride * 2] + + bayer[stride * 2 + 2] + 2) >> 2; + t1 = (bayer[1] + bayer[stride] + bayer[stride + 2] + + bayer[stride * 2 + 1] + 2) >> 2; if (blue_line) { *bgr++ = t0; *bgr++ = t1; - *bgr++ = bayer[width + 1]; + *bgr++ = bayer[stride + 1]; } else { - *bgr++ = bayer[width + 1]; + *bgr++ = bayer[stride + 1]; *bgr++ = t1; *bgr++ = t0; } /* write last pixel */ - t0 = (bayer[2] + bayer[width * 2 + 2] + 1) >> 1; + t0 = (bayer[2] + bayer[stride * 2 + 2] + 1) >> 1; if (blue_line) { *bgr++ = t0; - *bgr++ = bayer[width + 2]; - *bgr++ = bayer[width + 1]; + *bgr++ = bayer[stride + 2]; + *bgr++ = bayer[stride + 1]; } else { - *bgr++ = bayer[width + 1]; - *bgr++ = bayer[width + 2]; + *bgr++ = bayer[stride + 1]; + *bgr++ = bayer[stride + 2]; *bgr++ = t0; } + bayer++; + } else { /* write last pixel */ - t0 = (bayer[0] + bayer[width * 2] + 1) >> 1; - t1 = (bayer[1] + bayer[width * 2 + 1] + bayer[width] + 1) / 3; + t0 = (bayer[0] + bayer[stride * 2] + 1) >> 1; + t1 = (bayer[1] + bayer[stride * 2 + 1] + bayer[stride] + 1) / 3; if (blue_line) { *bgr++ = t0; *bgr++ = t1; - *bgr++ = bayer[width + 1]; + *bgr++ = bayer[stride + 1]; } else { - *bgr++ = bayer[width + 1]; + *bgr++ = bayer[stride + 1]; *bgr++ = t1; *bgr++ = t0; } + } - /* skip 2 border pixels */ - bayer += 2; + /* skip 2 border pixels and padding */ + bayer += (stride - width) + 2; blue_line = !blue_line; start_with_green = !start_with_green; } /* render the last line */ - v4lconvert_border_bayer_line_to_bgr24(bayer + width, bayer, bgr, width, + v4lconvert_border_bayer_line_to_bgr24(bayer + stride, bayer, bgr, width, !start_with_green, !blue_line); } void v4lconvert_bayer_to_rgb24(const unsigned char *bayer, - unsigned char *bgr, int width, int height, unsigned int pixfmt) + unsigned char *bgr, int width, int height, const unsigned int stride, unsigned int pixfmt) { - bayer_to_rgbbgr24(bayer, bgr, width, height, pixfmt, + bayer_to_rgbbgr24(bayer, bgr, width, height, stride, pixfmt, pixfmt == V4L2_PIX_FMT_SGBRG8 /* start with green */ || pixfmt == V4L2_PIX_FMT_SGRBG8, pixfmt != V4L2_PIX_FMT_SBGGR8 /* blue line */ @@ -319,9 +321,9 @@ } void v4lconvert_bayer_to_bgr24(const unsigned char *bayer, - unsigned char *bgr, int width, int height, unsigned int pixfmt) + unsigned char *bgr, int width, int height, const unsigned int stride, unsigned int pixfmt) { - bayer_to_rgbbgr24(bayer, bgr, width, height, pixfmt, + bayer_to_rgbbgr24(bayer, bgr, width, height, stride, pixfmt, pixfmt == V4L2_PIX_FMT_SGBRG8 /* start with green */ || pixfmt == V4L2_PIX_FMT_SGRBG8, pixfmt == V4L2_PIX_FMT_SBGGR8 /* blue line */ @@ -428,7 +430,7 @@ } void v4lconvert_bayer_to_yuv420(const unsigned char *bayer, unsigned char *yuv, - int width, int height, unsigned int src_pixfmt, int yvu) + int width, int height, const unsigned int stride, unsigned int src_pixfmt, int yvu) { int blue_line = 0, start_with_green = 0, x, y; unsigned char *ydst = yuv; @@ -451,12 +453,12 @@ b = bayer[x]; g = bayer[x + 1]; - g += bayer[x + width]; - r = bayer[x + width + 1]; + g += bayer[x + stride]; + r = bayer[x + stride + 1]; *udst++ = (-4878 * r - 4789 * g + 14456 * b + 4210688) >> 15; *vdst++ = (14456 * r - 6052 * g - 2351 * b + 4210688) >> 15; } - bayer += 2 * width; + bayer += 2 * stride; } blue_line = 1; break; @@ -468,12 +470,12 @@ r = bayer[x]; g = bayer[x + 1]; - g += bayer[x + width]; - b = bayer[x + width + 1]; + g += bayer[x + stride]; + b = bayer[x + stride + 1]; *udst++ = (-4878 * r - 4789 * g + 14456 * b + 4210688) >> 15; *vdst++ = (14456 * r - 6052 * g - 2351 * b + 4210688) >> 15; } - bayer += 2 * width; + bayer += 2 * stride; } break; @@ -484,12 +486,12 @@ g = bayer[x]; b = bayer[x + 1]; - r = bayer[x + width]; - g += bayer[x + width + 1]; + r = bayer[x + stride]; + g += bayer[x + stride + 1]; *udst++ = (-4878 * r - 4789 * g + 14456 * b + 4210688) >> 15; *vdst++ = (14456 * r - 6052 * g - 2351 * b + 4210688) >> 15; } - bayer += 2 * width; + bayer += 2 * stride; } blue_line = 1; start_with_green = 1; @@ -502,21 +504,22 @@ g = bayer[x]; r = bayer[x + 1]; - b = bayer[x + width]; - g += bayer[x + width + 1]; + b = bayer[x + stride]; + g += bayer[x + stride + 1]; *udst++ = (-4878 * r - 4789 * g + 14456 * b + 4210688) >> 15; *vdst++ = (14456 * r - 6052 * g - 2351 * b + 4210688) >> 15; } - bayer += 2 * width; + bayer += 2 * stride; } start_with_green = 1; break; } - bayer -= width * height; + /* Point bayer back to start of frame */ + bayer -= stride * height; /* render the first line */ - v4lconvert_border_bayer_line_to_y(bayer, bayer + width, ydst, width, + v4lconvert_border_bayer_line_to_y(bayer, bayer + stride, ydst, width, start_with_green, blue_line); ydst += width; @@ -527,104 +530,104 @@ const unsigned char *bayer_end = bayer + (width - 2); if (start_with_green) { - t0 = bayer[1] + bayer[width * 2 + 1]; + t0 = bayer[1] + bayer[stride * 2 + 1]; /* Write first pixel */ - t1 = bayer[0] + bayer[width * 2] + bayer[width + 1]; + t1 = bayer[0] + bayer[stride * 2] + bayer[stride + 1]; if (blue_line) - *ydst++ = (8453 * bayer[width] + 5516 * t1 + + *ydst++ = (8453 * bayer[stride] + 5516 * t1 + 1661 * t0 + 524288) >> 15; else *ydst++ = (4226 * t0 + 5516 * t1 + - 3223 * bayer[width] + 524288) >> 15; + 3223 * bayer[stride] + 524288) >> 15; /* Write second pixel */ - t1 = bayer[width] + bayer[width + 2]; + t1 = bayer[stride] + bayer[stride + 2]; if (blue_line) - *ydst++ = (4226 * t1 + 16594 * bayer[width + 1] + + *ydst++ = (4226 * t1 + 16594 * bayer[stride + 1] + 1611 * t0 + 524288) >> 15; else - *ydst++ = (4226 * t0 + 16594 * bayer[width + 1] + + *ydst++ = (4226 * t0 + 16594 * bayer[stride + 1] + 1611 * t1 + 524288) >> 15; bayer++; } else { /* Write first pixel */ - t0 = bayer[0] + bayer[width * 2]; + t0 = bayer[0] + bayer[stride * 2]; if (blue_line) { - *ydst++ = (8453 * bayer[width + 1] + 16594 * bayer[width] + + *ydst++ = (8453 * bayer[stride + 1] + 16594 * bayer[stride] + 1661 * t0 + 524288) >> 15; } else { - *ydst++ = (4226 * t0 + 16594 * bayer[width] + - 3223 * bayer[width + 1] + 524288) >> 15; + *ydst++ = (4226 * t0 + 16594 * bayer[stride] + + 3223 * bayer[stride + 1] + 524288) >> 15; } } if (blue_line) { for (; bayer <= bayer_end - 2; bayer += 2) { - t0 = bayer[0] + bayer[2] + bayer[width * 2] + bayer[width * 2 + 2]; - t1 = bayer[1] + bayer[width] + bayer[width + 2] + bayer[width * 2 + 1]; - *ydst++ = (8453 * bayer[width + 1] + 4148 * t1 + + t0 = bayer[0] + bayer[2] + bayer[stride * 2] + bayer[stride * 2 + 2]; + t1 = bayer[1] + bayer[stride] + bayer[stride + 2] + bayer[stride * 2 + 1]; + *ydst++ = (8453 * bayer[stride + 1] + 4148 * t1 + 806 * t0 + 524288) >> 15; - t0 = bayer[2] + bayer[width * 2 + 2]; - t1 = bayer[width + 1] + bayer[width + 3]; - *ydst++ = (4226 * t1 + 16594 * bayer[width + 2] + + t0 = bayer[2] + bayer[stride * 2 + 2]; + t1 = bayer[stride + 1] + bayer[stride + 3]; + *ydst++ = (4226 * t1 + 16594 * bayer[stride + 2] + 1611 * t0 + 524288) >> 15; } } else { for (; bayer <= bayer_end - 2; bayer += 2) { - t0 = bayer[0] + bayer[2] + bayer[width * 2] + bayer[width * 2 + 2]; - t1 = bayer[1] + bayer[width] + bayer[width + 2] + bayer[width * 2 + 1]; + t0 = bayer[0] + bayer[2] + bayer[stride * 2] + bayer[stride * 2 + 2]; + t1 = bayer[1] + bayer[stride] + bayer[stride + 2] + bayer[stride * 2 + 1]; *ydst++ = (2113 * t0 + 4148 * t1 + - 3223 * bayer[width + 1] + 524288) >> 15; + 3223 * bayer[stride + 1] + 524288) >> 15; - t0 = bayer[2] + bayer[width * 2 + 2]; - t1 = bayer[width + 1] + bayer[width + 3]; - *ydst++ = (4226 * t0 + 16594 * bayer[width + 2] + + t0 = bayer[2] + bayer[stride * 2 + 2]; + t1 = bayer[stride + 1] + bayer[stride + 3]; + *ydst++ = (4226 * t0 + 16594 * bayer[stride + 2] + 1611 * t1 + 524288) >> 15; } } if (bayer < bayer_end) { /* Write second to last pixel */ - t0 = bayer[0] + bayer[2] + bayer[width * 2] + bayer[width * 2 + 2]; - t1 = bayer[1] + bayer[width] + bayer[width + 2] + bayer[width * 2 + 1]; + t0 = bayer[0] + bayer[2] + bayer[stride * 2] + bayer[stride * 2 + 2]; + t1 = bayer[1] + bayer[stride] + bayer[stride + 2] + bayer[stride * 2 + 1]; if (blue_line) - *ydst++ = (8453 * bayer[width + 1] + 4148 * t1 + + *ydst++ = (8453 * bayer[stride + 1] + 4148 * t1 + 806 * t0 + 524288) >> 15; else *ydst++ = (2113 * t0 + 4148 * t1 + - 3223 * bayer[width + 1] + 524288) >> 15; + 3223 * bayer[stride + 1] + 524288) >> 15; /* write last pixel */ - t0 = bayer[2] + bayer[width * 2 + 2]; + t0 = bayer[2] + bayer[stride * 2 + 2]; if (blue_line) { - *ydst++ = (8453 * bayer[width + 1] + 16594 * bayer[width + 2] + + *ydst++ = (8453 * bayer[stride + 1] + 16594 * bayer[stride + 2] + 1661 * t0 + 524288) >> 15; } else { - *ydst++ = (4226 * t0 + 16594 * bayer[width + 2] + - 3223 * bayer[width + 1] + 524288) >> 15; + *ydst++ = (4226 * t0 + 16594 * bayer[stride + 2] + + 3223 * bayer[stride + 1] + 524288) >> 15; } bayer++; } else { /* write last pixel */ - t0 = bayer[0] + bayer[width * 2]; - t1 = bayer[1] + bayer[width * 2 + 1] + bayer[width]; + t0 = bayer[0] + bayer[stride * 2]; + t1 = bayer[1] + bayer[stride * 2 + 1] + bayer[stride]; if (blue_line) - *ydst++ = (8453 * bayer[width + 1] + 5516 * t1 + + *ydst++ = (8453 * bayer[stride + 1] + 5516 * t1 + 1661 * t0 + 524288) >> 15; else *ydst++ = (4226 * t0 + 5516 * t1 + - 3223 * bayer[width + 1] + 524288) >> 15; + 3223 * bayer[stride + 1] + 524288) >> 15; } - /* skip 2 border pixels */ - bayer += 2; + /* skip 2 border pixels and padding */ + bayer += (stride - width) + 2; blue_line = !blue_line; start_with_green = !start_with_green; } /* render the last line */ - v4lconvert_border_bayer_line_to_y(bayer + width, bayer, ydst, width, + v4lconvert_border_bayer_line_to_y(bayer + stride, bayer, ydst, width, !start_with_green, !blue_line); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/v4l-utils-0.8.7/lib/libv4lconvert/control/libv4lcontrol.c new/v4l-utils-0.8.8/lib/libv4lconvert/control/libv4lcontrol.c --- old/v4l-utils-0.8.7/lib/libv4lconvert/control/libv4lcontrol.c 2012-04-06 18:55:44.000000000 +0200 +++ new/v4l-utils-0.8.8/lib/libv4lconvert/control/libv4lcontrol.c 2012-04-14 19:33:44.000000000 +0200 @@ -161,9 +161,10 @@ { 0x17ef, 0x480c, 0, "LENOVO", "7449C8G", V4LCONTROL_HFLIPPED | V4LCONTROL_VFLIPPED, 0, NULL, NULL, NULL, "ThinkPad X200 Tablet" }, + /* Disabled due to http://bugs.debian.org/667958 { 0x17ef, 0x4816, 0, "LENOVO", "0831CTO", V4LCONTROL_HFLIPPED | V4LCONTROL_VFLIPPED, 0, NULL, NULL, NULL, - "ThinkPad X201 Tablet" }, + "ThinkPad X201 Tablet" }, */ { 0x5986, 0x0200, 0, "LENOVO", "SPEEDY ", V4LCONTROL_HFLIPPED | V4LCONTROL_VFLIPPED, 0, NULL, NULL, NULL, "Lenovo IdeaPad Y510" }, @@ -203,6 +204,8 @@ V4LCONTROL_ROTATED_90_JPEG | V4LCONTROL_WANTS_WB, 1500 }, { 0x06f8, 0x3009, 0, NULL, NULL, V4LCONTROL_ROTATED_90_JPEG | V4LCONTROL_WANTS_WB, 1500 }, + { 0x06f8, 0x301b, 0, NULL, NULL, + V4LCONTROL_ROTATED_90_JPEG | V4LCONTROL_WANTS_WB, 1500 }, { 0x145f, 0x013c, 0, NULL, NULL, V4LCONTROL_ROTATED_90_JPEG | V4LCONTROL_WANTS_WB, 1500 }, /* Pac7311 based devices */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/v4l-utils-0.8.7/lib/libv4lconvert/libv4lconvert-priv.h new/v4l-utils-0.8.8/lib/libv4lconvert/libv4lconvert-priv.h --- old/v4l-utils-0.8.7/lib/libv4lconvert/libv4lconvert-priv.h 2012-04-06 18:55:44.000000000 +0200 +++ new/v4l-utils-0.8.8/lib/libv4lconvert/libv4lconvert-priv.h 2012-04-14 19:33:44.000000000 +0200 @@ -230,13 +230,13 @@ int width, int height); void v4lconvert_bayer_to_rgb24(const unsigned char *bayer, - unsigned char *rgb, int width, int height, unsigned int pixfmt); + unsigned char *rgb, int width, int height, const unsigned int stride, unsigned int pixfmt); void v4lconvert_bayer_to_bgr24(const unsigned char *bayer, - unsigned char *rgb, int width, int height, unsigned int pixfmt); + unsigned char *rgb, int width, int height, const unsigned int stride, unsigned int pixfmt); void v4lconvert_bayer_to_yuv420(const unsigned char *bayer, unsigned char *yuv, - int width, int height, unsigned int src_pixfmt, int yvu); + int width, int height, const unsigned int stride, unsigned int src_pixfmt, int yvu); void v4lconvert_hm12_to_rgb24(const unsigned char *src, unsigned char *dst, int width, int height); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/v4l-utils-0.8.7/lib/libv4lconvert/libv4lconvert.c new/v4l-utils-0.8.8/lib/libv4lconvert/libv4lconvert.c --- old/v4l-utils-0.8.7/lib/libv4lconvert/libv4lconvert.c 2012-04-06 18:55:44.000000000 +0200 +++ new/v4l-utils-0.8.8/lib/libv4lconvert/libv4lconvert.c 2012-04-14 19:33:44.000000000 +0200 @@ -629,6 +629,7 @@ unsigned int src_pix_fmt = fmt->fmt.pix.pixelformat; unsigned int width = fmt->fmt.pix.width; unsigned int height = fmt->fmt.pix.height; + unsigned int bytesperline = fmt->fmt.pix.bytesperline; switch (src_pix_fmt) { /* JPG and variants */ @@ -858,16 +859,16 @@ case V4L2_PIX_FMT_SRGGB8: switch (dest_pix_fmt) { case V4L2_PIX_FMT_RGB24: - v4lconvert_bayer_to_rgb24(src, dest, width, height, src_pix_fmt); + v4lconvert_bayer_to_rgb24(src, dest, width, height, bytesperline, src_pix_fmt); break; case V4L2_PIX_FMT_BGR24: - v4lconvert_bayer_to_bgr24(src, dest, width, height, src_pix_fmt); + v4lconvert_bayer_to_bgr24(src, dest, width, height, bytesperline, src_pix_fmt); break; case V4L2_PIX_FMT_YUV420: - v4lconvert_bayer_to_yuv420(src, dest, width, height, src_pix_fmt, 0); + v4lconvert_bayer_to_yuv420(src, dest, width, height, bytesperline, src_pix_fmt, 0); break; case V4L2_PIX_FMT_YVU420: - v4lconvert_bayer_to_yuv420(src, dest, width, height, src_pix_fmt, 1); + v4lconvert_bayer_to_yuv420(src, dest, width, height, bytesperline, src_pix_fmt, 1); break; } if (src_size < (width * height)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/v4l-utils-0.8.7/lib/libv4lconvert/tinyjpeg.c new/v4l-utils-0.8.8/lib/libv4lconvert/tinyjpeg.c --- old/v4l-utils-0.8.7/lib/libv4lconvert/tinyjpeg.c 2012-04-06 18:55:44.000000000 +0200 +++ new/v4l-utils-0.8.8/lib/libv4lconvert/tinyjpeg.c 2012-04-14 19:33:44.000000000 +0200 @@ -206,14 +206,14 @@ }; const unsigned char pixart_quantization[][64] = { { - 0x07, 0x07, 0x08, 0x0a, 0x09, 0x07, 0x0d, 0x0b, - 0x0c, 0x0d, 0x11, 0x10, 0x0f, 0x12, 0x17, 0x27, - 0x1a, 0x18, 0x16, 0x16, 0x18, 0x31, 0x23, 0x25, - 0x1d, 0x28, 0x3a, 0x33, 0x3d, 0x3c, 0x39, 0x33, - 0x38, 0x37, 0x40, 0x48, 0x5c, 0x4e, 0x40, 0x44, - 0x57, 0x45, 0x37, 0x38, 0x50, 0x6d, 0x51, 0x57, - 0x5f, 0x62, 0x67, 0x68, 0x67, 0x3e, 0x4d, 0x71, - 0x79, 0x70, 0x64, 0x78, 0x5c, 0x65, 0x67, 0x63, + 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x10, 0x10, + 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, + 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, + 0x10, 0x10, 0x10, 0x10, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x40, 0x40, 0x40, 0x40, 0x40, + 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, + 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, }, { 0x11, 0x12, 0x12, 0x18, 0x15, 0x18, 0x2f, 0x1a, @@ -2556,7 +2556,7 @@ { int i; - for (i = 0; priv->components[i] && i < COMPONENTS; i++) + for (i = 0; i < COMPONENTS && priv->components[i]; i++) components[i] = priv->components[i]; return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/v4l-utils-0.8.7/utils/dvb/dvb-format-convert.c new/v4l-utils-0.8.8/utils/dvb/dvb-format-convert.c --- old/v4l-utils-0.8.7/utils/dvb/dvb-format-convert.c 2012-04-06 18:55:44.000000000 +0200 +++ new/v4l-utils-0.8.8/utils/dvb/dvb-format-convert.c 2012-04-14 19:33:44.000000000 +0200 @@ -99,7 +99,7 @@ .options = options, .parser = parse_opt, .doc = "scan DVB services using the channel file", - .args_doc = "<initial file>", + .args_doc = "<input file> <output file>", }; memset(&args, 0, sizeof(args)); @@ -113,7 +113,7 @@ if (args.input_format == FILE_UNKNOWN) { fprintf(stderr, "ERROR: Please specify a valid input format\n"); missing = 1; - } else if (!args.output_file) { + } else if (!args.input_file) { fprintf(stderr, "ERROR: Please specify a valid input file\n"); missing = 1; } else if (args.output_format == FILE_UNKNOWN) { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit tunctl for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package tunctl for openSUSE:Factory checked in at 2012-04-23 16:13:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tunctl (Old) and /work/SRC/openSUSE:Factory/.tunctl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tunctl", Maintainer is "MVyskocil(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/tunctl/tunctl.changes 2011-09-23 12:49:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tunctl.new/tunctl.changes 2012-04-23 16:13:58.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 18 07:51:46 UTC 2012 - coolo(a)suse.com + +- only buildrequire the minimal set of docbook-utils, we only need + docbook2man + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tunctl.spec ++++++ --- /var/tmp/diff_new_pack.71OzNe/_old 2012-04-23 16:13:59.000000000 +0200 +++ /var/tmp/diff_new_pack.71OzNe/_new 2012-04-23 16:13:59.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package tunctl # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,22 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: tunctl Version: 1.5 -Release: 10 +Release: 0 Summary: Create and remove virtual network interfaces -Group: System/Management License: GPL-2.0+ +Group: System/Management Url: http://tunctl.sourceforge.net/ -AutoReqProv: on Source0: %{name}-%{version}.tar.bz2 Patch0: %{name}-%{version}-install-manpage-noexec.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build - -BuildRequires: docbook-utils +BuildRequires: docbook-utils-minimal %description tunctl is a tool to set up and maintain persistent TUN/TAP network -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit trader for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package trader for openSUSE:Factory checked in at 2012-04-23 16:13:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/trader (Old) and /work/SRC/openSUSE:Factory/.trader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "trader", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/trader/trader.changes 2012-04-02 10:32:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.trader.new/trader.changes 2012-04-23 16:13:56.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Apr 14 16:26:00 EST 2012 - J.Zaitseff(a)zap.org.au + +- New upstream release of Star Traders: 7.4-pre2 + +------------------------------------------------------------------- Old: ---- trader-7.4-pre1.de.po trader-7.4-pre1.tar.gz trader-enable_de.patch New: ---- trader-7.4-pre2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ trader.spec ++++++ --- /var/tmp/diff_new_pack.1OGwww/_old 2012-04-23 16:13:57.000000000 +0200 +++ /var/tmp/diff_new_pack.1OGwww/_new 2012-04-23 16:13:57.000000000 +0200 @@ -1,69 +1,123 @@ -# -# spec file for package trader -# -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. +# Star Traders: A Game of Interstellar Trading +# Copyright (c) 2012 John Zaitseff -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# +# Author: John Zaitseff <J.Zaitseff(a)zap.org.au> +# $Id: trader.spec 462+mod2 2012-04-16 06:26:06Z john $ +# This file is distributed under the same licence as Star Traders itself: +# the GNU General Public License, version 3 or later. -%define real_version 7.4-pre1 +# *********************************************************************** +# Global definitions + +%define upstream_version 7.4-pre2 +%define normalised_version 7.3.99.2 +%define rpm_release_num 1 +%define is_prerelease 1 + + +# *********************************************************************** +# Overall package information Name: trader -Version: 7.3.99 -Release: 0 -Summary: Star Traders +Version: %{normalised_version} +Release: %{rpm_release_num}%{?dist} +Summary: Star Traders, a simple game of interstellar trading License: GPL-3.0+ -Group: Amusements/Games/Other -Url: http://www.zap.org.au/software/trader/ -Source: %{name}-%{real_version}.tar.gz -Source1: %{name}-%{real_version}.de.po -Recommends: %{name}-lang = %version -Patch0: trader-enable_de.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: gperf +Group: Amusements/Games +URL: http://www.zap.org.au/software/trader/ + +%if 0%{?is_prerelease} +Source0: ftp://ftp.zap.org.au/pub/trader/unix/prerelease/trader-%{upstream_version}.tar.gz +%else +Source0: ftp://ftp.zap.org.au/pub/trader/unix/trader-%{upstream_version}.tar.gz +%endif + +%if 0%{?suse_version} >= 1100 +%define use_suggests_lang 1 +%else +%define use_suggests_lang 0 +%endif + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-build BuildRequires: ncurses-devel +BuildRequires: gperf +BuildRequires: gettext + +%if 0%{?use_suggests_lang} +Suggests: %{name}-lang = %{version} +%endif %description -This package at the moment only contains rogue. The ancestor of -nethack. +Star Traders is a simple game of interstellar trading, where the objective +is to create companies, buy and sell shares, borrow and repay money, in +order to become the wealthiest player (the winner). + +# *********************************************************************** +# Separate package for locale-specific information + +%if 0%{?use_suggests_lang} %lang_package +%endif + + +# *********************************************************************** +# Package preparation + %prep -%setup -q -n %{name}-%{real_version} -%patch0 +%setup -q -n %{name}-%{upstream_version} + -cp %{S:1} po/de.po +# *********************************************************************** +# Build the package %build -autoreconf -fi %configure -make %{?_smp_mflags} V=1 +make %{?_smp_mflags} + + +# *********************************************************************** +# Install the package %install -%makeinstall -%find_lang %name +make DESTDIR=%{buildroot} install +%find_lang %{name} + + +# *********************************************************************** +# Clean up from package building %clean +rm -rf %{buildroot} + + +# *********************************************************************** +# Create the RPM archive + +%if 0%{?use_suggests_lang} %files -%defattr(-,root,root) +%defattr(-,root,root,-) +%doc COPYING NEWS README +%doc %{_mandir}/man6/trader.6* +%{_bindir}/trader + +%files lang -f %{name}.lang +%defattr(-,root,root,-) + +%else + +%files -f %{name}.lang +%defattr(-,root,root,-) %doc COPYING NEWS README %doc %{_mandir}/man6/trader.6* %{_bindir}/trader -%files lang -f %name.lang -%defattr(-,root,root) +%endif + + +# *********************************************************************** +# Package spec file information %changelog ++++++ trader-7.4-pre1.tar.gz -> trader-7.4-pre2.tar.gz ++++++ ++++ 15120 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

commit tcpd for openSUSE:Factory
by root＠hilbert.suse.de 23 Apr '12

23 Apr '12

Hello community, here is the log from the commit of package tcpd for openSUSE:Factory checked in at 2012-04-23 16:13:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tcpd (Old) and /work/SRC/openSUSE:Factory/.tcpd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tcpd", Maintainer is "JJZhang(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/tcpd/tcpd.changes 2011-10-07 00:53:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tcpd.new/tcpd.changes 2012-04-23 16:13:54.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Apr 22 01:18:07 UTC 2012 - crrodriguez(a)opensuse.org + +- Refresh all patches +- Also, pass getconf LFS_CFLAGS into CFLAGS + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tcpd.spec ++++++ --- /var/tmp/diff_new_pack.S1V3zq/_old 2012-04-23 16:13:56.000000000 +0200 +++ /var/tmp/diff_new_pack.S1V3zq/_new 2012-04-23 16:13:56.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package tcpd # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,24 +15,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: tcpd Url: ftp://ftp.porcupine.org/pub/security/index.html -License: BSD-3-Clause -Group: Productivity/Networking/System Provides: nkitb:/usr/sbin/tcpd BuildRequires: linux-kernel-headers -AutoReqProv: on # bug437293 %ifarch ppc64 Obsoletes: tcpd-64bit %endif # Version: 7.6 -Release: 859 +Release: 0 Summary: A security wrapper for TCP daemons +License: BSD-3-Clause +Group: Productivity/Networking/System Source: tcp_wrappers_%{version}.tar.bz2 Source2: baselibs.conf Patch0: tcp_wrappers_%{version}.diff @@ -78,7 +75,6 @@ Wietse Venema <wietse(a)wzv.win.tue.nl> %package devel -License: BSD-3-Clause Summary: Include Files and Libraries for the TCP wrapper library Group: Productivity/Networking/System Requires: %{name} = %{version} ++++++ tcp_wrappers_7.6-builtin.diff ++++++ --- /var/tmp/diff_new_pack.S1V3zq/_old 2012-04-23 16:13:56.000000000 +0200 +++ /var/tmp/diff_new_pack.S1V3zq/_new 2012-04-23 16:13:56.000000000 +0200 @@ -1,6 +1,6 @@ ---- scaffold.c +--- scaffold.c.orig +++ scaffold.c -@@ -20,6 +20,8 @@ +@@ -20,6 +20,8 @@ static char sccs_id[] = "@(#) scaffold.c #include <syslog.h> #include <setjmp.h> #include <string.h> @@ -9,7 +9,7 @@ #if defined(INET6) && !defined(USE_GETIPNODEBY) #include <resolv.h> #endif -@@ -28,7 +30,6 @@ +@@ -28,7 +30,6 @@ static char sccs_id[] = "@(#) scaffold.c #define INADDR_NONE (-1) /* XXX should be 0xffffffff */ #endif ++++++ tcp_wrappers_7.6-fedora-bug11881.diff ++++++ --- /var/tmp/diff_new_pack.S1V3zq/_old 2012-04-23 16:13:56.000000000 +0200 +++ /var/tmp/diff_new_pack.S1V3zq/_new 2012-04-23 16:13:56.000000000 +0200 @@ -1,6 +1,6 @@ ---- eval.c +--- eval.c.orig +++ eval.c -@@ -111,7 +111,7 @@ +@@ -111,7 +111,7 @@ struct request_info *request; return (hostinfo); #endif if (STR_NE(eval_user(request), unknown)) { @@ -9,7 +9,7 @@ return (both); } else { return (hostinfo); -@@ -128,7 +128,7 @@ +@@ -128,7 +128,7 @@ struct request_info *request; char *daemon = eval_daemon(request); if (STR_NE(host, unknown)) { @@ -18,9 +18,9 @@ return (both); } else { return (daemon); ---- tcpd.c +--- tcpd.c.orig +++ tcpd.c -@@ -61,10 +61,10 @@ +@@ -61,10 +61,10 @@ char **argv; */ if (argv[0][0] == '/') { ++++++ tcp_wrappers_7.6-fedora-bug141110.diff ++++++ --- /var/tmp/diff_new_pack.S1V3zq/_old 2012-04-23 16:13:56.000000000 +0200 +++ /var/tmp/diff_new_pack.S1V3zq/_new 2012-04-23 16:13:56.000000000 +0200 @@ -1,6 +1,6 @@ ---- hosts_access.c +--- hosts_access.c.orig +++ hosts_access.c -@@ -146,7 +146,7 @@ +@@ -146,7 +146,7 @@ struct request_info *request; verdict = setjmp(tcpd_buf); if (verdict != 0) return (verdict == AC_PERMIT); @@ -9,7 +9,7 @@ return (YES); if (table_match(hosts_deny_table, request)) return (NO); -@@ -195,7 +195,7 @@ +@@ -195,7 +195,7 @@ struct request_info *request; } else if (errno != ENOENT) { tcpd_warn("cannot open %s: %m", table); } ++++++ tcp_wrappers_7.6-fedora-bug17795.diff ++++++ --- /var/tmp/diff_new_pack.S1V3zq/_old 2012-04-23 16:13:56.000000000 +0200 +++ /var/tmp/diff_new_pack.S1V3zq/_new 2012-04-23 16:13:56.000000000 +0200 @@ -1,6 +1,6 @@ ---- hosts_access.5 +--- hosts_access.5.orig +++ hosts_access.5 -@@ -90,6 +90,13 @@ +@@ -90,6 +90,13 @@ bitwise AND of the address and the `mask pattern `131.155.72.0/255.255.254.0\' matches every address in the range `131.155.72.0\' through `131.155.73.255\'. .IP \(bu @@ -14,9 +14,9 @@ An expression of the form `[n:n:n:n:n:n:n:n]/m\' is interpreted as a `[net]/prefixlen\' pair. A IPv6 host address is matched if `prefixlen\' bits of `net\' is equal to the `prefixlen\' bits of the ---- hosts_access.c +--- hosts_access.c.orig +++ hosts_access.c -@@ -273,6 +273,26 @@ +@@ -273,6 +273,26 @@ struct request_info *request; } } @@ -43,7 +43,7 @@ /* host_match - match host name and/or address against pattern */ static int host_match(tok, host) -@@ -300,6 +320,8 @@ +@@ -300,6 +320,8 @@ struct host_info *host; tcpd_warn("netgroup support is disabled"); /* not tcpd_jump() */ return (NO); #endif ++++++ tcp_wrappers_7.6-fedora-bug17847.diff ++++++ --- /var/tmp/diff_new_pack.S1V3zq/_old 2012-04-23 16:13:56.000000000 +0200 +++ /var/tmp/diff_new_pack.S1V3zq/_new 2012-04-23 16:13:56.000000000 +0200 @@ -1,6 +1,6 @@ ---- hosts_access.5 +--- hosts_access.5.orig +++ hosts_access.5 -@@ -103,6 +103,10 @@ +@@ -103,6 +103,10 @@ An expression of the form `[n:n:n:n:n:n: address. For example, the [net]/prefixlen pattern `[3ffe:505:2:1::]/64\' matches every address in the range `3ffe:505:2:1::\' through `3ffe:505:2:1:ffff:ffff:ffff:ffff\'. @@ -11,9 +11,9 @@ .SH WILDCARDS The access control language supports explicit wildcards: .IP ALL ---- hosts_access.c +--- hosts_access.c.orig +++ hosts_access.c -@@ -346,6 +346,12 @@ +@@ -346,6 +346,12 @@ char *string; { int n; @@ -26,7 +26,7 @@ if (tok[0] == '.') { /* suffix */ n = strlen(string) - strlen(tok); return (n > 0 && STR_EQ(tok, string + n)); -@@ -454,3 +460,71 @@ +@@ -454,3 +460,71 @@ char *string; } #endif } ++++++ tcp_wrappers_7.6-fedora-bug220015.diff ++++++ --- /var/tmp/diff_new_pack.S1V3zq/_old 2012-04-23 16:13:56.000000000 +0200 +++ /var/tmp/diff_new_pack.S1V3zq/_new 2012-04-23 16:13:56.000000000 +0200 @@ -1,6 +1,6 @@ ---- hosts_ctl.c +--- hosts_ctl.c.orig +++ hosts_ctl.c -@@ -29,10 +29,12 @@ +@@ -29,10 +29,12 @@ char *user; { struct request_info request; @@ -19,9 +19,9 @@ + + return (hosts_access(&request)); } ---- socket.c +--- socket.c.orig +++ socket.c -@@ -140,6 +140,53 @@ +@@ -140,6 +140,53 @@ struct request_info *request; #endif } @@ -75,9 +75,9 @@ /* sock_hostaddr - map endpoint address to printable form */ void sock_hostaddr(host) ---- tcpd.h +--- tcpd.h.orig +++ tcpd.h -@@ -174,10 +174,12 @@ +@@ -174,10 +174,12 @@ extern char *eval_server(); /* whatever #ifdef __STDC__ extern void sock_host(struct request_info *); ++++++ tcp_wrappers_7.6-fedora-docu.diff ++++++ --- /var/tmp/diff_new_pack.S1V3zq/_old 2012-04-23 16:13:56.000000000 +0200 +++ /var/tmp/diff_new_pack.S1V3zq/_new 2012-04-23 16:13:56.000000000 +0200 @@ -1,6 +1,6 @@ ---- hosts_access.5 +--- hosts_access.5.orig +++ hosts_access.5 -@@ -329,7 +329,7 @@ +@@ -329,7 +329,7 @@ in.tftpd: LOCAL, .my.domain /etc/hosts.deny: .in +3 .nf ++++++ tcp_wrappers_7.6-fedora-fixgethostbyname.diff ++++++ --- /var/tmp/diff_new_pack.S1V3zq/_old 2012-04-23 16:13:56.000000000 +0200 +++ /var/tmp/diff_new_pack.S1V3zq/_new 2012-04-23 16:13:56.000000000 +0200 @@ -1,6 +1,6 @@ ---- socket.c +--- socket.c.orig +++ socket.c -@@ -54,6 +54,7 @@ +@@ -54,6 +54,7 @@ static struct hostent *gethostbyname_dot char *name; { char dot_name[MAXHOSTNAMELEN + 1]; @@ -8,7 +8,7 @@ /* * Don't append dots to unqualified names. Such names are likely to come -@@ -63,8 +64,12 @@ +@@ -63,8 +64,12 @@ char *name; if (strchr(name, '.') == 0 || strlen(name) >= MAXHOSTNAMELEN - 1) { return (gethostbyname(name)); } else { ++++++ tcp_wrappers_7.6-fedora-sig.diff ++++++ --- /var/tmp/diff_new_pack.S1V3zq/_old 2012-04-23 16:13:56.000000000 +0200 +++ /var/tmp/diff_new_pack.S1V3zq/_new 2012-04-23 16:13:56.000000000 +0200 @@ -1,6 +1,6 @@ ---- hosts_access.c +--- hosts_access.c.orig +++ hosts_access.c -@@ -63,6 +63,7 @@ +@@ -63,6 +63,7 @@ static char sep[] = ", \t\r\n"; #define YES 1 #define NO 0 @@ -8,7 +8,7 @@ /* * These variables are globally visible so that they can be redirected in -@@ -125,7 +126,6 @@ +@@ -125,7 +126,6 @@ int hosts_access(request) struct request_info *request; { int verdict; @@ -16,7 +16,7 @@ /* * If the (daemon, client) pair is matched by an entry in the file * /etc/hosts.allow, access is granted. Otherwise, if the (daemon, -@@ -148,9 +148,9 @@ +@@ -148,9 +148,9 @@ struct request_info *request; return (verdict == AC_PERMIT); if (table_match(hosts_allow_table, request) == YES) return (YES); @@ -29,7 +29,7 @@ } /* table_match - match table entries with (daemon, client) pair */ -@@ -194,6 +194,7 @@ +@@ -194,6 +194,7 @@ struct request_info *request; (void) fclose(fp); } else if (errno != ENOENT) { tcpd_warn("cannot open %s: %m", table); ++++++ tcp_wrappers_7.6-fedora-sigalarm.diff ++++++ --- /var/tmp/diff_new_pack.S1V3zq/_old 2012-04-23 16:13:56.000000000 +0200 +++ /var/tmp/diff_new_pack.S1V3zq/_new 2012-04-23 16:13:56.000000000 +0200 @@ -1,6 +1,6 @@ ---- rfc931.c +--- rfc931.c.orig +++ rfc931.c -@@ -92,6 +92,8 @@ +@@ -92,6 +92,8 @@ char *dest; char *cp; char *result = unknown; FILE *fp; @@ -9,7 +9,7 @@ #ifdef INET6 /* address family must be the same */ -@@ -134,7 +136,12 @@ +@@ -134,7 +136,12 @@ char *dest; */ if (sigsetjmp(timebuf, 1) == 0) { @@ -23,7 +23,7 @@ alarm(rfc931_timeout); /* -@@ -223,6 +230,10 @@ +@@ -223,6 +230,10 @@ char *dest; } alarm(0); } ++++++ tcp_wrappers_7.6-fedora-sigchld.diff ++++++ --- /var/tmp/diff_new_pack.S1V3zq/_old 2012-04-23 16:13:56.000000000 +0200 +++ /var/tmp/diff_new_pack.S1V3zq/_new 2012-04-23 16:13:56.000000000 +0200 @@ -1,6 +1,6 @@ ---- shell_cmd.c +--- shell_cmd.c.orig +++ shell_cmd.c -@@ -24,6 +24,11 @@ +@@ -24,6 +24,11 @@ static char sccsid[] = "@(#) shell_cmd.c #include <unistd.h> #include <syslog.h> #include <string.h> @@ -12,7 +12,7 @@ extern void exit(); -@@ -35,13 +40,42 @@ +@@ -35,13 +40,42 @@ extern void exit(); static void do_child(); @@ -56,7 +56,7 @@ /* * Most of the work is done within the child process, to minimize the -@@ -53,12 +87,26 @@ +@@ -53,12 +87,26 @@ char *command; tcpd_warn("cannot fork: %m"); break; case 00: /* child */ ++++++ tcp_wrappers_7.6-fedora-sigjmp.diff ++++++ --- /var/tmp/diff_new_pack.S1V3zq/_old 2012-04-23 16:13:56.000000000 +0200 +++ /var/tmp/diff_new_pack.S1V3zq/_new 2012-04-23 16:13:56.000000000 +0200 @@ -1,6 +1,6 @@ ---- rfc931.c +--- rfc931.c.orig +++ rfc931.c -@@ -33,7 +33,7 @@ +@@ -33,7 +33,7 @@ static char sccsid[] = "@(#) rfc931.c 1. int rfc931_timeout = RFC931_TIMEOUT;/* Global so it can be changed */ @@ -9,7 +9,7 @@ /* fsocket - open stdio stream on top of socket */ -@@ -62,7 +62,7 @@ +@@ -62,7 +62,7 @@ int protocol; static void timeout(sig) int sig; { @@ -18,7 +18,7 @@ } /* rfc931 - return remote user name, given socket structures */ -@@ -133,7 +133,7 @@ +@@ -133,7 +133,7 @@ char *dest; * Set up a timer so we won't get stuck while waiting for the server. */ ++++++ tcp_wrappers_7.6-fedora-strerror.diff ++++++ --- /var/tmp/diff_new_pack.S1V3zq/_old 2012-04-23 16:13:56.000000000 +0200 +++ /var/tmp/diff_new_pack.S1V3zq/_new 2012-04-23 16:13:56.000000000 +0200 @@ -1,6 +1,6 @@ ---- percent_m.c +--- percent_m.c.orig +++ percent_m.c -@@ -13,7 +13,7 @@ +@@ -13,7 +13,7 @@ static char sccsid[] = "@(#) percent_m.c #include <string.h> extern int errno; @@ -9,7 +9,7 @@ extern char *sys_errlist[]; extern int sys_nerr; #endif -@@ -29,11 +29,15 @@ +@@ -29,11 +29,15 @@ char *ibuf; while (*bp = *cp) if (*cp == '%' && cp[1] == 'm') { ++++++ tcp_wrappers_7.6-fix_options-fix.diff ++++++ --- /var/tmp/diff_new_pack.S1V3zq/_old 2012-04-23 16:13:56.000000000 +0200 +++ /var/tmp/diff_new_pack.S1V3zq/_new 2012-04-23 16:13:56.000000000 +0200 @@ -1,6 +1,6 @@ ---- fix_options.c +--- fix_options.c.orig +++ fix_options.c -@@ -53,7 +53,7 @@ +@@ -53,7 +53,7 @@ struct request_info *request; * XXX IPv6 support? */ sslen = sizeof(ss); ++++++ tcp_wrappers_7.6-host_name_mapping-fix.diff ++++++ --- /var/tmp/diff_new_pack.S1V3zq/_old 2012-04-23 16:13:56.000000000 +0200 +++ /var/tmp/diff_new_pack.S1V3zq/_new 2012-04-23 16:13:56.000000000 +0200 @@ -1,6 +1,6 @@ ---- socket.c +--- socket.c.orig +++ socket.c -@@ -270,7 +270,6 @@ +@@ -270,7 +270,6 @@ sock_hostname(struct host_info *host) res = res->ai_next; } @@ -8,7 +8,7 @@ if (res == NULL) { -@@ -279,6 +278,7 @@ +@@ -279,6 +278,7 @@ sock_hostname(struct host_info *host) host->name, inet_ntop2 (sin6->sin6_family, &sin6->sin6_addr)); strncpy(host->name, paranoid, sizeof(host->name)); @@ -16,7 +16,7 @@ return; } -@@ -289,7 +289,7 @@ +@@ -289,7 +289,7 @@ sock_hostname(struct host_info *host) host->name, res->ai_canonname, inet_ntop2 (sin6->sin6_family, &sin6->sin6_addr)); } ++++++ tcp_wrappers_7.6-hosts_ctl.diff ++++++ --- /var/tmp/diff_new_pack.S1V3zq/_old 2012-04-23 16:13:56.000000000 +0200 +++ /var/tmp/diff_new_pack.S1V3zq/_new 2012-04-23 16:13:56.000000000 +0200 @@ -1,6 +1,6 @@ ---- tcpd.h +--- tcpd.h.orig +++ tcpd.h -@@ -128,6 +128,7 @@ +@@ -128,6 +128,7 @@ extern int resident; /* > 0 if residen #ifdef __STDC__ extern struct request_info *request_init(struct request_info *,...); extern struct request_info *request_set(struct request_info *,...); ++++++ tcp_wrappers_7.6-implicit-decl.patch ++++++ --- /var/tmp/diff_new_pack.S1V3zq/_old 2012-04-23 16:13:56.000000000 +0200 +++ /var/tmp/diff_new_pack.S1V3zq/_new 2012-04-23 16:13:56.000000000 +0200 @@ -1,7 +1,5 @@ -Index: rfc931.c -=================================================================== ---- rfc931.c.orig 2009-10-30 20:14:38.000000000 +0100 -+++ rfc931.c 2009-10-30 20:17:34.000000000 +0100 +--- rfc931.c.orig ++++ rfc931.c @@ -23,7 +23,7 @@ static char sccsid[] = "@(#) rfc931.c 1. #include <setjmp.h> #include <signal.h> @@ -11,10 +9,8 @@ /* Local stuff. */ #include "tcpd.h" -Index: safe_finger.c -=================================================================== ---- safe_finger.c.orig 2009-10-30 20:14:36.000000000 +0100 -+++ safe_finger.c 2009-10-30 20:32:39.000000000 +0100 +--- safe_finger.c.orig ++++ safe_finger.c @@ -19,13 +19,16 @@ static char sccsid[] = "@(#) safe_finger #endif @@ -33,10 +29,8 @@ extern void exit(); -Index: tcpdchk.c -=================================================================== ---- tcpdchk.c.orig 2009-10-30 20:14:36.000000000 +0100 -+++ tcpdchk.c 2009-10-30 20:28:19.000000000 +0100 +--- tcpdchk.c.orig ++++ tcpdchk.c @@ -20,6 +20,7 @@ static char sccsid[] = "@(#) tcpdchk.c 1 /* System libraries. */ @@ -53,10 +47,8 @@ extern int errno; extern void exit(); -Index: tcpdmatch.c -=================================================================== ---- tcpdmatch.c.orig 2009-10-30 20:14:36.000000000 +0100 -+++ tcpdmatch.c 2009-10-30 20:29:17.000000000 +0100 +--- tcpdmatch.c.orig ++++ tcpdmatch.c @@ -19,6 +19,7 @@ static char sccsid[] = "@(#) tcpdmatch.c /* System libraries. */ ++++++ tcp_wrappers_7.6-ipv6-1.6.diff ++++++ --- /var/tmp/diff_new_pack.S1V3zq/_old 2012-04-23 16:13:56.000000000 +0200 +++ /var/tmp/diff_new_pack.S1V3zq/_new 2012-04-23 16:13:56.000000000 +0200 @@ -16,9 +16,9 @@ ;; If your libc doesn't have sockaddr_storage, try target `linux-old'. ================================================================================ ---- fix_options.c +--- fix_options.c.orig +++ fix_options.c -@@ -11,6 +11,9 @@ +@@ -11,6 +11,9 @@ static char sccsid[] = "@(#) fix_options #include <sys/types.h> #include <sys/param.h> @@ -28,7 +28,7 @@ #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/ip.h> -@@ -41,6 +44,22 @@ +@@ -41,6 +44,22 @@ struct request_info *request; unsigned int opt; int optlen; struct in_addr dummy; @@ -51,9 +51,9 @@ if ((ip = getprotobyname("ip")) != 0) ipproto = ip->p_proto; ---- hosts_access.5 +--- hosts_access.5.orig +++ hosts_access.5 -@@ -85,10 +85,17 @@ +@@ -85,10 +85,17 @@ member of the specified netgroup. Netgro for daemon process names or for client user names. .IP \(bu An expression of the form `n.n.n.n/m.m.m.m\' is interpreted as a @@ -72,9 +72,9 @@ .SH WILDCARDS The access control language supports explicit wildcards: .IP ALL ---- hosts_access.c +--- hosts_access.c.orig +++ hosts_access.c -@@ -25,6 +25,9 @@ +@@ -25,6 +25,9 @@ static char sccsid[] = "@(#) hosts_acces #include <sys/types.h> #include <sys/param.h> @@ -84,7 +84,7 @@ #include <netinet/in.h> #include <arpa/inet.h> #include <stdio.h> -@@ -83,6 +86,10 @@ +@@ -83,6 +86,10 @@ static int client_match(); static int host_match(); static int string_match(); static int masked_match(); @@ -95,7 +95,7 @@ /* Size of logical line buffer. */ -@@ -317,6 +324,13 @@ +@@ -317,6 +324,13 @@ char *string; { int n; @@ -109,7 +109,7 @@ if (tok[0] == '.') { /* suffix */ n = strlen(string) - strlen(tok); return (n > 0 && STR_EQ(tok, string + n)); -@@ -327,20 +341,55 @@ +@@ -327,20 +341,55 @@ char *string; } else if (tok[(n = strlen(tok)) - 1] == '.') { /* prefix */ return (STRN_EQ(tok, string, n)); } else { /* exact match */ @@ -165,7 +165,7 @@ /* * Disallow forms other than dotted quad: the treatment that inet_addr() -@@ -352,8 +401,61 @@ +@@ -352,8 +401,61 @@ char *string; return (NO); if ((net = dot_quad_addr(net_tok)) == INADDR_NONE || (mask = dot_quad_addr(mask_tok)) == INADDR_NONE) { @@ -227,9 +227,9 @@ + return YES; +} +#endif /* INET6 */ ---- inetcf.c +--- inetcf.c.orig +++ inetcf.c -@@ -26,6 +26,9 @@ +@@ -26,6 +26,9 @@ extern void exit(); * guesses. Shorter names follow longer ones. */ char *inet_files[] = { @@ -239,9 +239,9 @@ "/private/etc/inetd.conf", /* NEXT */ "/etc/inet/inetd.conf", /* SYSV4 */ "/usr/etc/inetd.conf", /* IRIX?? */ ---- misc.c +--- misc.c.orig +++ misc.c -@@ -58,9 +58,31 @@ +@@ -58,9 +58,31 @@ int delimiter; { char *cp; @@ -273,9 +273,9 @@ } /* dot_quad_addr - convert dotted quad to internal form */ ---- refuse.c +--- refuse.c.orig +++ refuse.c -@@ -25,7 +25,12 @@ +@@ -25,7 +25,12 @@ static char sccsid[] = "@(#) refuse.c 1. void refuse(request) struct request_info *request; { @@ -288,9 +288,9 @@ clean_exit(request); /* NOTREACHED */ } ---- rfc931.c +--- rfc931.c.orig +++ rfc931.c -@@ -68,20 +68,50 @@ +@@ -68,20 +68,50 @@ int sig; /* rfc931 - return remote user name, given socket structures */ void rfc931(rmt_sin, our_sin, dest) @@ -341,7 +341,7 @@ /* * Use one unbuffered stdio stream for writing to and for reading from * the RFC931 etc. server. This is done because of a bug in the SunOS -@@ -92,7 +122,11 @@ +@@ -92,7 +122,11 @@ char *dest; * sockets. */ @@ -353,7 +353,7 @@ setbuf(fp, (char *) 0); /* -@@ -112,6 +146,25 @@ +@@ -112,6 +146,25 @@ char *dest; * addresses from the query socket. */ @@ -379,7 +379,7 @@ our_query_sin = *our_sin; our_query_sin.sin_port = htons(ANY_PORT); rmt_query_sin = *rmt_sin; -@@ -121,6 +174,7 @@ +@@ -121,6 +174,7 @@ char *dest; sizeof(our_query_sin)) >= 0 && connect(fileno(fp), (struct sockaddr *) & rmt_query_sin, sizeof(rmt_query_sin)) >= 0) { @@ -387,7 +387,7 @@ /* * Send query to server. Neglect the risk that a 13-byte -@@ -129,8 +183,13 @@ +@@ -129,8 +183,13 @@ char *dest; */ fprintf(fp, "%u,%u\r\n", @@ -401,7 +401,7 @@ fflush(fp); /* -@@ -144,8 +203,13 @@ +@@ -144,8 +203,13 @@ char *dest; && ferror(fp) == 0 && feof(fp) == 0 && sscanf(buffer, "%u , %u : USERID :%*[^:]:%255s", &rmt_port, &our_port, user) == 3 @@ -415,9 +415,9 @@ /* * Strip trailing carriage return. It is part of the ---- scaffold.c +--- scaffold.c.orig +++ scaffold.c -@@ -20,6 +20,9 @@ +@@ -20,6 +20,9 @@ static char sccs_id[] = "@(#) scaffold.c #include <syslog.h> #include <setjmp.h> #include <string.h> @@ -427,7 +427,7 @@ #ifndef INADDR_NONE #define INADDR_NONE (-1) /* XXX should be 0xffffffff */ -@@ -57,6 +60,9 @@ +@@ -57,6 +60,9 @@ struct hostent *hp; /* void */ ; if ((hb = (struct hostent_block *) malloc(sizeof(struct hostent_block) @@ -437,7 +437,7 @@ + (hp->h_length + sizeof(char *)) * count)) == 0) { fprintf(stderr, "Sorry, out of memory\n"); exit(1); -@@ -66,6 +72,11 @@ +@@ -66,6 +72,11 @@ struct hostent *hp; hb->host.h_addr_list = hb->addr_list; hb->host.h_addr_list[count] = 0; data = (char *) (hb->host.h_addr_list + count + 1); @@ -449,7 +449,7 @@ for (count = 0; (addr = hp->h_addr_list[count]) != 0; count++) { hb->host.h_addr_list[count] = data + hp->h_length * count; -@@ -74,6 +85,100 @@ +@@ -74,6 +85,100 @@ struct hostent *hp; return (&hb->host); } @@ -550,7 +550,7 @@ /* find_inet_addr - find all addresses for this host, result to free() */ struct hostent *find_inet_addr(host) -@@ -91,6 +196,15 @@ +@@ -91,6 +196,15 @@ char *host; h.h_addr_list = addr_list; h.h_addr_list[0] = (char *) &addr; h.h_length = sizeof(addr); @@ -566,7 +566,7 @@ return (dup_hostent(&h)); } -@@ -104,19 +218,33 @@ +@@ -104,19 +218,33 @@ char *host; tcpd_warn("%s: not an internet address", host); return (0); } @@ -600,7 +600,7 @@ } /* check_dns - give each address thorough workout, return address count */ -@@ -125,7 +253,13 @@ +@@ -125,7 +253,13 @@ int check_dns(host) char *host; { struct request_info request; @@ -614,7 +614,7 @@ struct hostent *hp; int count; char *addr; -@@ -135,10 +269,30 @@ +@@ -135,10 +269,30 @@ char *host; request_init(&request, RQ_CLIENT_SIN, &sin, 0); sock_methods(&request); memset((char *) &sin, 0, sizeof(sin)); @@ -645,9 +645,9 @@ /* * Force host name and address conversions. Use the request structure ---- socket.c +--- socket.c.orig +++ socket.c -@@ -30,6 +30,12 @@ +@@ -30,6 +30,12 @@ static char sccsid[] = "@(#) socket.c 1. #include <syslog.h> #include <string.h> @@ -660,7 +660,7 @@ extern char *inet_ntoa(); /* Local stuff. */ -@@ -74,8 +80,13 @@ +@@ -74,8 +80,13 @@ char *name; void sock_host(request) struct request_info *request; { @@ -674,7 +674,7 @@ int len; char buf[BUFSIZ]; int fd = request->fd; -@@ -104,7 +115,11 @@ +@@ -104,7 +115,11 @@ struct request_info *request; memset(buf, 0 sizeof(buf)); #endif } @@ -686,7 +686,7 @@ /* * Determine the server binding. This is used for client username -@@ -117,7 +132,11 @@ +@@ -117,7 +132,11 @@ struct request_info *request; tcpd_warn("getsockname: %m"); return; } @@ -698,7 +698,7 @@ } /* sock_hostaddr - map endpoint address to printable form */ -@@ -125,10 +144,33 @@ +@@ -125,10 +144,33 @@ struct request_info *request; void sock_hostaddr(host) struct host_info *host; { @@ -732,7 +732,7 @@ } /* sock_hostname - map endpoint address to host name */ -@@ -136,8 +178,21 @@ +@@ -136,8 +178,21 @@ struct host_info *host; void sock_hostname(host) struct host_info *host; { @@ -754,7 +754,7 @@ int i; /* -@@ -147,11 +202,42 @@ +@@ -147,11 +202,42 @@ struct host_info *host; * have to special-case 0.0.0.0, in order to avoid false alerts from the * host name/address checking code below. */ @@ -797,7 +797,7 @@ /* * Verify that the address is a member of the address list returned -@@ -166,15 +252,53 @@ +@@ -166,15 +252,53 @@ struct host_info *host; * we're in big trouble anyway. */ @@ -851,7 +851,7 @@ } else if (STR_NE(host->name, hp->h_name) && STR_NE(host->name, "localhost")) { -@@ -198,10 +322,19 @@ +@@ -198,10 +322,19 @@ struct host_info *host; */ for (i = 0; hp->h_addr_list[i]; i++) { @@ -871,7 +871,7 @@ } /* -@@ -210,10 +343,20 @@ +@@ -210,10 +343,20 @@ struct host_info *host; * server. */ @@ -892,7 +892,7 @@ } } -@@ -223,7 +366,11 @@ +@@ -223,7 +366,11 @@ static void sock_sink(fd) int fd; { char buf[BUFSIZ]; @@ -904,9 +904,9 @@ int size = sizeof(sin); /* ---- tcpd.c +--- tcpd.c.orig +++ tcpd.c -@@ -24,6 +24,7 @@ +@@ -24,6 +24,7 @@ static char sccsid[] = "@(#) tcpd.c 1.10 #include <stdio.h> #include <syslog.h> #include <string.h> @@ -914,7 +914,7 @@ #ifndef MAXPATHNAMELEN #define MAXPATHNAMELEN BUFSIZ -@@ -120,7 +121,12 @@ +@@ -120,7 +121,12 @@ char **argv; /* Report request and invoke the real daemon program. */ @@ -927,7 +927,7 @@ closelog(); (void) execv(path, argv); syslog(LOG_ERR, "error: cannot execute %s: %m", path); ---- tcpd.h +--- tcpd.h.orig +++ tcpd.h @@ -17,7 +17,11 @@ struct host_info { @@ -941,9 +941,9 @@ struct t_unitdata *unit; /* TLI transport address or 0 */ struct request_info *request; /* for shared information */ }; ---- tcpdchk.c +--- tcpdchk.c.orig +++ tcpdchk.c -@@ -22,6 +22,9 @@ +@@ -22,6 +22,9 @@ static char sccsid[] = "@(#) tcpdchk.c 1 #include <sys/types.h> #include <sys/stat.h> @@ -953,7 +953,7 @@ #include <netinet/in.h> #include <arpa/inet.h> #include <stdio.h> -@@ -397,6 +400,26 @@ +@@ -397,6 +400,26 @@ char *pat; } } @@ -980,7 +980,7 @@ /* check_host - criticize host pattern */ static int check_host(pat) -@@ -423,14 +446,27 @@ +@@ -423,14 +446,27 @@ char *pat; #endif #endif } else if (mask = split_at(pat, '/')) { /* network/netmask */ @@ -1008,9 +1008,9 @@ } else if (NOT_INADDR(pat)) { /* internet name */ if (pat[strlen(pat) - 1] == '.') { tcpd_warn("%s: domain or host name ends in dot", pat); ---- tcpdmatch.c +--- tcpdmatch.c.orig +++ tcpdmatch.c -@@ -68,8 +68,15 @@ +@@ -68,8 +68,15 @@ char **argv; int ch; char *inetcf = 0; int count; @@ -1026,7 +1026,7 @@ struct stat st; /* -@@ -173,12 +180,35 @@ +@@ -173,12 +180,35 @@ char **argv; if ((hp = find_inet_addr(server)) == 0) exit(1); memset((char *) &server_sin, 0, sizeof(server_sin)); @@ -1062,7 +1062,7 @@ /* * Force evaluation of server host name and address. Host name -@@ -230,12 +260,35 @@ +@@ -230,12 +260,35 @@ char **argv; if ((hp = find_inet_addr(client)) == 0) exit(1); memset((char *) &client_sin, 0, sizeof(client_sin)); @@ -1098,9 +1098,9 @@ /* * Force evaluation of client host name and address. Host name ---- update.c +--- update.c.orig +++ update.c -@@ -46,10 +46,18 @@ +@@ -46,10 +46,18 @@ va_list ap; request->fd = va_arg(ap, int); continue; case RQ_CLIENT_SIN: @@ -1119,9 +1119,9 @@ continue; /* ---- workarounds.c +--- workarounds.c.orig +++ workarounds.c -@@ -166,11 +166,22 @@ +@@ -166,11 +166,22 @@ struct sockaddr *sa; int *len; { int ret; ++++++ tcp_wrappers_7.6-ipv6-fix.diff ++++++ --- /var/tmp/diff_new_pack.S1V3zq/_old 2012-04-23 16:13:56.000000000 +0200 +++ /var/tmp/diff_new_pack.S1V3zq/_new 2012-04-23 16:13:56.000000000 +0200 @@ -13,7 +13,7 @@ # November , 2002 # ================================================================================ ---- Makefile +--- Makefile.orig +++ Makefile @@ -1,5 +1,7 @@ # @(#) Makefile 1.23 97/03/21 19:27:20 @@ -23,7 +23,7 @@ what: @echo @echo "Usage: edit the REAL_DAEMON_DIR definition in the Makefile then:" -@@ -670,7 +672,7 @@ +@@ -670,7 +672,7 @@ CFLAGS = -O2 -pipe -DFACILITY=$(FACILITY LIB_OBJ= hosts_access.o options.o shell_cmd.o rfc931.o eval.o \ hosts_ctl.o refuse.o percent_x.o clean_exit.o $(AUX_OBJ) \ $(FROM_OBJ) fix_options.o socket.o tli.o workarounds.o \ @@ -32,7 +32,7 @@ FROM_OBJ= fromhost.o -@@ -683,6 +685,7 @@ +@@ -683,6 +685,7 @@ KIT = README miscd.c tcpd.c fromhost.c h tli-sequent.h misc.c diag.c ncr.c tcpdchk.c percent_m.c \ myvsyslog.c mystdarg.h printf.ck README.IRIX Banners.Makefile \ refuse.c tcpdchk.8 setenv.c inetcf.c inetcf.h scaffold.c \ @@ -40,7 +40,7 @@ scaffold.h tcpdmatch.8 README.NIS LIB = libwrap.a -@@ -812,6 +815,7 @@ +@@ -812,6 +815,7 @@ printfck: # Internal compilation dependencies. @@ -48,9 +48,9 @@ clean_exit.o: cflags clean_exit.o: tcpd.h diag.o: cflags ---- hosts_access.c +--- hosts_access.c.orig +++ hosts_access.c -@@ -85,11 +85,6 @@ +@@ -85,11 +85,6 @@ static int server_match(); static int client_match(); static int host_match(); static int string_match(); @@ -62,7 +62,7 @@ /* Size of logical line buffer. */ -@@ -308,15 +303,17 @@ +@@ -308,15 +303,17 @@ struct host_info *host; } else if (STR_EQ(tok, "LOCAL")) { /* local: no dots in name */ char *name = eval_hostname(host); return (strchr(name, '.') == 0 && HOSTNAME_KNOWN(name)); @@ -83,7 +83,7 @@ static int string_match(tok, string) char *tok; -@@ -324,13 +321,6 @@ +@@ -324,13 +321,6 @@ char *string; { int n; @@ -97,7 +97,7 @@ if (tok[0] == '.') { /* suffix */ n = strlen(string) - strlen(tok); return (n > 0 && STR_EQ(tok, string + n)); -@@ -340,122 +330,65 @@ +@@ -340,122 +330,65 @@ char *string; return (STR_NE(string, unknown)); } else if (tok[(n = strlen(tok)) - 1] == '.') { /* prefix */ return (STRN_EQ(tok, string, n)); @@ -274,7 +274,7 @@ +#endif } -#endif /* INET6 */ ---- ip6utils.c +--- /dev/null +++ ip6utils.c @@ -0,0 +1,152 @@ +#include <sys/types.h> @@ -429,7 +429,7 @@ + + return 0; +} ---- ip6utils.h +--- /dev/null +++ ip6utils.h @@ -0,0 +1,33 @@ +#ifndef IP6UTILS_H @@ -465,9 +465,9 @@ +int apply_v6_prefix (struct in6_addr *src, int prefixlen); + +#endif /* IP6UTILS_H */ ---- socket.c +--- socket.c.orig +++ socket.c -@@ -25,16 +25,12 @@ +@@ -25,16 +25,12 @@ static char sccsid[] = "@(#) socket.c 1. #include <sys/param.h> #include <sys/socket.h> #include <netinet/in.h> @@ -486,7 +486,7 @@ extern char *inet_ntoa(); -@@ -65,10 +61,10 @@ +@@ -65,10 +61,10 @@ char *name; */ if (strchr(name, '.') == 0 || strlen(name) >= MAXHOSTNAMELEN - 1) { @@ -500,7 +500,7 @@ } } -@@ -104,15 +100,15 @@ +@@ -104,15 +100,15 @@ struct request_info *request; len = sizeof(client); if (getpeername(fd, (struct sockaddr *) & client, &len) < 0) { @@ -524,7 +524,7 @@ #endif } #ifdef INET6 -@@ -129,8 +125,8 @@ +@@ -129,8 +125,8 @@ struct request_info *request; len = sizeof(server); if (getsockname(fd, (struct sockaddr *) & server, &len) < 0) { @@ -535,7 +535,7 @@ } #ifdef INET6 request->server->sin = (struct sockaddr *)&server; -@@ -150,18 +146,18 @@ +@@ -150,18 +146,18 @@ struct host_info *host; int alen; if (!sin) @@ -565,7 +565,7 @@ } host->addr[0] = '\0'; inet_ntop(sin->sa_family, ap, host->addr, sizeof(host->addr)); -@@ -169,30 +165,139 @@ +@@ -169,30 +165,139 @@ struct host_info *host; struct sockaddr_in *sin = host->sin; if (sin != 0) @@ -720,7 +720,7 @@ int i; /* -@@ -202,163 +307,76 @@ +@@ -202,163 +307,76 @@ struct host_info *host; * have to special-case 0.0.0.0, in order to avoid false alerts from the * host name/address checking code below. */ @@ -943,7 +943,7 @@ /* sock_sink - absorb unreceived IP datagram */ ---- tcpd.h +--- tcpd.h.orig +++ tcpd.h @@ -10,6 +10,8 @@ #include <sys/socket.h> ++++++ tcp_wrappers_7.6-ipv6.fix.fix.diff ++++++ --- /var/tmp/diff_new_pack.S1V3zq/_old 2012-04-23 16:13:56.000000000 +0200 +++ /var/tmp/diff_new_pack.S1V3zq/_new 2012-04-23 16:13:56.000000000 +0200 @@ -1,6 +1,6 @@ ---- hosts_access.c +--- hosts_access.c.orig +++ hosts_access.c -@@ -354,7 +354,26 @@ +@@ -354,7 +354,26 @@ char *string; /* If prefix was given, handle it */ if ((mask = split_at(token, '/')) != 0) { ++++++ tcp_wrappers_7.6-ipv6.fix.fix2.diff ++++++ --- /var/tmp/diff_new_pack.S1V3zq/_old 2012-04-23 16:13:56.000000000 +0200 +++ /var/tmp/diff_new_pack.S1V3zq/_new 2012-04-23 16:13:56.000000000 +0200 @@ -1,6 +1,6 @@ ---- hosts_access.c +--- hosts_access.c.orig +++ hosts_access.c -@@ -328,8 +328,6 @@ +@@ -328,8 +328,6 @@ char *string; return (YES); } else if (STR_EQ(tok, "KNOWN")) { /* not unknown */ return (STR_NE(string, unknown)); @@ -9,7 +9,7 @@ } else if (STR_EQ(tok, string)) /* exact match */ return (YES); #ifdef INET6 -@@ -337,11 +335,31 @@ +@@ -337,11 +335,31 @@ char *string; { /* For simplicity we convert everything to IPv6 (or v4 mapped) */ struct in6_addr pat, addr; ++++++ tcp_wrappers_7.6-multi_local_interfaces-fix.diff ++++++ --- /var/tmp/diff_new_pack.S1V3zq/_old 2012-04-23 16:13:56.000000000 +0200 +++ /var/tmp/diff_new_pack.S1V3zq/_new 2012-04-23 16:13:56.000000000 +0200 @@ -1,6 +1,6 @@ ---- socket.c +--- socket.c.orig +++ socket.c -@@ -282,7 +282,7 @@ +@@ -282,7 +282,7 @@ sock_hostname(struct host_info *host) return; } ++++++ tcp_wrappers_7.6-nonvoid.diff ++++++ --- /var/tmp/diff_new_pack.S1V3zq/_old 2012-04-23 16:13:56.000000000 +0200 +++ /var/tmp/diff_new_pack.S1V3zq/_new 2012-04-23 16:13:56.000000000 +0200 @@ -1,6 +1,6 @@ ---- fakelog.c +--- fakelog.c.orig +++ fakelog.c -@@ -16,7 +16,7 @@ +@@ -16,7 +16,7 @@ static char sccsid[] = "@(#) fakelog.c 1 /* openlog - dummy */ /* ARGSUSED */ @@ -9,7 +9,7 @@ openlog(name, logopt, facility) char *name; int logopt; -@@ -26,7 +26,7 @@ +@@ -26,7 +26,7 @@ int facility; } /* vsyslog - format one record */ @@ -18,7 +18,7 @@ vsyslog(severity, fmt, ap) int severity; char *fmt; -@@ -42,7 +42,7 @@ +@@ -42,7 +42,7 @@ va_list ap; /* syslog - format one record */ /* VARARGS */ @@ -27,7 +27,7 @@ VARARGS(syslog, int, severity) { va_list ap; -@@ -55,7 +55,7 @@ +@@ -55,7 +55,7 @@ VARARGS(syslog, int, severity) } /* closelog - dummy */ @@ -36,9 +36,9 @@ closelog() { /* void */ ---- fix_options.c +--- fix_options.c.orig +++ fix_options.c -@@ -31,7 +31,7 @@ +@@ -31,7 +31,7 @@ static char sccsid[] = "@(#) fix_options #define BUFFER_SIZE 512 /* Was: BUFSIZ */ /* fix_options - get rid of IP-level socket options */ @@ -47,9 +47,9 @@ fix_options(request) struct request_info *request; { ---- options.c +--- options.c.orig +++ options.c -@@ -541,6 +541,7 @@ +@@ -541,6 +541,7 @@ char *name; return (t->value); tcpd_jump("bad syslog facility or severity: \"%s\"", name); /* NOTREACHED */ @@ -57,9 +57,9 @@ } /* severity_option - change logging severity for this event (Dave Mitchell) */ ---- tcpd.c +--- tcpd.c.orig +++ tcpd.c -@@ -132,4 +132,5 @@ +@@ -132,4 +132,5 @@ char **argv; syslog(LOG_ERR, "error: cannot execute %s: %m", path); clean_exit(&request); /* NOTREACHED */ ++++++ tcp_wrappers_7.6-optflags.diff ++++++ --- /var/tmp/diff_new_pack.S1V3zq/_old 2012-04-23 16:13:56.000000000 +0200 +++ /var/tmp/diff_new_pack.S1V3zq/_new 2012-04-23 16:13:56.000000000 +0200 @@ -1,15 +1,15 @@ ---- Makefile +--- Makefile.orig +++ Makefile -@@ -673,7 +673,7 @@ +@@ -673,7 +673,7 @@ SHLIBFLAGS = -Lshared -lwrap shared/%.o: %.c $(CC) $(CFLAGS) $(SHCFLAGS) -c $< -o $@ -CFLAGS = -O2 -pipe -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \ -+CFLAGS = $(RPM_OPT_FLAGS) -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \ ++CFLAGS = $(RPM_OPT_FLAGS) $(shell getconf LFS_CFLAGS) -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \ $(BUGS) $(SYSTYPE) $(AUTH) $(UMASK) \ -DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" $(STYLE) $(KILL_OPT) \ -DSEVERITY=$(SEVERITY) -DRFC931_TIMEOUT=$(RFC931_TIMEOUT) \ -@@ -730,13 +730,13 @@ +@@ -730,13 +730,13 @@ $(SHLIB): $(SHLIB_OBJ) ln -s $(notdir $(SHLIBSOMAJ)) $(SHLIBSO) tcpd: tcpd.o $(SHLIB) @@ -25,7 +25,7 @@ TCPDMATCH_OBJ = tcpdmatch.o fakelog.o inetcf.o scaffold.o -@@ -744,7 +744,7 @@ +@@ -744,7 +744,7 @@ tcpdmatch: $(TCPDMATCH_OBJ) $(SHLIB) $(CC) $(CFLAGS) -o $@ $(TCPDMATCH_OBJ) $(SHLIBFLAGS) try-from: try-from.o fakelog.o $(SHLIB) ++++++ tcp_wrappers_7.6-prototypes.diff ++++++ --- /var/tmp/diff_new_pack.S1V3zq/_old 2012-04-23 16:13:56.000000000 +0200 +++ /var/tmp/diff_new_pack.S1V3zq/_new 2012-04-23 16:13:56.000000000 +0200 @@ -1,6 +1,6 @@ ---- clean_exit.c +--- clean_exit.c.orig +++ clean_exit.c -@@ -13,6 +13,8 @@ +@@ -13,6 +13,8 @@ static char sccsid[] = "@(#) clean_exit. #endif #include <stdio.h> @@ -9,9 +9,9 @@ extern void exit(); ---- hosts_access.c +--- hosts_access.c.orig +++ hosts_access.c -@@ -31,6 +31,8 @@ +@@ -31,6 +31,8 @@ static char sccsid[] = "@(#) hosts_acces #include <netinet/in.h> #include <arpa/inet.h> #include <stdio.h> @@ -20,9 +20,9 @@ #include <syslog.h> #include <ctype.h> #include <errno.h> ---- inetcf.c +--- inetcf.c.orig +++ inetcf.c -@@ -88,7 +88,7 @@ +@@ -88,7 +88,7 @@ char *conf; } else { for (i = 0; inet_files[i] && (fp = fopen(inet_files[i], "r")) == 0; i++) /* void */ ; @@ -31,7 +31,7 @@ fprintf(stderr, "Cannot find your inetd.conf or tlid.conf file.\n"); fprintf(stderr, "Please specify its location.\n"); exit(1); ---- ip6utils.c +--- ip6utils.c.orig +++ ip6utils.c @@ -2,6 +2,7 @@ #include <sys/socket.h> @@ -41,9 +41,9 @@ #include <errno.h> #include "ip6utils.h" ---- options.c +--- options.c.orig +++ options.c -@@ -41,6 +41,8 @@ +@@ -41,6 +41,8 @@ static char sccsid[] = "@(#) options.c 1 #include <netinet/in.h> #include <netdb.h> #include <stdio.h> @@ -52,9 +52,9 @@ #include <syslog.h> #include <pwd.h> #include <grp.h> ---- percent_x.c +--- percent_x.c.orig +++ percent_x.c -@@ -18,6 +18,8 @@ +@@ -18,6 +18,8 @@ static char sccsid[] = "@(#) percent_x.c #include <stdio.h> #include <syslog.h> @@ -63,9 +63,9 @@ #include <string.h> extern void exit(); ---- shell_cmd.c +--- shell_cmd.c.orig +++ shell_cmd.c -@@ -15,9 +15,13 @@ +@@ -15,9 +15,13 @@ static char sccsid[] = "@(#) shell_cmd.c /* System libraries. */ #include <sys/types.h> @@ -79,9 +79,9 @@ #include <syslog.h> #include <string.h> ---- update.c +--- update.c.orig +++ update.c -@@ -21,6 +21,7 @@ +@@ -21,6 +21,7 @@ static char sccsid[] = "@(#) update.c 1. #include <stdio.h> #include <syslog.h> ++++++ tcp_wrappers_7.6-shared-lib.diff ++++++ --- /var/tmp/diff_new_pack.S1V3zq/_old 2012-04-23 16:13:56.000000000 +0200 +++ /var/tmp/diff_new_pack.S1V3zq/_new 2012-04-23 16:13:56.000000000 +0200 @@ -1,6 +1,6 @@ ---- Makefile +--- Makefile.orig +++ Makefile -@@ -145,9 +145,9 @@ +@@ -145,9 +145,9 @@ freebsd: linux: @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ @@ -12,7 +12,7 @@ # This is good for many SYSV+BSD hybrids with NIS, probably also for HP-UX 7.x. hpux hpux8 hpux9 hpux10: -@@ -660,7 +660,18 @@ +@@ -660,7 +660,18 @@ HOSTNAME= -DALWAYS_HOSTNAME # Protection against weird shells or weird make programs. SHELL = /bin/sh @@ -32,7 +32,7 @@ CFLAGS = -O2 -pipe -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \ $(BUGS) $(SYSTYPE) $(AUTH) $(UMASK) \ -@@ -669,11 +680,16 @@ +@@ -669,11 +680,16 @@ CFLAGS = -O2 -pipe -DFACILITY=$(FACILITY $(UCHAR) $(TABLES) $(STRINGS) $(TLI) $(EXTRA_CFLAGS) $(DOT) \ $(VSYSLOG) @@ -49,7 +49,7 @@ FROM_OBJ= fromhost.o KIT = README miscd.c tcpd.c fromhost.c hosts_access.c shell_cmd.c \ -@@ -688,9 +704,8 @@ +@@ -688,9 +704,8 @@ KIT = README miscd.c tcpd.c fromhost.c h ip6utils.c ip6utils.h \ scaffold.h tcpdmatch.8 README.NIS @@ -60,7 +60,7 @@ # Invalidate all object files when the compiler options (CFLAGS) have changed. -@@ -701,33 +716,40 @@ +@@ -701,33 +716,40 @@ config-check: then rm /tmp/cflags.$$$$ ; \ else mv /tmp/cflags.$$$$ cflags ; \ fi >/dev/null 2>/dev/null @@ -113,7 +113,7 @@ shar: $(KIT) @shar $(KIT) -@@ -743,7 +765,8 @@ +@@ -743,7 +765,8 @@ archive: clean: rm -f tcpd miscd safe_finger tcpdmatch tcpdchk try-from *.[oa] core \ @@ -123,16 +123,16 @@ tidy: clean chmod -R a+r . -@@ -890,5 +913,6 @@ +@@ -890,5 +913,6 @@ update.o: cflags update.o: mystdarg.h update.o: tcpd.h vfprintf.o: cflags +weak_symbols.o: tcpd.h workarounds.o: cflags workarounds.o: tcpd.h ---- tcpd.h +--- tcpd.h.orig +++ tcpd.h -@@ -106,8 +106,14 @@ +@@ -106,8 +106,14 @@ extern unsigned long dot_quad_addr(); /* /* Global variables. */ @@ -147,7 +147,7 @@ extern char *hosts_allow_table; /* for verification mode redirection */ extern char *hosts_deny_table; /* for verification mode redirection */ extern int hosts_access_verbose; /* for verbose matching mode */ ---- weak_symbols.c +--- /dev/null +++ weak_symbols.c @@ -0,0 +1,11 @@ +/* ++++++ tcp_wrappers_7.6-shared-lib2.diff ++++++ --- /var/tmp/diff_new_pack.S1V3zq/_old 2012-04-23 16:13:56.000000000 +0200 +++ /var/tmp/diff_new_pack.S1V3zq/_new 2012-04-23 16:13:56.000000000 +0200 @@ -1,6 +1,6 @@ ---- tcpd.h +--- tcpd.h.orig +++ tcpd.h -@@ -126,10 +126,15 @@ +@@ -126,10 +126,15 @@ extern int resident; /* > 0 if residen */ #ifdef __STDC__ ++++++ tcp_wrappers_7.6-uninitialized.diff ++++++ --- /var/tmp/diff_new_pack.S1V3zq/_old 2012-04-23 16:13:56.000000000 +0200 +++ /var/tmp/diff_new_pack.S1V3zq/_new 2012-04-23 16:13:56.000000000 +0200 @@ -1,6 +1,6 @@ ---- inetcf.c +--- inetcf.c.orig +++ inetcf.c -@@ -61,7 +61,7 @@ +@@ -61,7 +61,7 @@ char *inet_cfg(conf) char *conf; { char buf[BUFSIZ]; ++++++ tcp_wrappers_7.6.diff ++++++ --- /var/tmp/diff_new_pack.S1V3zq/_old 2012-04-23 16:13:56.000000000 +0200 +++ /var/tmp/diff_new_pack.S1V3zq/_new 2012-04-23 16:13:56.000000000 +0200 @@ -1,6 +1,6 @@ ---- Makefile +--- Makefile.orig +++ Makefile -@@ -44,7 +44,7 @@ +@@ -44,7 +44,7 @@ what: #REAL_DAEMON_DIR=/usr/etc # # SysV.4 Solaris 2.x OSF AIX @@ -9,7 +9,7 @@ # # BSD 4.4 #REAL_DAEMON_DIR=/usr/libexec -@@ -143,8 +143,9 @@ +@@ -143,8 +143,9 @@ freebsd: linux: @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \ @@ -21,7 +21,7 @@ # This is good for many SYSV+BSD hybrids with NIS, probably also for HP-UX 7.x. hpux hpux8 hpux9 hpux10: -@@ -229,7 +230,7 @@ +@@ -229,7 +230,7 @@ tandem: # Amdahl UTS 2.1.5 (Richard.Richmond(a)bridge.bst.bls.com) uts215: @@ -30,7 +30,7 @@ LIBS="-lsocket" RANLIB=echo \ ARFLAGS=rv AUX_OBJ=setenv.o NETGROUP=-DNO_NETGROUP TLI= all -@@ -472,7 +473,7 @@ +@@ -472,7 +473,7 @@ BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS # If your system supports vsyslog(), comment out the following definition. # If in doubt leave it in, it won't harm. @@ -39,7 +39,7 @@ # End of the system dependencies. ################################# -@@ -491,7 +492,7 @@ +@@ -491,7 +492,7 @@ VSYSLOG = -Dvsyslog=myvsyslog # Uncomment the next definition to turn on the language extensions # (examples: allow, deny, banners, twist and spawn). # @@ -48,7 +48,7 @@ ################################################################ # Optional: Changing the default disposition of logfile records -@@ -514,7 +515,7 @@ +@@ -514,7 +515,7 @@ VSYSLOG = -Dvsyslog=myvsyslog # # The LOG_XXX names below are taken from the /usr/include/syslog.h file. @@ -57,7 +57,7 @@ # The syslog priority at which successful connections are logged. -@@ -531,7 +532,7 @@ +@@ -531,7 +532,7 @@ SEVERITY= LOG_INFO # LOG_INFO is normall # and with Solaris < 2.4. APPEND_DOT will not work with hostnames taken # from /etc/hosts or from NIS maps. It does work with DNS through NIS. # @@ -66,7 +66,7 @@ ################################################## # Optional: Always attempt remote username lookups -@@ -610,7 +611,7 @@ +@@ -610,7 +611,7 @@ TABLES = -DHOSTS_DENY=\"/etc/hosts.deny\ # Paranoid mode implies hostname lookup. In order to disable hostname # lookups altogether, see the next section. @@ -75,7 +75,7 @@ ######################################## # Optional: turning off hostname lookups -@@ -649,7 +650,7 @@ +@@ -649,7 +650,7 @@ HOSTNAME= -DALWAYS_HOSTNAME # source-routed traffic in the kernel. Examples: 4.4BSD derivatives, # Solaris 2.x, and Linux. See your system documentation for details. # @@ -84,7 +84,7 @@ ## End configuration options ############################ -@@ -659,12 +660,12 @@ +@@ -659,12 +660,12 @@ HOSTNAME= -DALWAYS_HOSTNAME SHELL = /bin/sh .c.o:; $(CC) $(CFLAGS) -c $*.c @@ -99,7 +99,7 @@ LIB_OBJ= hosts_access.o options.o shell_cmd.o rfc931.o eval.o \ hosts_ctl.o refuse.o percent_x.o clean_exit.o $(AUX_OBJ) \ ---- README.ipv6 +--- /dev/null +++ README.ipv6 @@ -0,0 +1,17 @@ +;; IPv6 patch for tcp_wrappers_7.6 1.6 @@ -119,9 +119,9 @@ +;; For Linux users: +;; If your libc doesn't have sockaddr_storage, try target `linux-old'. + ---- hosts_access.c +--- hosts_access.c.orig +++ hosts_access.c -@@ -33,6 +33,7 @@ +@@ -33,6 +33,7 @@ static char sccsid[] = "@(#) hosts_acces #include <errno.h> #include <setjmp.h> #include <string.h> @@ -129,7 +129,7 @@ extern char *fgets(); extern int errno; -@@ -89,6 +90,33 @@ +@@ -89,6 +90,33 @@ static int masked_match(); /* hosts_access - host access control facility */ @@ -163,9 +163,9 @@ int hosts_access(request) struct request_info *request; { ---- safe_finger.c +--- safe_finger.c.orig +++ safe_finger.c -@@ -31,7 +31,7 @@ +@@ -31,7 +31,7 @@ extern void exit(); /* Local stuff */ @@ -174,9 +174,9 @@ #define TIME_LIMIT 60 /* Do not keep listinging forever */ #define INPUT_LENGTH 100000 /* Do not keep listinging forever */ ---- scaffold.c +--- scaffold.c.orig +++ scaffold.c -@@ -180,10 +180,17 @@ +@@ -180,10 +180,17 @@ struct request_info *request; /* ARGSUSED */ @@ -197,7 +197,7 @@ } /* check_path - examine accessibility */ ---- tcpd.h +--- tcpd.h.orig +++ tcpd.h @@ -4,6 +4,12 @@ * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands. @@ -212,7 +212,7 @@ /* Structure to describe one communications endpoint. */ #define STRING_LENGTH 128 /* hosts, users, processes */ -@@ -61,11 +67,26 @@ +@@ -61,11 +67,26 @@ extern char paranoid[]; /* Global functions. */ #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT) @@ -239,7 +239,7 @@ extern int hosts_access(); /* access control */ extern void shell_cmd(); /* execute shell command */ extern char *percent_x(); /* do %<char> expansion */ -@@ -75,6 +96,7 @@ +@@ -75,6 +96,7 @@ extern void refuse(); /* clean up and extern char *xgets(); /* fgets() on steroids */ extern char *split_at(); /* strchr() and split */ extern unsigned long dot_quad_addr(); /* restricted inet_addr() */ @@ -247,7 +247,7 @@ /* Global variables. */ -@@ -117,28 +139,47 @@ +@@ -117,28 +139,47 @@ extern struct request_info *request_set( * host_info structures serve as caches for the lookup results. */ @@ -295,7 +295,7 @@ /* * Problem reporting interface. Additional file/line context is reported -@@ -178,42 +219,74 @@ +@@ -178,42 +219,74 @@ extern struct tcpd_context tcpd_context; * behavior. */ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0