Hello community,
here is the log from the commit of package slang
checked in at Wed Jul 11 16:55:44 CEST 2007.
--------
--- slang/slang.changes 2007-05-28 17:22:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/slang/slang.changes 2007-07-11 14:15:33.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Jul 11 14:08:17 CEST 2007 - nadvornik@suse.cz
+
+- updated to 2.1.1:
+ * interpereter syntax enhancements
+ * many bugfixes
+- fixed some rpmlint warnings
+
+-------------------------------------------------------------------
Old:
----
slang-2.0.5-autoconf.dif
slang-2.0.5.dif
slang-2.0.5-format.patch
slang-2.0.5-fsuid.dif
slang-2.0.5-locale.patch
slang-2.0.5-slsh.dif
slang-2.0.5.tar.bz2
slang-2.0.5-write_string_with_care.patch
New:
----
slang-2.1.1-autoconf.dif
slang-2.1.1.dif
slang-2.1.1-format.patch
slang-2.1.1-fsuid.dif
slang-2.1.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ slang.spec ++++++
--- /var/tmp/diff_new_pack.D28241/_old 2007-07-11 16:54:32.000000000 +0200
+++ /var/tmp/diff_new_pack.D28241/_new 2007-07-11 16:54:32.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package slang (Version 2.0.5)
+# spec file for package slang (Version 2.1.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,10 +11,10 @@
# norootforbuild
Name: slang
-License: Artistic License, GNU General Public License (GPL)
+License: Artistic License, GPL v2 or later
Group: System/Libraries
-Version: 2.0.5
-Release: 50
+Version: 2.1.1
+Release: 1
Provides: slang%{version}
Autoreqprov: on
Summary: A Library for Display Control
@@ -22,12 +22,9 @@
Source: ftp://space.mit.edu/pub/davis/slang/v2.0/slang-%{version}.tar.bz2
Source1: slangdoc-2.0.4.tar.bz2
Patch: slang-%{version}.dif
-Patch1: slang-%{version}-slsh.dif
Patch4: slang-%{version}-autoconf.dif
Patch5: slang-%{version}-fsuid.dif
-Patch6: slang-%{version}-write_string_with_care.patch
Patch7: slang-%{version}-format.patch
-Patch8: slang-%{version}-locale.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%package devel
Provides: slang:/usr/include/slang.h
@@ -61,20 +58,16 @@
%prep
%setup -n slang-%{version} -a 1
%patch
-%patch1
%patch4
%patch5
-%patch6
%patch7
-%patch8
+
+%build
mv autoconf/configure.ac .
mv autoconf/aclocal.m4 autoconf/acinclude.m4
-%{?suse_update_config:%{suse_update_config -f autoconf}}
-autoheader -I autoconf
+#autoheader -I autoconf
aclocal -I autoconf --output=autoconf/aclocal.m4
autoconf -I autoconf
-
-%build
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fstack-protector"
export ELF_CFLAGS="$CFLAGS"
./configure --prefix=/usr --enable-wide-chars \
@@ -82,13 +75,13 @@
--sysconfdir=/etc \
--mandir=%{_mandir} \
--enable-warnings
-make elf
+make static
make
%install
rm -rf "$RPM_BUILD_ROOT"
mkdir "$RPM_BUILD_ROOT"
-make DESTDIR="$RPM_BUILD_ROOT" install install-elf install-links
+make DESTDIR="$RPM_BUILD_ROOT" install install-static install-links
#make runtests
cd doc
ln -s slangdoc.html index.html
@@ -96,6 +89,8 @@
make clean
cd ../slsh
make clean
+cd ..
+mv slsh examples/
rm -rf $RPM_BUILD_ROOT/usr/share/doc/slang
rm -f /doc/tm/tools/{solarisobjs,i686objs}
@@ -118,14 +113,19 @@
%files devel
%defattr(-,root,root)
/usr/include/*
-%{_libdir}/lib*.*a
+%{_libdir}/lib*.a
%{_libdir}/lib*.so
-%doc doc/* demo examples modules slsh
+%doc doc/* demo examples modules
%clean
rm -rf "$RPM_BUILD_ROOT"
%changelog
+* Wed Jul 11 2007 - nadvornik@suse.cz
+- updated to 2.1.1:
+ * interpereter syntax enhancements
+ * many bugfixes
+- fixed some rpmlint warnings
* Mon May 28 2007 - nadvornik@suse.cz
- do not package binaries in documentation directory
* Tue Jan 31 2006 - nadvornik@suse.cz
++++++ slang-2.0.5-autoconf.dif -> slang-2.1.1-autoconf.dif ++++++
--- slang/slang-2.0.5-autoconf.dif 2005-11-29 20:43:02.000000000 +0100
+++ /mounts/work_src_done/STABLE/slang/slang-2.1.1-autoconf.dif 2007-07-10 14:19:23.000000000 +0200
@@ -1,6 +1,6 @@
--- autoconf/aclocal.m4
+++ autoconf/aclocal.m4
-@@ -296,18 +296,18 @@
+@@ -306,18 +306,18 @@
AC_DEFUN(JD_GCC_WARNINGS, dnl#{{{
[
AC_ARG_ENABLE(warnings,
@@ -29,7 +29,7 @@
fi
])
-@@ -470,7 +470,7 @@
+@@ -480,7 +480,7 @@
done
if test "$TERMCAP"; then
AC_MSG_RESULT(no)
@@ -38,7 +38,7 @@
fi
AC_SUBST(TERMCAP)dnl
AC_SUBST(MISC_TERMINFO_DIRS)dnl
-@@ -496,7 +496,7 @@
+@@ -506,7 +506,7 @@
yes
#endif
], [
@@ -47,7 +47,7 @@
if test "$CC" = cc; then CC="cc -Ae"; fi
])dnl
dnl
-@@ -520,8 +520,11 @@
+@@ -530,8 +530,11 @@
dnl # Check for dynamic linker
dnl #-------------------------------------------------------------------------
DYNAMIC_LINK_LIB=""
@@ -60,7 +60,7 @@
AC_CHECK_LIB(dl,dlopen,[
DYNAMIC_LINK_LIB="-ldl"
AC_DEFINE(HAVE_DLOPEN)
-@@ -550,7 +553,7 @@
+@@ -562,7 +565,7 @@
*linux*|*gnu*|k*bsd*-gnu )
DYNAMIC_LINK_FLAGS="-Wl,-export-dynamic"
ELF_CC="\$(CC)"
@@ -134,9 +134,13 @@
JD_INIT
JD_ANSI_CC
-@@ -90,13 +146,13 @@
-
- dnl JD_HAVE_ISINF
+@@ -112,16 +168,16 @@
+ ])
+ if test $jd_cv_nl_langinfo_codeset = yes
+ then
+- AC_DEFINE(HAVE_NL_LANGINFO_CODESET, 1)
++ AC_DEFINE(HAVE_NL_LANGINFO_CODESET, 1, [Define to 1 if you have the nl_langinfo(CODESET) function])
+ fi
-AC_CHECK_LIB(m, acosh, [AC_DEFINE(HAVE_ACOSH)])
-AC_CHECK_LIB(m, asinh, [AC_DEFINE(HAVE_ASINH)])
@@ -155,7 +159,7 @@
JD_ELF_COMPILER
JD_IEEE_CFLAGS
-@@ -124,7 +180,7 @@
+@@ -149,7 +205,7 @@
if test $jd_with_pcre_library = yes
then
PCRE_MODULE="pcre-module.so"
@@ -164,7 +168,16 @@
else
PCRE_MODULE=""
fi
-@@ -134,7 +190,7 @@
+@@ -159,7 +215,7 @@
+ if test $jd_with_onig_library = yes
+ then
+ ONIG_MODULE="onig-module.so"
+- AC_DEFINE(HAVE_ONIGURUMA_H)
++ AC_DEFINE(HAVE_ONIGURUMA_H,1,[Define to 1 if you have the oniguruma.h header])
+ else
+ ONIG_MODULE=""
+ fi
+@@ -169,20 +225,20 @@
if test $jd_with_png_library = yes
then
PNG_MODULE="png-module.so"
@@ -173,3 +186,18 @@
else
PNG_MODULE=""
fi
+ AC_SUBST(PNG_MODULE)
+
+-m4_include([./iconv.m4])
++dnl m4_include([./iconv.m4])
+
+ ICONV_MODULE=""
+ JD_CHECK_FOR_LIBRARY(iconv)
+ if test $jd_with_iconv_library = yes
+ then
+ ICONV_MODULE="iconv-module.so"
+- AC_DEFINE(HAVE_ICONV_H)
++ AC_DEFINE(HAVE_ICONV_H, 1, [Define to 1 if you have the iconv library])
+ ICONV_LIB="$ICONV_LIB -liconv"
+ else
+ SLANG_AM_ICONV
++++++ slang-2.0.5-autoconf.dif -> slang-2.1.1.dif ++++++
--- slang/slang-2.0.5-autoconf.dif 2005-11-29 20:43:02.000000000 +0100
+++ /mounts/work_src_done/STABLE/slang/slang-2.1.1.dif 2002-09-23 11:12:27.000000000 +0200
@@ -1,175 +1,72 @@
---- autoconf/aclocal.m4
-+++ autoconf/aclocal.m4
-@@ -296,18 +296,18 @@
- AC_DEFUN(JD_GCC_WARNINGS, dnl#{{{
- [
- AC_ARG_ENABLE(warnings,
-- [ --enable-warnings turn on GCC compiler warnings],
-+ AC_HELP_STRING([--enable-warnings],[turn on GCC compiler warnings]),
- [gcc_warnings=$enableval])
--if test -n "$GCC"
-+if test -n "$GCC" && test -n "$gcc_warnings"
- then
-- #CFLAGS="$CFLAGS -fno-strength-reduce"
-- if test -n "$gcc_warnings"
-- then
-- CFLAGS="$CFLAGS -Wall -W -pedantic -Winline -Wmissing-prototypes \
-- -Wnested-externs -Wpointer-arith -Wcast-align -Wshadow -Wstrict-prototypes"
-- # Now trim excess whitespace
-- CFLAGS=`echo $CFLAGS`
-- fi
-+ CFLAGS="$CFLAGS -Wall -W -pedantic -Winline -Wmissing-prototypes \
-+ -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
- ])
+--- src/sldisply.c
++++ src/sldisply.c
+@@ -2156,6 +2156,13 @@
+ Term_Init_Str = SLtt_tgetstr ("ti");
+ Term_Reset_Str = SLtt_tgetstr ("te");
-@@ -470,7 +470,7 @@
- done
- if test "$TERMCAP"; then
- AC_MSG_RESULT(no)
-- AC_DEFINE(USE_TERMCAP)
-+ AC_DEFINE(USE_TERMCAP,1,[Define to use termcap])
- fi
- AC_SUBST(TERMCAP)dnl
- AC_SUBST(MISC_TERMINFO_DIRS)dnl
-@@ -496,7 +496,7 @@
- yes
- #endif
- ], [
--AC_DEFINE(_HPUX_SOURCE)
-+AC_DEFINE(_HPUX_SOURCE,1,[Special define needed for HPUX])
- if test "$CC" = cc; then CC="cc -Ae"; fi
- ])dnl
- dnl
-@@ -520,8 +520,11 @@
- dnl # Check for dynamic linker
- dnl #-------------------------------------------------------------------------
- DYNAMIC_LINK_LIB=""
-+
-+AH_TEMPLATE([HAVE_DLOPEN],[Define if you have dlopen])
-+
- AC_CHECK_HEADER(dlfcn.h,[
-- AC_DEFINE(HAVE_DLFCN_H)
-+ AC_DEFINE(HAVE_DLFCN_H,1,[Define if you have the dlfcn.h header])
- AC_CHECK_LIB(dl,dlopen,[
- DYNAMIC_LINK_LIB="-ldl"
- AC_DEFINE(HAVE_DLOPEN)
-@@ -550,7 +553,7 @@
- *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"
---- autoconf/configure.ac
-+++ autoconf/configure.ac
-@@ -17,6 +17,62 @@
- 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
++ /* 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.
+ */
+@@ -2164,6 +2171,7 @@
+ Keypad_Init_Str = SLtt_tgetstr ("ks");
+ Keypad_Reset_Str = SLtt_tgetstr ("ke");
+ }
++#endif
+
+ /* Make up for defective termcap/terminfo databases */
+ if ((Vt100_Like && (term[2] != '1'))
+@@ -2351,10 +2359,12 @@
+ /* 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
-+
-+#define _SLANG_SOURCE_ 1
-+#endif /* SL_CONFIG_H */
-+])
-+
-+
- JD_INIT
- JD_ANSI_CC
+ }
-@@ -90,13 +146,13 @@
-
- dnl JD_HAVE_ISINF
-
--AC_CHECK_LIB(m, acosh, [AC_DEFINE(HAVE_ACOSH)])
--AC_CHECK_LIB(m, asinh, [AC_DEFINE(HAVE_ASINH)])
--AC_CHECK_LIB(m, atanh, [AC_DEFINE(HAVE_ATANH)])
--AC_CHECK_LIB(m, hypot, [AC_DEFINE(HAVE_HYPOT)])
--AC_CHECK_LIB(m, atan2, [AC_DEFINE(HAVE_ATAN2)])
--AC_CHECK_LIB(m, feclearexcept, [AC_DEFINE(HAVE_FECLEAREXCEPT)])
--AC_CHECK_LIB(m, fpsetsticky, [AC_DEFINE(HAVE_FPSETSTICKY)])
-+AC_CHECK_LIB(m, acosh, [AC_DEFINE(HAVE_ACOSH,1,[Define to 1 if you have the `acosh' function])])
-+AC_CHECK_LIB(m, asinh, [AC_DEFINE(HAVE_ASINH,1,[Define to 1 if you have the `asinh' function])])
-+AC_CHECK_LIB(m, atanh, [AC_DEFINE(HAVE_ATANH,1,[Define to 1 if you have the `atanh' function])])
-+AC_CHECK_LIB(m, hypot, [AC_DEFINE(HAVE_HYPOT,1,[Define to 1 if you have the `hypot' function])])
-+AC_CHECK_LIB(m, atan2, [AC_DEFINE(HAVE_ATAN2,1,[Define to 1 if you have the `atan2' function])])
-+AC_CHECK_LIB(m, feclearexcept, [AC_DEFINE(HAVE_FECLEAREXCEPT,1,[Define to 1 if you have the `feclearexcept' function])])
-+AC_CHECK_LIB(m, fpsetsticky, [AC_DEFINE(HAVE_FPSETSTICKY,1,[Define to 1 if you have the `fpsetsticky' function])])
+ #ifdef VMS
+--- src/sltermin.c
++++ src/sltermin.c
+@@ -105,7 +105,32 @@
+ * 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;
- JD_ELF_COMPILER
- JD_IEEE_CFLAGS
-@@ -124,7 +180,7 @@
- if test $jd_with_pcre_library = yes
- then
- PCRE_MODULE="pcre-module.so"
-- AC_DEFINE(HAVE_PCRE_H)
-+ AC_DEFINE(HAVE_PCRE_H,1,[Define to 1 if you have the pcre.h header])
- else
- PCRE_MODULE=""
- fi
-@@ -134,7 +190,7 @@
- if test $jd_with_png_library = yes
- then
- PNG_MODULE="png-module.so"
-- AC_DEFINE(HAVE_PNG_H)
-+ AC_DEFINE(HAVE_PNG_H,1,[Define to 1 if you have the png.h header])
- else
- PNG_MODULE=""
- fi
+ if ((12 == fread ((char *) buf, 1, 12, fp) && (MAGIC == make_integer (buf))))
++++++ slang-2.0.5-format.patch -> slang-2.1.1-format.patch ++++++
--- slang/slang-2.0.5-format.patch 2006-01-12 13:55:46.000000000 +0100
+++ /mounts/work_src_done/STABLE/slang/slang-2.1.1-format.patch 2007-07-10 14:19:24.000000000 +0200
@@ -1,6 +1,6 @@
--- src/slang.c
+++ src/slang.c
-@@ -2012,7 +2012,7 @@
+@@ -2304,7 +2304,7 @@
SLMEMSET (prefix, ' ', len);
prefix[len] = 0;
++++++ slang-2.0.5-fsuid.dif -> slang-2.1.1-fsuid.dif ++++++
--- slang/slang-2.0.5-fsuid.dif 2005-07-19 12:24:06.000000000 +0200
+++ /mounts/work_src_done/STABLE/slang/slang-2.1.1-fsuid.dif 2007-07-10 14:19:24.000000000 +0200
@@ -1,9 +1,9 @@
--- autoconf/configure.ac
+++ autoconf/configure.ac
-@@ -101,8 +101,17 @@
- nan.h \
- fenv.h \
- sys/mman.h \
+@@ -109,8 +109,17 @@
+ netinet/in.h \
+ arpa/inet.h \
+ sys/un.h \
+sys/fsuid.h \
)
@@ -20,7 +20,7 @@
AC_TYPE_UID_T
--- src/slinclud.h
+++ src/slinclud.h
-@@ -28,4 +28,8 @@
+@@ -30,4 +30,8 @@
# include