Browse Source

Stefan Fiedler:


			
			
				rocklinux
			
			
		
Stefan Fiedler 17 years ago
parent
commit
81d94f1fdc
2 changed files with 24 additions and 11 deletions
  1. +13
    -0
      package/base/ncurses/file-outside-basedir.patch
  2. +11
    -11
      package/base/ncurses/ncurses.conf

+ 13
- 0
package/base/ncurses/file-outside-basedir.patch

@ -0,0 +1,13 @@
This prevents the creation of a temporary file outside the root directory
--- ./configure~ 2007-08-27 18:53:31.000000000 +0200
+++ ./configure 2007-08-27 18:54:52.000000000 +0200
@@ -3557,6 +3557,8 @@
ac_cv_sys_long_file_names=no
rm -rf $ac_xdir 2>/dev/null
break
+ else
+ break
fi
rm -rf $ac_xdir 2>/dev/null
done

+ 11
- 11
package/base/ncurses/ncurses.conf

@ -1,3 +1,4 @@
#!/bin/bash
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
@ -20,17 +21,23 @@
#
# --- ROCK-COPYRIGHT-NOTE-END ---
libdir=$root/lib
libdir=$root/$multilib
includedir=$includedir/ncurses
custmain=ncurses_main
var_append extraconfopt ' ' '--with-shared'
if pkginstalled libtool && [ ${stagelevel} -gt 3 ] ; then
if pkginstalled libtool && [ ${stagelevel} -ge 3 ] ; then
var_append extraconfopt ' ' '--with-libtool'
else
var_append extraconfopt ' ' '--with-normal'
fi
if [ $stagelevel -le 2 ] ; then
var_append extraconfopt ' ' '--without-ada'
var_append extraconfopt ' ' '--without-cxx --without-cxx-bindings'
fi
var_append makeinstopt ' ' "'INSTALL_LIB=\$(INSTALL) -m 755'"
prepatch="bunzip2 < $archdir/termtypes.ti.bz2 > misc/terminfo.src"
@ -41,7 +48,7 @@ remove_include_termcap() {
if pkginstalled termcap ; then
echo_status "Found termcap package ->" \
"disable ncurses internal termcap library."
"disable ncurses internal termcap library."
var_append extraconfopt ' ' '--disable-termcap'
inmake="remove_include_termcap"
else
@ -54,13 +61,7 @@ fi
hook_add postmake 7 "\
ln -svf libncurses.so $libdir/libcurses.so; \
ln -svf libncurses.a $libdir/libcurses.a; \
ln -svf ncurses/ncurses.h ncurses/curses.h ncurses/term.h ncurses/unctrl.h $includedir/../"
if [ $stagelevel = 1 ] ; then
var_append extraconfopt ' ' '--without-cxx --without-cxx-bindings'
fi
var_append makeinstopt ' ' "'INSTALL_LIB=\$(INSTALL) -m 755'"
ln -svf ncurses/{ncurses,curses,term,unctrl}.h $includedir/../"
ncurses_main() {
ncurses_build
@ -79,4 +80,3 @@ ncurses_build() {
eval "$MAKE $makeinstopt"
hook_eval postmake
}

Loading…
Cancel
Save