commit slang for openSUSE:Factory

3 Sep 2010

Hello community,

here is the log from the commit of package slang for openSUSE:Factory
checked in at Fri Sep 3 14:18:14 CEST 2010.



--------

--- slang/slang.changes	2010-04-08 13:51:27.000000000 +0200
+++ /mounts/work_src_done/STABLE/slang/slang.changes	2010-08-17 17:40:11.000000000 +0200
@@ -1,0 +2,32 @@
+Tue Aug 17 15:44:19 UTC 2010 - gber@opensuse.org
+
+- disabled parallel build again, still broken
+
+-------------------------------------------------------------------
+Sat Aug 14 17:43:42 UTC 2010 - gber@opensuse.org
+
+- updated to version 2.2.2
+  + new languag features
+    * ternary expressions
+    * break and condition statements can now work on several levels
+      of loops
+    * multiline strings
+    * List_Type objects can now also be indexed using an array of
+      indices
+  + new modules: zlib, fork, sysconf
+  + new intrinsic functions: sumsq, expm1, log1p, list_to_array,
+    string_matches, _close, _fileno, dup2, getsid, killpg,
+    getpriority, setpriority, ldexp, frexp
+  + provides pkg-info file
+  + many bugfixes
+- split package to conform to library naming policy
+- rebased patches, removed obsolete slang-2.2.1-format.patch
+- added patch slang-2.2.2-makefile.patch from Fedora which fixes
+  shared libs permissions, the slang shared library symlink, and
+  parallel build dependency issues and removes rpath
+- build pcre, png, and zlib modules
+- removed incorrect license information
+- more accurate summary and description
+- further cleanup
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  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
  slangdoc-2.0.4.tar.bz2

New:
----
  slang-2.2.2-autoconf.dif
  slang-2.2.2.dif
  slang-2.2.2-fsuid.dif
  slang-2.2.2-libpng12-linker-flag.patch
  slang-2.2.2-makefile.patch
  slang-2.2.2.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ slang.spec ++++++
--- /var/tmp/diff_new_pack.QxBXGF/_old	2010-09-03 14:08:10.000000000 +0200
+++ /var/tmp/diff_new_pack.QxBXGF/_new	2010-09-03 14:08:10.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package slang (Version 2.1.1)
+# spec file for package slang (Version 2.2.2)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,56 +19,101 @@
 
 
 Name:           slang
-License:        Artistic ; GPLv2+
+License:        GPLv2+
 Group:          System/Libraries
-Version:        2.1.1
-Release:        86
-Provides:       slang%{version} 
+Version:        2.2.2
+Release:        1
 AutoReqProv:    on
+Summary:        Programming Library and Embeddable Extansion Language
+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
+BuildRequires:  pcre-devel
+%if 0%{?suse_version} > 1120
+BuildRequires:  libpng12-devel
+%else
+BuildRequires:  libpng-devel
+%endif
+BuildRequires:  zlib-devel
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
+%description
+S-Lang is a multi-platform programming library designed to allow a developer to
+create robust multi-platform software. It provides facilities required by
+interactive applications such as display/screen management, keyboard input,
+keymaps etc. Another major feature of the library is the interpreter for the
+S-Lang extension language which can be embedded into an application to make it
+extensible. With slsh a standalone interpreter is available as well.
+
+
+%package slsh
+License:        GPLv2+
+Summary:        Interpreter for S-Lang Scripts
+Group:          Development/Languages/Other
+Provides:       slang = %version
+Obsoletes:      slang <= 2.1.1
 # bug437293
 %ifarch ppc64
 Obsoletes:      slang-64bit
 %endif
 #
-Summary:        A Library for Display Control
-Url:            http://www.jedsoft.org/
-Source:         ftp://space.mit.edu/pub/davis/slang/v2.0/slang-%{version}.tar.bz2
-Source1:        slangdoc-2.0.4.tar.bz2
-Source2:        baselibs.conf
-Patch:          slang-%{version}.dif
-Patch4:         slang-%{version}-autoconf.dif
-Patch5:         slang-%{version}-fsuid.dif
-Patch7:         slang-%{version}-format.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
-%package devel
-License:        Artistic ; GPLv2+
-Provides:       slang:/usr/include/slang.h
-Summary:        Library for Display Control - Development Package
+%description slsh
+slsh is a standalone interpreter of the S-Lang language. It can be used to
+execute scripts or interactively.
+
+
+%package -n libslang2
+License:        GPLv2+
+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
+create robust multi-platform software. It provides facilities required by
+interactive applications such as display/screen management, keyboard input,
+keymaps etc. Another major feature of the library is the interpreter for the
+S-Lang extension language which can be embedded into an application to make it
+extensible. With slsh a standalone interpreter is available as well.
+
+
+%package devel
+License:        GPLv2+
+Summary:        Programming Library and Embeddable Extension Language - Development Package
+Group:          Development/Languages/C and C++
 Requires:       %{name} = %{version}
