Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package readline6 for openSUSE:Factory checked in at 2025-01-28 15:00:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/readline6 (Old) and /work/SRC/openSUSE:Factory/.readline6.new.2316 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "readline6" Tue Jan 28 15:00:04 2025 rev:5 rq:1240810 version:6.3 Changes: -------- --- /work/SRC/openSUSE:Factory/readline6/readline6.changes 2024-02-23 16:47:44.804596028 +0100 +++ /work/SRC/openSUSE:Factory/.readline6.new.2316/readline6.changes 2025-01-28 15:00:52.502265970 +0100 @@ -1,0 +2,13 @@ +Tue Jan 28 12:13:59 UTC 2025 - Dr. Werner Fink <[email protected]> + +- Rename readline-6.2-endpw.dif to readline-6.2-endpw.nodif + +------------------------------------------------------------------- +Tue Jan 14 13:11:11 UTC 2025 - Dominique Leuenberger <[email protected]> + +- Fix escaping of commented out patch: with RPM 4.20, %patch + becomes a standard, expandable macro, that can span more than one + line. Commenting out with #%patch can thus lead to invalid + results. + +------------------------------------------------------------------- Old: ---- readline-6.2-endpw.dif New: ---- readline-6.2-endpw.nodif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ readline6.spec ++++++ --- /var/tmp/diff_new_pack.1IpFGc/_old 2025-01-28 15:00:52.994286310 +0100 +++ /var/tmp/diff_new_pack.1IpFGc/_new 2025-01-28 15:00:52.998286476 +0100 @@ -1,7 +1,7 @@ # # spec file for package readline6 # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -42,7 +42,7 @@ Patch22: readline-6.1-wrap.patch Patch23: readline-5.2-conf.patch Patch24: readline-6.2-metamode.patch -Patch25: readline-6.2-endpw.dif +Source25: readline-6.2-endpw.nodif Patch27: readline-6.2-xmalloc.dif Patch30: readline-6.3-destdir.patch Patch31: readline-6.3-rltrace.patch @@ -103,7 +103,7 @@ %patch -P 22 -p2 -b .wrap %patch -P 23 -p2 -b .conf %patch -P 24 -p2 -b .metamode -#%patch -P 25 -p2 -b .endpw +#%%patch -P 25 -p2 -b .endpw %patch -P 31 -p2 -b .tmp %patch -P 27 -p0 -b .xm %patch -P 30 -p0 -b .destdir ++++++ readline-6.2-endpw.nodif ++++++ --- lib/readline/complete.c +++ lib/readline/complete.c 2011-11-21 12:51:35.695646715 +0000 @@ -83,6 +83,7 @@ typedef int QSFUNC (); defined. */ #if defined (HAVE_GETPWENT) && (!defined (HAVE_GETPW_DECLS) || defined (_POSIX_SOURCE)) extern struct passwd *getpwent PARAMS((void)); +extern void endpwent (); #endif /* HAVE_GETPWENT && (!HAVE_GETPW_DECLS || _POSIX_SOURCE) */ /* If non-zero, then this is the address of a function to call when @@ -2068,6 +2069,9 @@ rl_username_completion_function (text, s if (first_char == '~') rl_filename_completion_desired = 1; +#if defined (HAVE_GETPWENT) + /* endpwent (); */ +#endif return (value); } #endif /* !__WIN32__ && !__OPENNT */ --- lib/readline/shell.c +++ lib/readline/shell.c 2011-11-21 13:08:46.343647023 +0000 @@ -61,9 +61,18 @@ #include "rlshell.h" #include "xmalloc.h" -#if defined (HAVE_GETPWUID) && !defined (HAVE_GETPW_DECLS) +#if !defined (HAVE_GETPW_DECLS) +# if defined (HAVE_GETPWUID) extern struct passwd *getpwuid PARAMS((uid_t)); -#endif /* HAVE_GETPWUID && !HAVE_GETPW_DECLS */ +# endif +# if defined (HAVE_GETPWENT) +extern void endpwent (); +# endif +#endif /* !HAVE_GETPW_DECLS */ + +#if !defined (savestring) +# define savestring(x) strcpy ((char *)xmalloc (1 + strlen (x)), (x)) +#endif /* !savestring */ #ifndef NULL # define NULL 0 @@ -159,15 +168,20 @@ sh_get_env_value (varname) char * sh_get_home_dir () { - char *home_dir; + static char *home_dir; struct passwd *entry; - home_dir = (char *)NULL; + if (home_dir) + goto out; #if defined (HAVE_GETPWUID) entry = getpwuid (getuid ()); if (entry) - home_dir = entry->pw_dir; + home_dir = savestring(entry->pw_dir); #endif +#if defined (HAVE_GETPWENT) + endpwent (); +#endif +out: return (home_dir); } --- lib/readline/tilde.c +++ lib/readline/tilde.c 2011-11-11 13:09:49.000000000 +0000 @@ -61,6 +61,7 @@ extern struct passwd *getpwuid PARAMS((u # endif # if defined (HAVE_GETPWNAM) extern struct passwd *getpwnam PARAMS((const char *)); +extern void endpwent (); # endif #endif /* !HAVE_GETPW_DECLS */
