Hello community, here is the log from the commit of package lynx checked in at Mon Nov 20 13:56:01 CET 2006. -------- --- lynx/lynx.changes 2006-10-31 16:28:37.000000000 +0100 +++ /mounts/work_src_done/STABLE/lynx/lynx.changes 2006-11-20 12:44:05.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Nov 20 12:42:37 CET 2006 - kssingvo@suse.de + +- added patch to have the 2.8.6 final version patches: + * limit files set via PERSONAL_EXTENSION_MAP and PERSONAL_MAILCAP + to be found relative to the user's home directory. + * ensure that the configured values for GLOBAL_EXTENSION_MAP and + GLOBAL_MAILCAP are absolute pathnames -TD + * modify logic for reading PERSONAL_EXTENSION_MAP and + PERSONAL_MAILCAP to ensure that they are files that are + controlled only by the user. + +------------------------------------------------------------------- New: ---- lynx-2.8.6-final_version.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lynx.spec ++++++ --- /var/tmp/diff_new_pack.iArKli/_old 2006-11-20 13:55:47.000000000 +0100 +++ /var/tmp/diff_new_pack.iArKli/_new 2006-11-20 13:55:47.000000000 +0100 @@ -12,7 +12,7 @@ Name: lynx BuildRequires: openssl-devel postfix -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Group: Productivity/Networking/Web/Browsers Provides: lynxssl web_browser Obsoletes: lynxssl @@ -20,7 +20,7 @@ Requires: xli Autoreqprov: on Version: 2.8.6_rel2 -Release: 6 +Release: 15 URL: http://lynx.isc.org Summary: A Text-Based WWW Browser Source: http://lynx.isc.org/current/lynx2.8.6rel.2.tar.bz2 @@ -29,6 +29,7 @@ Patch101: lynx-2.8.5-charset.patch Patch102: lynx-2.8.6-ipv6.patch Patch103: lynx-2.8.6-enable_xli.patch +Patch104: lynx-2.8.6-final_version.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -51,6 +52,7 @@ %patch101 -p0 %patch102 -p1 %patch103 -p1 +%patch104 -p1 # containing a few test msg's only: # rm -f po/{es,fr,it,ko,no,pl,pt}.po @@ -101,6 +103,15 @@ %doc lynx_help samples scripts %changelog -n lynx +* Mon Nov 20 2006 - kssingvo@suse.de +- added patch to have the 2.8.6 final version patches: + * limit files set via PERSONAL_EXTENSION_MAP and PERSONAL_MAILCAP + to be found relative to the user's home directory. + * ensure that the configured values for GLOBAL_EXTENSION_MAP and + GLOBAL_MAILCAP are absolute pathnames -TD + * modify logic for reading PERSONAL_EXTENSION_MAP and + PERSONAL_MAILCAP to ensure that they are files that are + controlled only by the user. * Tue Oct 31 2006 - kssingvo@suse.de - disabled color support for non-color lynx, enabled color support for lynx-color ++++++ lynx-2.8.6-final_version.patch ++++++ diff -uNr lynx2-8-6.rel2/CHANGES lynx2-8-6/CHANGES --- lynx2-8-6.rel2/CHANGES 2006-10-13 01:00:01.000000000 +0200 +++ lynx2-8-6/CHANGES 2006-11-16 01:42:22.000000000 +0100 @@ -1,6 +1,20 @@ Changes since Lynx 2.8 release =============================================================================== +2006-11-15 (2.8.6rel.4 diverges from 2.8.7dev.4) +* limit files set via PERSONAL_EXTENSION_MAP and PERSONAL_MAILCAP to be found + relative to the user's home directory. This change is less flexible than the + development version, but simpler to implement. The check to ensure that + the files are controlled by the user is retained (Redhat #214205) -TD + +2006-11-06 (2.8.6rel.3 from 2.8.7dev.2) +* ensure that the configured values for GLOBAL_EXTENSION_MAP and GLOBAL_MAILCAP + are absolute pathnames -TD +* modify logic for reading PERSONAL_EXTENSION_MAP and PERSONAL_MAILCAP to + ensure that they are files that are controlled only by the user. The + default values for these allow lynx to read configuration information + from the user's current directory at lynx's startup (Debian #396949) -TD + 2006-10-12 (2.8.6rel.2) * update version numbers in documentation -TD * change embedded URL for HTML'ized lynx.cfg to point to example in current diff -uNr lynx2-8-6.rel2/configure lynx2-8-6/configure --- lynx2-8-6.rel2/configure 2006-10-11 01:39:50.000000000 +0200 +++ lynx2-8-6/configure 2006-10-11 01:39:50.000000000 +0200 @@ -1228,7 +1228,7 @@ PACKAGE=lynx # $Format: "VERSION=$ProjectVersion$"$ -VERSION=2.8.6rel.2 +VERSION=2.8.6rel.4 test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && echo *.po|sed -e 's/\.po//g' -e 's/*//'` diff -uNr lynx2-8-6.rel2/configure.in lynx2-8-6/configure.in --- lynx2-8-6.rel2/configure.in 2006-10-11 01:39:50.000000000 +0200 +++ lynx2-8-6/configure.in 2006-10-11 01:39:50.000000000 +0200 @@ -25,7 +25,7 @@ dnl dnl ask PRCS to plug-in the project-version for the configure-script. dnl $Format: "AC_REVISION($ProjectVersion$)"$ -AC_REVISION(2.8.6rel.2) +AC_REVISION(2.8.6rel.4) # Save the original $CFLAGS so we can distinguish whether the user set those # in the environment, or whether autoconf added -O and -g options: @@ -57,7 +57,7 @@ PACKAGE=lynx dnl ask PRCS to plug-in the project-version for the packages. # $Format: "VERSION=$ProjectVersion$"$ -VERSION=2.8.6rel.2 +VERSION=2.8.6rel.4 AC_SUBST(PACKAGE) AC_SUBST(VERSION) AC_SUBST(DESTDIR) diff -uNr lynx2-8-6.rel2/lynx.cfg lynx2-8-6/lynx.cfg --- lynx2-8-6.rel2/lynx.cfg 2006-09-19 02:28:28.000000000 +0200 +++ lynx2-8-6/lynx.cfg 2006-09-19 02:28:28.000000000 +0200 @@ -3,10 +3,10 @@ # or Lynx_Dir:lynx.cfg (VMS) # # $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$ -#PRCS LYNX_VERSION "2.8.6rel.2" +#PRCS LYNX_VERSION "2.8.6rel.4" # # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$ -#PRCS LYNX_DATE "Thu, 12 Oct 2006 16:00:01 -0700" +#PRCS LYNX_DATE "Wed, 15 Nov 2006 16:42:22 -0800" # # Definition pairs are of the form VARIABLE:DEFINITION # NO spaces are allowed between the pair items. diff -uNr lynx2-8-6.rel2/src/HTInit.c lynx2-8-6/src/HTInit.c --- lynx2-8-6.rel2/src/HTInit.c 2006-10-02 21:56:53.000000000 +0200 +++ lynx2-8-6/src/HTInit.c 2006-11-16 01:42:22.000000000 +0100 @@ -153,22 +153,21 @@ SET_INTERNL("text/html", "www/present", HTMLPresent, 1.0); SET_INTERNL("text/xml", "www/present", HTMLPresent, 2.0); - /* - * These should override the default types as necessary. - */ - HTLoadTypesConfigFile(global_type_map, mediaSYS); + if (LYisAbsPath(global_type_map)) { + /* These should override the default types as necessary. */ + HTLoadTypesConfigFile(global_type_map, mediaSYS); + } /* * Load the local maps. */ - if (LYCanReadFile(personal_type_map)) { - /* These should override everything else. */ - HTLoadTypesConfigFile(personal_type_map, mediaUSR); - } else { + { char buffer[LY_MAXPATH]; LYAddPathToHome(buffer, sizeof(buffer), personal_type_map); - HTLoadTypesConfigFile(buffer, mediaUSR); + if (IsOurFile(buffer) + && LYCanReadFile(buffer)) + HTLoadTypesConfigFile(buffer, mediaUSR); } /* @@ -1332,18 +1331,21 @@ SET_SUFFIX1(".html", "text/html", "8bit"); #endif /* BUILTIN_SUFFIX_MAPS */ - /* These should override the default extensions as necessary. */ - HTLoadExtensionsConfigFile(global_extension_map); + if (LYisAbsPath(global_extension_map)) { + /* These should override the default extensions as necessary. */ + HTLoadExtensionsConfigFile(global_extension_map); + } - if (LYCanReadFile(personal_extension_map)) { - /* These should override everything else. */ - HTLoadExtensionsConfigFile(personal_extension_map); - } else { + /* + * Load the local maps. + */ + { char buffer[LY_MAXPATH]; LYAddPathToHome(buffer, sizeof(buffer), personal_extension_map); - /* These should override everything else. */ - HTLoadExtensionsConfigFile(buffer); + if (IsOurFile(buffer) + && LYCanReadFile(buffer)) + HTLoadExtensionsConfigFile(buffer); } } diff -uNr lynx2-8-6.rel2/src/LYUtils.c lynx2-8-6/src/LYUtils.c --- lynx2-8-6.rel2/src/LYUtils.c 2006-10-02 21:56:53.000000000 +0200 +++ lynx2-8-6/src/LYUtils.c 2006-11-07 02:27:15.000000000 +0100 @@ -5789,28 +5789,20 @@ } #endif -/* - * Default, for single-user systems such as Cygwin and OS/2 EMX: - */ -#define IsOurFile(name) TRUE -#define OpenHiddenFile(name, mode) fopen(name, mode) - #if defined(MULTI_USER_UNIX) - -#undef IsOurFile -#undef OpenHiddenFile - /* * Verify if this is really a file, not accessed by a link, except for the * special case of its directory being pointed to by a link from a directory * owned by root and not writable by other users. */ -static BOOL IsOurFile(const char *name) +BOOL IsOurFile(const char *name) { + BOOL result = FALSE; struct stat data; if (lstat(name, &data) == 0 && S_ISREG(data.st_mode) + && (data.st_mode & (S_IWOTH | S_IWGRP)) == 0 && data.st_nlink == 1 && data.st_uid == getuid()) { int linked = FALSE; @@ -5860,9 +5852,10 @@ } while (leaf != path); FREE(path); #endif - return !linked; + result = !linked; } - return FALSE; + CTRACE2(TRACE_CFG, (tfp, "IsOurFile(%s) %d\n", name, result)); + return result; } /* @@ -5922,6 +5915,8 @@ } return fp; } +#else +#define OpenHiddenFile(name, mode) fopen(name, mode) #endif /* MULTI_USER_UNIX */ FILE *LYNewBinFile(const char *name) diff -uNr lynx2-8-6.rel2/src/LYUtils.h lynx2-8-6/src/LYUtils.h --- lynx2-8-6.rel2/src/LYUtils.h 2005-10-17 02:17:20.000000000 +0200 +++ lynx2-8-6/src/LYUtils.h 2006-11-07 02:27:15.000000000 +0100 @@ -196,6 +196,12 @@ extern void statusline(const char *text); extern void toggle_novice_line(void); +#if defined(MULTI_USER_UNIX) + extern BOOL IsOurFile(const char *name); +#else +#define IsOurFile(name) TRUE +#endif + #ifdef EXP_ASCII_CTYPES extern int ascii_tolower(int i); extern int ascii_toupper(int i); diff -uNr lynx2-8-6.rel2/userdefs.h lynx2-8-6/userdefs.h --- lynx2-8-6.rel2/userdefs.h 2004-12-30 13:11:59.000000000 +0100 +++ lynx2-8-6/userdefs.h 2004-12-30 13:11:59.000000000 +0100 @@ -1360,11 +1360,11 @@ * the version definition with the Project Version on checkout. Just * ignore it. - kw */ /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */ -#define LYNX_VERSION "2.8.6rel.2" +#define LYNX_VERSION "2.8.6rel.4" #define LYNX_WWW_HOME "http://lynx.isc.org/" #define LYNX_WWW_DIST "http://lynx.isc.org/current/" /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */ -#define LYNX_DATE "Thu, 12 Oct 2006 16:00:01 -0700" +#define LYNX_DATE "Wed, 15 Nov 2006 16:42:22 -0800" #define LYNX_DATE_OFF 5 /* truncate the automatically-generated date */ #define LYNX_DATE_LEN 11 /* truncate the automatically-generated date */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org