+Provides:       slang:/usr/include/slang.h
 # bug437293
 %ifarch ppc64
 Obsoletes:      slang-devel-64bit
 %endif
 #
 
-%description
-A library with routines for display access. It is similar to ncurses,
-but it has its own programming interface. Slang uses the entries in
-/usr/lib/terminfo.
-
 %description devel
-A library with routines for display access. It is similar to ncurses,
-but it has its own programming interface. Slang uses the entries in
-/usr/lib/terminfo.
+S-Lang is a multi-platform programming library designed to allow a developer to
+create robust multi-platform software. It provides facilities required by
+interactive applications such as display/screen management, keyboard input,
+keymaps etc. Another major feature of the library is the interpreter for the
+S-Lang extension language which can be embedded into an application to make it
+extensible. With slsh a standalone interpreter is available as well.
+
+This package contains all necessary include files and libraries needed to
+develop applications that require it.
+
 
 %prep
-%setup -n slang-%{version} -a 1
-%patch
-%patch4
-%patch5
-%patch7
+%setup -q
+%patch -p1
+%patch4 -p1
+%patch5 -p1
+#%patch8 -p1
+%patch9 -p1
 
 %build
 mv autoconf/configure.ac .
@@ -78,55 +123,53 @@
 autoconf -I autoconf
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fstack-protector" 
 export ELF_CFLAGS="$CFLAGS" 
-  ./configure --prefix=/usr --enable-wide-chars \
-              --libdir=%{_libdir} \
-	      --sysconfdir=/etc \
-	      --mandir=%{_mandir} \
-	      --enable-warnings
-# Not parallizable in 2.1.1. -Marcus Meissner
-make static
+%configure \
+    --docdir=%{_datadir}/doc/packages/slang-devel \
+    --with-pcre \
+    --with-pnginc=/usr/include/libpng12 \
+    --with-pnglib=/usr/lib \
+    --with-z
+#    --with-onig
+# parallel make still broken in 2.2.2
 make
+make static
 
-%install
+%clean
 rm -rf "$RPM_BUILD_ROOT"
-mkdir "$RPM_BUILD_ROOT"
-make DESTDIR="$RPM_BUILD_ROOT"  install install-static install-links
-#make runtests
-cd doc
-ln -s slangdoc.html index.html
-cd ../modules
-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}
 
-%post
-%run_ldconfig
+%install
+%makeinstall install-static
+
+rm -rf %{buildroot}%{_datadir}/doc/
+
+%check
+make check
 
-%postun
-%run_ldconfig
+%post -n libslang2 -p /sbin/ldconfig
 
-%files
+%postun -n libslang2 -p /sbin/ldconfig
+
+%files slsh
 %defattr(-,root,root)
-%doc README COPY* *.txt
-%{_libdir}/lib*.so.*
-/usr/bin/slsh
-/etc/slsh.rc
-%{_libdir}/slang
-%{_mandir}/man1/slsh*
-/usr/share/slsh
+%doc COPYING slsh/README
+%doc slsh/doc/html/
+%config(noreplace) %{_sysconfdir}/slsh.rc
+%{_bindir}/slsh
+%{_libdir}/slang/
+%{_datadir}/slsh/
+%{_mandir}/man1/slsh.1*
 
-%files devel
+%files -n libslang2
 %defattr(-,root,root)
