Hello community, here is the log from the commit of package slang for openSUSE:Factory checked in at 2012-05-26 13:06:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/slang (Old) and /work/SRC/openSUSE:Factory/.slang.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "slang", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/slang/slang.changes 2012-02-14 19:08:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.slang.new/slang.changes 2012-05-26 13:07:04.000000000 +0200 @@ -1,0 +2,14 @@ +Thu May 24 13:27:53 UTC 2012 - [email protected] + +- update to version 2.2.4 + - numerous changes, see the included changes.txt for a detailed + list +- rebased slang-2.2.2.dif and renamed to slang.patch +- rebased slang-2.2.2-autoconf.dif and renamed to + slang-autoconf.patch +- rebased slang-2.2.2-libpng12-linker-flag.patch and renamed to + slang-libpng12-linker-flag.patch +- rebased slang-2.2.2-fsuid.dif and renamed to slang-fsuid.patch +- build oniguruma module on >= 12.1 + +------------------------------------------------------------------- Old: ---- slang-2.2.2-autoconf.dif slang-2.2.2-fsuid.dif slang-2.2.2-libpng12-linker-flag.patch slang-2.2.2.dif slang-2.2.2.tar.bz2 New: ---- slang-2.2.4.tar.bz2 slang-autoconf.patch slang-fsuid.patch slang-libpng12-linker-flag.patch slang.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ slang.spec ++++++ --- /var/tmp/diff_new_pack.hAz6Wz/_old 2012-05-26 13:07:06.000000000 +0200 +++ /var/tmp/diff_new_pack.hAz6Wz/_new 2012-05-26 13:07:06.000000000 +0200 @@ -16,29 +16,31 @@ # - Name: slang -License: GPL-2.0+ -Group: System/Libraries -Version: 2.2.2 +Version: 2.2.4 Release: 0 Summary: Programming Library and Embeddable Extansion Language +License: GPL-2.0+ +Group: System/Libraries Url: http://www.jedsoft.org/ Source: ftp://space.mit.edu/pub/davis/slang/v2.2/slang-%{version}.tar.bz2 Source2: baselibs.conf -Patch: slang-2.2.2.dif -Patch4: slang-2.2.2-autoconf.dif -Patch5: slang-2.2.2-fsuid.dif -Patch8: slang-2.2.2-makefile.patch -Patch9: slang-2.2.2-libpng12-linker-flag.patch -# BuildRequires: oniguruma-devel >= 5.9.0 +Patch0: slang.patch +Patch1: slang-autoconf.patch +Patch2: slang-fsuid.patch +Patch3: slang-2.2.2-makefile.patch +Patch4: slang-libpng12-linker-flag.patch +%if 0%{?suse_version} >= 1210 +BuildRequires: oniguruma-devel >= 5.9.0 +%endif BuildRequires: pcre-devel %if 0%{?suse_version} > 1120 BuildRequires: libpng12-devel %else BuildRequires: libpng-devel %endif -BuildRequires: automake pkgconfig +BuildRequires: automake +BuildRequires: pkgconfig BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -69,6 +71,7 @@ %package -n libslang2 Summary: Programming Library and Embeddable Extension Language +Group: System/Libraries %description -n libslang2 S-Lang is a multi-platform programming library designed to allow a developer to @@ -104,11 +107,11 @@ %prep %setup -q -%patch -p1 +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +#%%patch3 -p1 %patch4 -p1 -%patch5 -p1 -#%patch8 -p1 -%patch9 -p1 %build mv autoconf/configure.ac . ++++++ slang-2.2.2.tar.bz2 -> slang-2.2.4.tar.bz2 ++++++ ++++ 96377 lines of diff (skipped) ++++++ slang-autoconf.patch ++++++ Index: slang-2.2.4/autoconf/aclocal.m4 =================================================================== --- slang-2.2.4.orig/autoconf/aclocal.m4 +++ slang-2.2.4/autoconf/aclocal.m4 @@ -331,8 +331,11 @@ then if test -n "$gcc_warnings" then CFLAGS="$CFLAGS -Wall -W -pedantic -Winline -Wmissing-prototypes \ - -Wnested-externs -Wpointer-arith -Wcast-align -Wshadow -Wstrict-prototypes \ - -Wformat=2" + -Wnested-externs -Wpointer-arith -Wcast-align -Wshadow -Wstrict-prototypes \ + -Wformat -Wformat-security" + ELF_CFLAGS="$ELF_CFLAGS -Wall -W -pedantic -Winline -Wmissing-prototypes \ + -Wnested-externs -Wpointer-arith -Wcast-align -Wshadow -Wstrict-prototypes \ + -Wformat -Wformat-security" # Now trim excess whitespace CFLAGS=`echo $CFLAGS` fi @@ -545,7 +548,7 @@ dnl # Check for dynamic linker dnl #------------------------------------------------------------------------- DYNAMIC_LINK_LIB="" -dnl# AH_TEMPLATE([HAVE_DLOPEN],1,[Define if you have dlopen]) +AH_TEMPLATE([HAVE_DLOPEN],1,[Define if you have dlopen]) AC_CHECK_HEADER(dlfcn.h,[ AC_DEFINE(HAVE_DLFCN_H,1,[Define if you have the dlfcn.h header]) @@ -586,7 +589,7 @@ case "$host_os" in *linux*|*gnu*|k*bsd*-gnu ) DYNAMIC_LINK_FLAGS="-Wl,-export-dynamic" ELF_CC="\$(CC)" - ELF_CFLAGS="\$(CFLAGS) -fPIC" + ELF_CFLAGS="$ELF_CFLAGS -fPIC" ELF_LINK="\$(CC) \$(LDFLAGS) -shared -Wl,-O1 -Wl,--version-script,\$(VERSION_SCRIPT) -Wl,-soname,\$(ELFLIB_MAJOR)" ELF_DEP_LIBS="\$(DL_LIB) -lm -lc" CC_SHARED="\$(CC) \$(CFLAGS) -shared -fPIC" Index: slang-2.2.4/autoconf/configure.ac =================================================================== --- slang-2.2.4.orig/autoconf/configure.ac +++ slang-2.2.4/autoconf/configure.ac @@ -17,6 +17,62 @@ dnl# fi AC_CONFIG_AUX_DIR(autoconf) AC_CANONICAL_HOST +AH_TOP([ +/* -*- c -*- */ +/* Note: this is for unix only. */ + +#ifndef SL_CONFIG_H +#define SL_CONFIG_H +]) + +AH_BOTTOM([ +#if defined(HAVE_SIGADDSET) && defined(HAVE_SIGEMPTYSET) +# if defined(HAVE_SIGACTION) && defined(HAVE_SIGPROCMASK) +# define SLANG_POSIX_SIGNALS +# endif +#endif + +/* Define if you need to in order for stat and other things to work. */ +#undef _POSIX_SOURCE + +#ifdef _AIX +# ifndef _POSIX_SOURCE +# define _POSIX_SOURCE 1 +# endif +# ifndef _ALL_SOURCE +# define _ALL_SOURCE +# endif +/* This may generate warnings but the fact is that without it, xlc will + * INCORRECTLY inline many str* functions. */ +# undef __STR__ +#endif + +/* define USE_TERMCAP if you want to use it instead of terminfo. */ +#if defined(sequent) || defined(NeXT) +# ifndef USE_TERMCAP +# define USE_TERMCAP +# endif +#endif + +#if defined(ultrix) && !defined(__GNUC__) +# ifndef NO_PROTOTYPES +# define NO_PROTOTYPES +# endif +#endif + +#ifndef unix +# define unix 1 +#endif + +#ifndef __unix__ +# define __unix__ 1 +#endif + +#define _SLANG_SOURCE_ 1 +#endif /* SL_CONFIG_H */ +]) + + JD_INIT JD_ANSI_CC @@ -262,7 +318,7 @@ else fi AC_SUBST(ZLIB_MODULE) -m4_include([./iconv.m4]) +dnl m4_include([./iconv.m4]) ICONV_MODULE="" JD_CHECK_FOR_LIBRARY(iconv) ++++++ slang-fsuid.patch ++++++ Index: slang-2.2.4/autoconf/configure.ac =================================================================== --- slang-2.2.4.orig/autoconf/configure.ac +++ slang-2.2.4/autoconf/configure.ac @@ -154,9 +154,18 @@ sys/socket.h \ netinet/in.h \ arpa/inet.h \ sys/un.h \ +sys/fsuid.h \ sys/resource.h \ ) +AC_CHECK_FUNCS(setfsuid setfsgid) + +if test "${ac_cv_func_setfsuid}" != "yes" || test "${ac_cv_func_setfsgid}" != "yes"; then + AC_MSG_ERROR([ +*** setfsguid and setfsgid cannot be found!!! + These are needed to support setuid/setgid applications ***]) +fi + AC_TYPE_MODE_T AC_TYPE_PID_T AC_TYPE_UID_T Index: slang-2.2.4/src/config.hin =================================================================== --- slang-2.2.4.orig/src/config.hin +++ slang-2.2.4/src/config.hin @@ -188,6 +188,8 @@ #undef HAVE_SYS_UN_H #undef socklen_t +#undef HAVE_SYS_FSUID_H +#undef HAVE_SETFSUID #undef HAVE_CONFSTR #undef HAVE_SYSCONF #undef HAVE_PATHCONF Index: slang-2.2.4/src/slinclud.h =================================================================== --- slang-2.2.4.orig/src/slinclud.h +++ slang-2.2.4/src/slinclud.h @@ -30,4 +30,8 @@ # include <memory.h> #endif +#ifdef HAVE_SYS_FSUID_H +# include <sys/fsuid.h> +#endif + #endif /* _SLANG_INCLUDE_H_ */ Index: slang-2.2.4/src/sltermin.c =================================================================== --- slang-2.2.4.orig/src/sltermin.c +++ slang-2.2.4/src/sltermin.c @@ -23,6 +23,9 @@ Foundation, Inc., 59 Temple Place - Suit USA. */ +#include <unistd.h> +#include <sys/types.h> + #include "slinclud.h" #include "slang.h" @@ -119,7 +122,32 @@ static FILE *open_terminfo (char *file, * I will also look into the use of setreuid, seteuid and setregid, setegid. * FIXME: Priority=medium */ + /* If your system lacks setfsuid/getfsuid either write + equivalent support or dont use slang to build setuid/setgid + apps like Mutt */ + + if(setfsuid(getuid())==-1) + { + perror("setfsuid"); + return NULL; + } + if(setfsgid(getgid())==-1) + { + perror("setfsgid"); + return NULL; + } fp = fopen (file, "rb"); + if(setfsuid(geteuid())==-1) + { + perror("setfsuid"); + return NULL; + } + if(setfsgid(getegid())==-1) + { + perror("setfsgid"); + return NULL; + } + if (fp == NULL) return NULL; if ((12 == fread ((char *) buf, 1, 12, fp) && (MAGIC == make_integer (buf)))) ++++++ slang-libpng12-linker-flag.patch ++++++ Index: slang-2.2.4/modules/Makefile.in =================================================================== --- slang-2.2.4.orig/modules/Makefile.in +++ slang-2.2.4/modules/Makefile.in @@ -35,7 +35,7 @@ PCRE_LIB = @PCRE_LIB@ -lpcre # If building the PNG module, you may need to set these #--------------------------------------------------------------------------- PNG_INC = @PNG_INC@ -PNG_LIB = @PNG_LIB@ -lpng +PNG_LIB = @PNG_LIB@ -lpng12 #--------------------------------------------------------------------------- # If building the ICONV module, you may need to set these #--------------------------------------------------------------------------- ++++++ slang-2.2.2-libpng12-linker-flag.patch -> slang.patch ++++++ --- /work/SRC/openSUSE:Factory/slang/slang-2.2.2-libpng12-linker-flag.patch 2011-09-23 12:46:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.slang.new/slang.patch 2012-05-26 13:07:04.000000000 +0200 @@ -1,12 +1,39 @@ -diff -urN slang-2.2.2.orig/modules/Makefile.in slang-2.2.2/modules/Makefile.in ---- slang-2.2.2.orig/modules/Makefile.in 2009-12-05 20:03:51.000000000 +0100 -+++ slang-2.2.2/modules/Makefile.in 2010-08-14 20:40:22.000000000 +0200 -@@ -33,7 +33,7 @@ - # If building the PNG module, you may need to set these - #--------------------------------------------------------------------------- - PNG_INC = @PNG_INC@ --PNG_LIB = @PNG_LIB@ -lpng -+PNG_LIB = @PNG_LIB@ -lpng12 - #--------------------------------------------------------------------------- - # If building the ICONV module, you may need to set these - #--------------------------------------------------------------------------- +Index: slang-2.2.4/src/sldisply.c +=================================================================== +--- slang-2.2.4.orig/src/sldisply.c ++++ slang-2.2.4/src/sldisply.c +@@ -2609,6 +2609,13 @@ int SLtt_initialize (SLFUTURE_CONST char + Start_Abs_Cursor_Addressing_Mode = tt_tgetstr ("ti"); + End_Abs_Cursor_Addressing_Mode = tt_tgetstr ("te"); + ++# ifndef USE_TERMCAP ++ /* Use the given terminal specification of the terminfo entries ++ * even if we have almost vtxxx. ++ */ ++ Keypad_Init_Str = SLtt_tgetstr ("ks"); ++ Keypad_Reset_Str = SLtt_tgetstr ("ke"); ++# else + /* If I do this for vtxxx terminals, arrow keys start sending ESC O A, + * which I do not want. This is mainly for HP terminals. + */ +@@ -2626,6 +2633,7 @@ int SLtt_initialize (SLFUTURE_CONST char + if (Del_N_Lines_Str == NULL) Del_N_Lines_Str = "\033[%dM"; + if (Add_N_Lines_Str == NULL) Add_N_Lines_Str = "\033[%dL"; + } ++#endif + + Scroll_R_Str = tt_tgetstr("cs"); + +@@ -2808,10 +2816,12 @@ int SLtt_initialize (SLFUTURE_CONST char + /* specific to vtxxx only */ + void SLtt_enable_cursor_keys (void) + { ++#if 0 + #ifdef __unix__ + if (Vt100_Like) + #endif + tt_write_string("\033=\033[?1l"); ++#endif + } + + #ifdef VMS -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