-/usr/include/*
-%{_libdir}/lib*.a
-%{_libdir}/lib*.so
-%doc doc/*  demo examples modules
+%{_libdir}/libslang.so.*
 
-%clean
-rm -rf "$RPM_BUILD_ROOT"
+%files devel
+%defattr(-,root,root)
+%doc changes.txt COPYING NEWS README UPGRADE.txt demo/ examples/
+%doc doc/grammar.txt doc/text/
+%{_includedir}/*
+%{_libdir}/pkgconfig/slang.pc
+%{_libdir}/libslang.a
+%{_libdir}/libslang.so
 
 %changelog

++++++ slang-2.1.1-autoconf.dif -> slang-2.2.2-autoconf.dif ++++++
--- slang/slang-2.1.1-autoconf.dif	2008-07-09 01:28:45.000000000 +0200
+++ /mounts/work_src_done/STABLE/slang/slang-2.2.2-autoconf.dif	2010-08-17 16:19:27.000000000 +0200
@@ -1,6 +1,7 @@
---- autoconf/aclocal.m4
-+++ autoconf/aclocal.m4
-@@ -306,18 +306,18 @@ dnl#}}}
+diff -urN slang-2.2.2.orig/autoconf/aclocal.m4 slang-2.2.2/autoconf/aclocal.m4
+--- slang-2.2.2.orig/autoconf/aclocal.m4	2009-12-05 20:03:51.000000000 +0100
++++ slang-2.2.2/autoconf/aclocal.m4	2010-08-15 13:48:23.000000000 +0200
+@@ -317,18 +317,18 @@
  AC_DEFUN(JD_GCC_WARNINGS, dnl#{{{
  [
  AC_ARG_ENABLE(warnings,
@@ -29,7 +30,7 @@
  fi
  ])
  
-@@ -480,7 +480,7 @@ do
+@@ -495,7 +495,7 @@
  done
  if test "$TERMCAP"; then
    AC_MSG_RESULT(no)
@@ -38,10 +39,10 @@
  fi
  AC_SUBST(TERMCAP)dnl
  AC_SUBST(MISC_TERMINFO_DIRS)dnl
-@@ -491,9 +491,9 @@ dnl#}}}
- 
+@@ -507,9 +507,9 @@
  AC_DEFUN(JD_ANSI_CC, dnl#{{{
  [
+ AC_AIX
 -AC_PROG_CC
 -AC_PROG_CPP
 -AC_PROG_GCC_TRADITIONAL
@@ -49,9 +50,9 @@
 +AC_REQUIRE([AC_PROG_CPP])
 +AC_REQUIRE([AC_PROG_GCC_TRADITIONAL])
  AC_ISC_POSIX
- AC_AIX
  
-@@ -506,7 +506,7 @@ AC_EGREP_CPP(yes,
+ dnl #This stuff came from Yorick config script
+@@ -521,7 +521,7 @@
    yes
  #endif
  ], [
@@ -60,7 +61,7 @@
  if test "$CC" = cc; then CC="cc -Ae"; fi
  ])dnl
  dnl
-@@ -530,8 +530,11 @@ dnl #-----------------------------------
+@@ -545,8 +545,11 @@
  dnl # Check for dynamic linker
  dnl #-------------------------------------------------------------------------
  DYNAMIC_LINK_LIB=""
@@ -73,7 +74,7 @@
    AC_CHECK_LIB(dl,dlopen,[
      DYNAMIC_LINK_LIB="-ldl"
      AC_DEFINE(HAVE_DLOPEN)
-@@ -562,7 +565,7 @@ case "$host_os" in
+@@ -585,7 +588,7 @@
    *linux*|*gnu*|k*bsd*-gnu )
      DYNAMIC_LINK_FLAGS="-Wl,-export-dynamic"
      ELF_CC="\$(CC)"
@@ -82,9 +83,10 @@
      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 @@ dnl fi
+diff -urN slang-2.2.2.orig/autoconf/configure.ac slang-2.2.2/autoconf/configure.ac
+--- slang-2.2.2.orig/autoconf/configure.ac	2009-12-05 20:03:51.000000000 +0100
++++ slang-2.2.2/autoconf/configure.ac	2010-08-15 13:49:02.000000000 +0200
+@@ -17,6 +17,62 @@
  AC_CONFIG_AUX_DIR(autoconf)
  AC_CANONICAL_HOST
  
@@ -147,7 +149,7 @@
  JD_INIT
  JD_ANSI_CC
  
-@@ -112,16 +168,16 @@ AC_CACHE_CHECK([for nl_langinfo and CODE
+@@ -125,20 +181,20 @@
  ])
  if test $jd_cv_nl_langinfo_codeset = yes
  then
@@ -160,6 +162,10 @@
 -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, frexp, [AC_DEFINE(HAVE_FREXP)])
+-AC_CHECK_LIB(m, frexpf, [AC_DEFINE(HAVE_FREXPF)])
+-AC_CHECK_LIB(m, ldexp, [AC_DEFINE(HAVE_LDEXP)])
+-AC_CHECK_LIB(m, ldexpf, [AC_DEFINE(HAVE_LDEXPF)])
 -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])])
@@ -167,39 +173,54 @@
 +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, frexp, [AC_DEFINE(HAVE_FREXP,1,[Define to 1 if you have the `frexp' function])])
++AC_CHECK_LIB(m, frexpf, [AC_DEFINE(HAVE_FREXPF,1,[Define to 1 if you have the `frexpf' function])])
++AC_CHECK_LIB(m, ldexp, [AC_DEFINE(HAVE_LDEXP,1,[Define to 1 if you have the `ldexp' function])])
++AC_CHECK_LIB(m, ldexpf, [AC_DEFINE(HAVE_LDEXPF,1,[Define to 1 if you have the `ldexpf' 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])])
  
  JD_ELF_COMPILER
  JD_IEEE_CFLAGS
-@@ -149,7 +205,7 @@ JD_CHECK_FOR_LIBRARY(pcre)
+@@ -168,7 +224,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])
+   extramodules="$extramodules pcre"
  else
    PCRE_MODULE=""
- fi
-@@ -159,7 +215,7 @@ JD_CHECK_FOR_LIBRARY(onig,oniguruma.h)
+@@ -180,7 +236,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])
+   extramodules="$extramodules oniguruma"
  else
    ONIG_MODULE=""
- fi
-@@ -169,20 +225,20 @@ JD_CHECK_FOR_LIBRARY(png)
+@@ -192,7 +248,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])
+   extramodules="$extramodules png"
  else
    PNG_MODULE=""
+@@ -204,7 +260,7 @@
+ if test $jd_with_z_library = yes
+ then 
+   ZLIB_MODULE="zlib-module.so"
+-  AC_DEFINE(HAVE_ZLIB_H)
++  AC_DEFINE(HAVE_ZLIB_H, 1, [Define to 1 if you have the zlib library])
+   extramodules="$extramodules z"
+ else
+   ZLIB_MODULE=""
+@@ -212,14 +268,14 @@
  fi
- AC_SUBST(PNG_MODULE)
+ AC_SUBST(ZLIB_MODULE)
  
 -m4_include([./iconv.m4])
 +dnl m4_include([./iconv.m4])
@@ -212,5 +233,5 @@
 -  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"
+   extramodules="$extramodules iconv"
  else
-   SLANG_AM_ICONV

++++++ slang-2.1.1-autoconf.dif -> slang-2.2.2.dif ++++++
--- slang/slang-2.1.1-autoconf.dif	2008-07-09 01:28:45.000000000 +0200
+++ /mounts/work_src_done/STABLE/slang/slang-2.2.2.dif	2010-08-17 16:31:58.000000000 +0200
@@ -1,216 +1,84 @@
---- autoconf/aclocal.m4
-+++ autoconf/aclocal.m4
-@@ -306,18 +306,18 @@ dnl#}}}
- 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
- ])
- 
-@@ -480,7 +480,7 @@ do
- 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
-@@ -491,9 +491,9 @@ dnl#}}}
- 
- AC_DEFUN(JD_ANSI_CC, dnl#{{{
- [
--AC_PROG_CC
--AC_PROG_CPP
--AC_PROG_GCC_TRADITIONAL
-+AC_REQUIRE([AC_PROG_CC])
-+AC_REQUIRE([AC_PROG_CPP])
-+AC_REQUIRE([AC_PROG_GCC_TRADITIONAL])
- AC_ISC_POSIX
- AC_AIX
+diff -urN slang-2.2.2.orig/src/sldisply.c slang-2.2.2/src/sldisply.c
+--- slang-2.2.2.orig/src/sldisply.c	2009-12-05 20:03:51.000000000 +0100
++++ slang-2.2.2/src/sldisply.c	2010-08-15 13:30:36.000000000 +0200
+@@ -2441,6 +2441,13 @@
+    Term_Init_Str = tt_tgetstr ("ti");
+    Term_Reset_Str = tt_tgetstr ("te");
  
-@@ -506,7 +506,7 @@ AC_EGREP_CPP(yes,
-   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
-@@ -530,8 +530,11 @@ dnl #-----------------------------------
- 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)
-@@ -562,7 +565,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"
---- autoconf/configure.ac
-+++ 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
++   /* 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.
+     */
+@@ -2449,6 +2456,7 @@
+ 	Keypad_Init_Str = tt_tgetstr ("ks");
+ 	Keypad_Reset_Str = tt_tgetstr ("ke");
+      }
++#endif
+ 
+    /* Make up for defective termcap/terminfo databases */
+    if ((Vt100_Like && (term[2] != '1'))
+@@ -2651,10 +2659,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
+ }
+ 
+ #ifdef VMS
+diff -urN slang-2.2.2.orig/src/sltermin.c slang-2.2.2/src/sltermin.c
+--- slang-2.2.2.orig/src/sltermin.c	2009-12-05 20:03:51.000000000 +0100
++++ slang-2.2.2/src/sltermin.c	2010-08-15 13:35:11.000000000 +0200
+@@ -23,6 +23,9 @@
+ USA.  
+ */
+ 
++#include <unistd.h>
++#include <sys/types.h>
++
+ #include "slinclud.h"
+ 
+ #include "slang.h"
+@@ -119,7 +122,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;
++   }
 +
-+#define _SLANG_SOURCE_	1
-+#endif /* SL_CONFIG_H */
-+])
-+
-+
- JD_INIT
- JD_ANSI_CC
+    if (fp == NULL) return NULL;
  
-@@ -112,16 +168,16 @@ AC_CACHE_CHECK([for nl_langinfo and CODE
- ])
- 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)])
--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])])
- 
- JD_ELF_COMPILER
- JD_IEEE_CFLAGS
-@@ -149,7 +205,7 @@ JD_CHECK_FOR_LIBRARY(pcre)
- 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
-@@ -159,7 +215,7 @@ JD_CHECK_FOR_LIBRARY(onig,oniguruma.h)
- 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 @@ JD_CHECK_FOR_LIBRARY(png)
- 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
- 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
+    if ((12 == fread ((char *) buf, 1, 12, fp) && (MAGIC == make_integer (buf))))

++++++ slang-2.1.1-fsuid.dif -> slang-2.2.2-fsuid.dif ++++++
--- slang/slang-2.1.1-fsuid.dif	2010-01-13 13:50:01.000000000 +0100
+++ /mounts/work_src_done/STABLE/slang/slang-2.2.2-fsuid.dif	2010-08-17 16:19:27.000000000 +0200
@@ -1,12 +1,12 @@
-Index: autoconf/configure.ac
-===================================================================
---- autoconf/configure.ac.orig
-+++ autoconf/configure.ac
-@@ -109,8 +109,17 @@ sys/socket.h \
+diff -urN slang-2.2.2.orig/autoconf/configure.ac slang-2.2.2/autoconf/configure.ac
+--- slang-2.2.2.orig/autoconf/configure.ac	2010-08-15 13:13:18.000000000 +0200
++++ slang-2.2.2/autoconf/configure.ac	2010-08-15 13:23:24.000000000 +0200
+@@ -116,9 +116,18 @@
  netinet/in.h \
  arpa/inet.h \
  sys/un.h \
 +sys/fsuid.h \
+ sys/resource.h \
  )
  
 +AC_CHECK_FUNCS(setfsuid setfsgid)
@@ -20,10 +20,21 @@
  AC_TYPE_MODE_T
  AC_TYPE_PID_T
  AC_TYPE_UID_T
-Index: src/slinclud.h
-===================================================================
---- src/slinclud.h.orig
-+++ src/slinclud.h
+diff -urN slang-2.2.2.orig/src/config.hin slang-2.2.2/src/config.hin
+--- slang-2.2.2.orig/src/config.hin	2009-12-05 20:03:51.000000000 +0100
++++ slang-2.2.2/src/config.hin	2010-08-15 13:25:31.000000000 +0200
+@@ -179,6 +179,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
+diff -urN slang-2.2.2.orig/src/slinclud.h slang-2.2.2/src/slinclud.h
+--- slang-2.2.2.orig/src/slinclud.h	2009-12-05 20:03:51.000000000 +0100
++++ slang-2.2.2/src/slinclud.h	2010-08-15 13:24:28.000000000 +0200
 @@ -30,4 +30,8 @@
  # include <memory.h>
  #endif
@@ -33,19 +44,3 @@
 +#endif
 +
  #endif				       /* _SLANG_INCLUDE_H_ */
-Index: src/config.hin
-===================================================================
---- src/config.hin.orig
-+++ src/config.hin
-@@ -166,6 +166,11 @@
- #undef HAVE_SYS_UN_H
- #undef socklen_t
- 
-+
-+#undef HAVE_SYS_FSUID_H
-+#undef HAVE_SETFSUID
-+
-+
- /* These two are needed on DOS-like systems.  Unix does not require them.
-  * They are included here for consistency.
-  *

++++++ slang-2.2.2-libpng12-linker-flag.patch ++++++
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
 #---------------------------------------------------------------------------
++++++ slang-2.2.2-makefile.patch ++++++
diff -up slang-2.2.2/autoconf/Makefile.in.makefile slang-2.2.2/autoconf/Makefile.in
--- slang-2.2.2/autoconf/Makefile.in.makefile	2009-12-05 20:03:51.000000000 +0100
+++ slang-2.2.2/autoconf/Makefile.in	2009-12-07 10:02:56.000000000 +0100
@@ -47,8 +47,7 @@ help:
 	@echo "make check : Build the library and run the regression tests"
 static: makefiles
 	cd src; $(MAKE) static
-	cd slsh; $(MAKE) all
-elf: makefiles
+elf: makefiles static
 	cd src; $(MAKE) elf
 	cd slsh; $(MAKE) all
 	cd modules; $(MAKE) all
diff -up slang-2.2.2/modules/Makefile.in.makefile slang-2.2.2/modules/Makefile.in
--- slang-2.2.2/modules/Makefile.in.makefile	2009-12-05 20:03:51.000000000 +0100
+++ slang-2.2.2/modules/Makefile.in	2009-12-07 10:02:56.000000000 +0100
@@ -59,7 +59,7 @@ SOCKET_LIBS = @X_EXTRA_LIBS@
 MODULE_INSTALL_DIR = @libdir@/slang/v@slang_major_version@/modules
 INSTALL		= @INSTALL@
 INSTALL_DATA	= @INSTALL_DATA@
-INSTALL_MODULE	= @INSTALL_MODULE@
+INSTALL_MODULE	= @INSTALL@
 MKINSDIR	= ../autoconf/mkinsdir.sh
 SLSH_DIR	= $(prefix)/share/slsh
 CMAPS_DIR	= $(SLSH_DIR)/cmaps
@@ -73,7 +73,7 @@ DEST_SLSH_DIR	= $(DESTDIR)$(SLSH_DIR)
 DEST_CMAPSDIR	= $(DESTDIR)$(CMAPS_DIR)
 DEST_HELPDIR	= $(DESTDIR)$(HELP_DIR)
 #---------------------------------------------------------------------------
-RPATH = @RPATH@
+RPATH =
 
 LIBS = $(LDFLAGS) $(RPATH) $(SLANG_LIB) $(DL_LIB) @M_LIB@
 #LIBS = $(RPATH) $(DL_LIB) @M_LIB@
diff -up slang-2.2.2/slsh/Makefile.in.makefile slang-2.2.2/slsh/Makefile.in
--- slang-2.2.2/slsh/Makefile.in.makefile	2009-12-05 20:03:51.000000000 +0100
+++ slang-2.2.2/slsh/Makefile.in	2009-12-07 10:02:56.000000000 +0100
@@ -15,7 +15,7 @@ SLANG_SRCINC	= -I@SRCDIR@
 SLANG_SRCLIB	= -L@ELFDIR@
 #---------------------------------------------------------------------------
 OTHER_LIBS	= @TERMCAP@ @DYNAMIC_LINK_LIB@ @LIBS@ @M_LIB@
-RPATH		= @RPATH@
+RPATH		=
 #----------------------------------------------------------------------------
 INSTALL		= @INSTALL@
 INSTALL_DATA	= @INSTALL_DATA@
diff -up slang-2.2.2/src/Makefile.in.makefile slang-2.2.2/src/Makefile.in
--- slang-2.2.2/src/Makefile.in.makefile	2009-12-05 20:03:51.000000000 +0100
+++ slang-2.2.2/src/Makefile.in	2009-12-07 10:02:56.000000000 +0100
@@ -139,17 +139,21 @@ UPDATE_VERSION_SCRIPT = $(HOME)/bin/upda
 # Rules
 #---------------------------------------------------------------------------
 all: static elf
-static: $(OBJDIR) $(CONFIG_H) $(OBJDIR_NORMAL_LIB) $(OTHERSTUFF)
-elf: $(ELFDIR) $(CONFIG_H) $(ELFDIR_ELF_LIB)
+static: $(OBJDIR)/stamp $(CONFIG_H) $(OBJDIR_NORMAL_LIB) $(OTHERSTUFF)
+elf: $(ELFDIR)/stamp $(CONFIG_H) $(ELFDIR_ELF_LIB)
 
-$(OBJDIR_NORMAL_LIB): $(OBJDIR) $(CONFIG_H) $(OBJS)
+$(OBJS): $(OBJDIR)/stamp
+
+$(ELFOBJS): $(ELFDIR)/stamp
+
+$(OBJDIR_NORMAL_LIB): $(CONFIG_H) $(OBJS)
 	-$(RM) $(OBJDIR_NORMAL_LIB)
 	cd $(OBJDIR); $(AR_CR) $(NORMAL_LIB) $(OFILES)
 	$(RANLIB) $(OBJDIR_NORMAL_LIB)
 	@echo ""
 	@echo $(NORMAL_LIB) created in $(OBJDIR)
 
-$(ELFDIR_ELF_LIB): $(ELFDIR) $(CONFIG_H) $(ELFOBJS) $(VERSION_SCRIPT)
+$(ELFDIR_ELF_LIB): $(CONFIG_H) $(ELFOBJS) $(VERSION_SCRIPT)
 	-$(RM) $(ELFDIR_ELF_LIB)
 	cd $(ELFDIR); $(ELF_LINK_CMD) -o $(ELFLIB_BUILD_NAME) $(OFILES) $(LDFLAGS) $(ELF_DEP_LIBS)
 	if [ $(ELFLIB_MAJOR) != $(ELFLIB_BUILD_NAME) ]; then \
@@ -160,10 +164,12 @@ $(ELFDIR_ELF_LIB): $(ELFDIR) $(CONFIG_H)
 	@echo $(ELFLIB_BUILD_NAME) created in $(ELFDIR).
 	@echo The link $(ELFLIB) to $(ELFLIB_BUILD_NAME) was also created.
 	@echo ""
-$(OBJDIR) :
+$(OBJDIR)/stamp :
 	-$(MKDIR) $(OBJDIR)
-$(ELFDIR) :
+	touch $(OBJDIR)/stamp
+$(ELFDIR)/stamp :
 	-$(MKDIR) $(ELFDIR)
+	touch $(ELFDIR)/stamp
 $(CONFIG_H) : sysconf.h
 	-$(CP) sysconf.h $(CONFIG_H)
 
@@ -194,9 +200,9 @@ install-elf-and-links:
 	-$(RM) $(DEST_LIBDIR)/$(ELFLIB)
 	-$(RM) $(DEST_LIBDIR)/$(ELFLIB_MAJOR)
 	@echo installing $(ELFLIB_BUILD_NAME) in $(DEST_LIBDIR)
-	$(INSTALL_DATA) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR)/
+	$(INSTALL) $(ELFDIR_ELF_LIB) $(DEST_LIBDIR)/
 	-cd $(DEST_LIBDIR); $(LN) $(ELFLIB_BUILD_NAME) $(ELFLIB_MAJOR)
-	-cd $(DEST_LIBDIR); $(LN) $(ELFLIB_BUILD_NAME) $(ELFLIB)
+	-cd $(DEST_LIBDIR); $(LN) $(ELFLIB_MAJOR) $(ELFLIB)
 	@echo ""
 	@echo $(ELFLIB_BUILD_NAME) created in $(DEST_LIBDIR).
 	@echo The links $(ELFLIB) and $(ELFLIB_MAJOR) to $(ELFLIB_BUILD_NAME) were also created.
++++++ slang-2.1.1.tar.bz2 -> slang-2.2.2.tar.bz2 ++++++
++++ 148713 lines of diff (skipped)


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)