Skip to contentSkip to conversation

portmap: install initscript

PATCH New Gustavo Zacarias 3 participants 20 messages Dec 17, 2010 – Dec 23, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/13 portmap: install initscript

Thanks to patrick.ziegler at fh-kl.de in the mailing list for noticing.

---
 package/portmap/portmap.mk |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
package/portmap/portmap.mk +2 -0
index dba6155..e83ff1d 100644
@@ -23,6 +23,8 @@ define PORTMAP_INSTALL_TARGET_CMDS
 		$(TARGET_DIR)/usr/share/man/man8/pmap_dump.8
 	$(INSTALL) -D $(@D)/pmap_set.8 \
 		$(TARGET_DIR)/usr/share/man/man8/pmap_set.8
+	$(INSTALL) -m 0755 package/portmap/S13portmap \
+		$(TARGET_DIR)/etc/init.d
 endef
 
 define PORTMAP_UNINSTALL_TARGET_CMDS
Signature · 1 line
1.7.2.2
#1 lore raw

PATCH 2/13 php: security bump to version 5.2.16

* Fixed extract() to do not overwrite $GLOBALS and $this when using EXTR_OVERWRITE.

* Fixed crash in zip extract method (possible CWE-170).

* Fixed a possible double free in imap extension.

* Fixed possible flaw in open_basedir (CVE-2010-3436).

* Fixed NULL pointer dereference in ZipArchive::getArchiveComment. (CVE-2010-3709).

* Fixed bug #52929 (Segfault in filter_var with FILTER_VALIDATE_EMAIL with large amount of data).

---
 package/php/php.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
package/php/php.mk +1 -1
index af4fa29..4db2b84 100644
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-PHP_VERSION = 5.2.14
+PHP_VERSION = 5.2.16
 PHP_SOURCE = php-$(PHP_VERSION).tar.bz2
 PHP_SITE = http://www.php.net/distributions
 PHP_INSTALL_STAGING = YES
Signature · 1 line
1.7.2.2
#2 lore raw

PATCH 3/13 sqlite: bump to version 3.7.4

In reply to Gustavo Zacarias

Many small fixes, see http://www.sqlite.org/releaselog/3_7_4.html

---
 package/sqlite/sqlite.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
package/sqlite/sqlite.mk +1 -1
index 5d29570..8b0e13e 100644
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SQLITE_VERSION = 3.7.3
+SQLITE_VERSION = 3.7.4
 SQLITE_SOURCE = sqlite-amalgamation-$(SQLITE_VERSION).tar.gz
 SQLITE_SITE = http://www.sqlite.org
 SQLITE_INSTALL_STAGING = YES
Signature · 1 line
1.7.2.2
#3 lore raw

PATCH 4/13 freetype: bump to version 2.4.4

In reply to Gustavo Zacarias

See http://www.freetype.org/index2.html#release-freetype-2.4.4

---
 package/freetype/freetype.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
package/freetype/freetype.mk +1 -1
index c7e5c32..ad4292f 100644
@@ -3,7 +3,7 @@
 # freetype
 #
 #############################################################
-FREETYPE_VERSION = 2.3.12
+FREETYPE_VERSION = 2.4.4
 FREETYPE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/freetype
 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
 FREETYPE_INSTALL_STAGING = YES
Signature · 1 line
1.7.2.2
#4 lore raw

PATCH 6/13 patch: needs toolchain with wchar

In reply to Gustavo Zacarias

* Patch needs a toolchain with WCHAR support
* Use real upstream gnu mirror

---
 package/patch/Config.in |    4 ++++
 package/patch/patch.mk  |    6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)
package/patch/Config.in +4 -0
index 5a80ea5..dd6d51c 100644
@@ -1,7 +1,11 @@
 config BR2_PACKAGE_PATCH
 	bool "patch"
+	depends on BR2_USE_WCHAR
 	help
 	  Take patch files (containing difference listings) and apply them
 	  to original files, producing patched versions.
 
 	  http://www.gnu.org/software/patch/
+
+comment "patch needs a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR
package/patch/patch.mk +3 -3
index 80d9db1..5c46c77 100644
@@ -3,8 +3,8 @@
 # patch
 #
 #############################################################
-PATCH_VERSION:=2.6
-PATCH_SOURCE:=patch_$(PATCH_VERSION).orig.tar.gz
-PATCH_SITE:=$(BR2_DEBIAN_MIRROR)/debian/pool/main/p/patch
+
+PATCH_VERSION = 2.6
+PATCH_SITE = $(BR2_GNU_MIRROR)/patch
 
 $(eval $(call AUTOTARGETS,package,patch))
Signature · 1 line
1.7.2.2
#5 lore raw

PATCH 7/13 findutils: bump to version 4.4.2

In reply to Gustavo Zacarias
---
 package/findutils/findutils.mk |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
package/findutils/findutils.mk +5 -3
index a1893ad..7ab6b0b 100644
@@ -3,8 +3,10 @@
 # findutils
 #
 #############################################################
-FINDUTILS_VERSION:=4.2.31
-FINDUTILS_SOURCE:=findutils-$(FINDUTILS_VERSION).tar.gz
-FINDUTILS_SITE:=$(BR2_GNU_MIRROR)/findutils/
+
+FINDUTILS_VERSION = 4.4.2
+FINDUTILS_SITE = $(BR2_GNU_MIRROR)/findutils
+FINDUTILS_CONF_ENV = gl_cv_func_stdin=yes \
+			gl_cv_func_wcwidth_works=yes
 
 $(eval $(call AUTOTARGETS,package,findutils))
Signature · 1 line
1.7.2.2
#6 lore raw

PATCH 8/13 tar: bump to version 1.25

In reply to Gustavo Zacarias
---
 package/tar/tar.mk |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
package/tar/tar.mk +3 -3
index f9ee74b..e1e16a2 100644
@@ -3,8 +3,8 @@
 # tar
 #
 #############################################################
-TAR_VERSION:=1.21
-TAR_SOURCE:=tar-$(TAR_VERSION).tar.bz2
-TAR_SITE:=$(BR2_GNU_MIRROR)/tar/
+
+TAR_VERSION = 1.25
+TAR_SITE = $(BR2_GNU_MIRROR)/tar
 
 $(eval $(call AUTOTARGETS,package,tar))
Signature · 1 line
1.7.2.2
#7 lore raw

PATCH 9/13 nano: bump to version 2.2.6

In reply to Gustavo Zacarias
---
 package/nano/nano.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
package/nano/nano.mk +1 -1
index 5e9824b..87852a1 100644
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-NANO_VERSION = 2.2.5
+NANO_VERSION = 2.2.6
 NANO_SITE = http://www.nano-editor.org/dist/v2.2
 NANO_MAKE_ENV = CURSES_LIB="-lncurses"
 NANO_CONF_OPT = --without-slang --enable-tiny
Signature · 1 line
1.7.2.2
#8 lore raw

PATCH 10/13 bison: bump to version 2.4.3

In reply to Gustavo Zacarias
---
 package/bison/Config.in                            |    4 ++++
 .../bison/bison-2.4.3-uclibc-sched_param-def.patch |   19 +++++++++++++++++++
 package/bison/bison.mk                             |    6 +++---
 3 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 package/bison/bison-2.4.3-uclibc-sched_param-def.patch
package/bison/Config.in +4 -0
index edea4f6..e8aa0b6 100644
@@ -1,8 +1,12 @@
 config BR2_PACKAGE_BISON
 	bool "bison"
+	depends on BR2_USE_WCHAR
 	help
 	  General-purpose parser generator that converts a
 	  grammar description for an LALR context-free grammar into a C
 	  program to parse that grammar.
 
 	  http://www.gnu.org/software/bison/
+
+comment "bison requires a toolchain with WCHAR support"
+	depends on !BR2_USE_WCHAR
package/bison/bison-2.4.3-uclibc-sched_param-def.patch new file +19 -0
new file mode 100644
index 0000000..50652d8
@@ -0,0 +1,19 @@
+uclibc defines __GLIBC__ but it does not expose struct shed_param as much as glibc
+and is not needed too per standard. gnulib attempts to use it but we have to account
+for it because in this case uclibc does not behave like glibc.
+
+-Khem
+
+http://bugs.gentoo.org/336484
+
+--- m4-1.4.14/lib/spawn.in.h
++++ m4-1.4.14/lib/spawn.in.h
+@@ -31,7 +31,7 @@
+ 
+ /* Get definitions of 'struct sched_param' and 'sigset_t'.
+    But avoid namespace pollution on glibc systems.  */
+-#ifndef __GLIBC__
++#if !defined __GLIBC__ || defined __UCLIBC__
+ # include <sched.h>
+ # include <signal.h>
+ #endif
package/bison/bison.mk +3 -3
index 9e28e85..8849030 100644
@@ -3,9 +3,9 @@
 # bison
 #
 #############################################################
-BISON_VERSION:=2.3
-BISON_SOURCE:=bison-$(BISON_VERSION).tar.bz2
-BISON_SITE:=$(BR2_GNU_MIRROR)/bison
+
+BISON_VERSION = 2.4.3
+BISON_SITE = $(BR2_GNU_MIRROR)/bison
 
 define BISON_DISABLE_EXAMPLES
 	echo 'all install:' > $(@D)/examples/Makefile
Signature · 1 line
1.7.2.2
#9 lore raw

PATCH 11/13 grep: bump to version 2.7

In reply to Gustavo Zacarias
---
 package/grep/grep.mk |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)
package/grep/grep.mk +3 -4
index 5b945d5..e323b1d 100644
@@ -3,11 +3,10 @@
 # grep
 #
 #############################################################
-GREP_VERSION:=2.5.3
-GREP_SOURCE:=grep-$(GREP_VERSION).tar.bz2
-GREP_SITE:=$(BR2_GNU_MIRROR)/grep
-GREP_CONF_OPT = --disable-perl-regexp --without-included-regex
 
+GREP_VERSION = 2.7
+GREP_SITE = $(BR2_GNU_MIRROR)/grep
+GREP_CONF_OPT = --disable-perl-regexp --without-included-regex
 GREP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
 
 $(eval $(call AUTOTARGETS,package,grep))
Signature · 1 line
1.7.2.2
#10 lore raw

PATCH 12/13 screen: bump to version 4.0.3

In reply to Gustavo Zacarias
---
 .../screen/screen-4.0.2-cross_compile_fix.patch    |  524 --------------------
 package/screen/screen-4.0.2_install-fix.patch      |   21 -
 package/screen/screen-cross_compile_fix.patch      |  524 ++++++++++++++++++++
 package/screen/screen-install-fix.patch            |   21 +
 package/screen/screen.mk                           |    7 +-
 5 files changed, 547 insertions(+), 550 deletions(-)
 delete mode 100644 package/screen/screen-4.0.2-cross_compile_fix.patch
 delete mode 100644 package/screen/screen-4.0.2_install-fix.patch
 create mode 100644 package/screen/screen-cross_compile_fix.patch
 create mode 100644 package/screen/screen-install-fix.patch
package/screen/screen-4.0.2-cross_compile_fix.patch deleted +0 -524
deleted file mode 100644
index 17f05e5..0000000
@@ -1,524 +0,0 @@
---- a/configure.orig	2003-12-05 14:46:53.000000000 +0100
-+++ b/configure	2007-07-28 12:45:19.000000000 +0200
-@@ -124,7 +124,7 @@
-   fi
-   if test ! -f "$as_myself"; then
-     { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
--   { (exit 1); exit 1; }; }
-+    }
-   fi
-   case $CONFIG_SHELL in
-   '')
-@@ -174,7 +174,7 @@
-     ' >$as_me.lineno &&
-   chmod +x $as_me.lineno ||
-     { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
--   { (exit 1); exit 1; }; }
-+    }
- 
-   # Don't try to exec as it changes $[0], causing all sort of problems
-   # (the dirname of $[0] is not the place where we might find the
-@@ -397,7 +397,7 @@
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
--   { (exit 1); exit 1; }; }
-+    }
-     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-     eval "enable_$ac_feature=no" ;;
- 
-@@ -406,7 +406,7 @@
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
--   { (exit 1); exit 1; }; }
-+    }
-     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-     case $ac_option in
-       *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-@@ -588,7 +588,7 @@
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid package name: $ac_package" >&2
--   { (exit 1); exit 1; }; }
-+    }
-     ac_package=`echo $ac_package| sed 's/-/_/g'`
-     case $ac_option in
-       *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-@@ -601,7 +601,7 @@
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid package name: $ac_package" >&2
--   { (exit 1); exit 1; }; }
-+    }
-     ac_package=`echo $ac_package | sed 's/-/_/g'`
-     eval "with_$ac_package=no" ;;
- 
-@@ -625,7 +625,7 @@
- 
-   -*) { echo "$as_me: error: unrecognized option: $ac_option
- Try \`$0 --help' for more information." >&2
--   { (exit 1); exit 1; }; }
-+    }
-     ;;
- 
-   *=*)
-@@ -633,7 +633,7 @@
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
--   { (exit 1); exit 1; }; }
-+    }
-     ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-     eval "$ac_envvar='$ac_optarg'"
-     export $ac_envvar ;;
-@@ -652,7 +652,7 @@
- if test -n "$ac_prev"; then
-   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-   { echo "$as_me: error: missing argument to $ac_option" >&2
--   { (exit 1); exit 1; }; }
-+    }
- fi
- 
- # Be sure to have absolute paths.
-@@ -662,7 +662,7 @@
-   case $ac_val in
-     [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-     *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
--   { (exit 1); exit 1; }; };;
-+    };;
-   esac
- done
- 
-@@ -674,7 +674,7 @@
-   case $ac_val in
-     [\\/$]* | ?:[\\/]* ) ;;
-     *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
--   { (exit 1); exit 1; }; };;
-+    };;
-   esac
- done
- 
-@@ -728,15 +728,15 @@
- if test ! -r $srcdir/$ac_unique_file; then
-   if test "$ac_srcdir_defaulted" = yes; then
-     { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
--   { (exit 1); exit 1; }; }
-+    }
-   else
-     { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
--   { (exit 1); exit 1; }; }
-+    }
-   fi
- fi
- (cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-   { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
--   { (exit 1); exit 1; }; }
-+    }
- srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
- ac_env_build_alias_set=${build_alias+set}
- ac_env_build_alias_value=$build_alias
-@@ -1243,7 +1243,7 @@
- echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-   { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
- echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- fi
- 
- ac_ext=c
-@@ -1734,7 +1734,7 @@
- See \`config.log' for more details." >&5
- echo "$as_me: error: no acceptable C compiler found in \$PATH
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- 
- # Provide some information about the compiler.
- echo "$as_me:$LINENO:" \
-@@ -1856,7 +1856,7 @@
- echo "$as_me: error: cannot run C compiled programs.
- If you meant to cross compile, use \`--host'.
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
-     fi
-   fi
- fi
-@@ -1898,7 +1898,7 @@
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- fi
- 
- rm -f conftest$ac_cv_exeext
-@@ -1950,7 +1950,7 @@
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot compute suffix of object files: cannot compile
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- fi
- 
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
-@@ -2514,7 +2514,7 @@
- See \`config.log' for more details." >&5
- echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- fi
- 
- ac_ext=c
-@@ -2704,7 +2704,7 @@
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -2753,7 +2753,7 @@
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+  }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -2790,7 +2790,7 @@
- 
- { { echo "$as_me:$LINENO: error: Can't run the compiler - sorry" >&5
- echo "$as_me: error: Can't run the compiler - sorry" >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- fi
- rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-@@ -2800,7 +2800,7 @@
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+  }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -2830,7 +2830,7 @@
-   (exit $ac_status); }; }; then
-   { { echo "$as_me:$LINENO: error: Your compiler does not set the exit status - sorry" >&5
- echo "$as_me: error: Your compiler does not set the exit status - sorry" >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- else
-   echo "$as_me: program exited with status $ac_status" >&5
- echo "$as_me: failed program was:" >&5
-@@ -2900,7 +2900,7 @@
- if test -z "$ac_aux_dir"; then
-   { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
- echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- fi
- ac_config_guess="$SHELL $ac_aux_dir/config.guess"
- ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-@@ -4149,7 +4149,7 @@
- 
- { { echo "$as_me:$LINENO: error: !!! no select - no screen" >&5
- echo "$as_me: error: !!! no select - no screen" >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
-@@ -4163,7 +4163,7 @@
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+  }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -4272,7 +4272,7 @@
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+  }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -4365,7 +4365,7 @@
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+  }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -4460,7 +4460,7 @@
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+  }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -4562,7 +4562,7 @@
- else
-   { { echo "$as_me:$LINENO: error: you have neither usable sockets nor usable pipes -> no screen" >&5
- echo "$as_me: error: you have neither usable sockets nor usable pipes -> no screen" >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- fi
- 
- 
-@@ -4573,7 +4573,7 @@
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -4898,7 +4898,7 @@
- 
- { { echo "$as_me:$LINENO: error: !!! no tgetent - no screen" >&5
- echo "$as_me: error: !!! no tgetent - no screen" >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
-@@ -4915,7 +4915,7 @@
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -5359,7 +5359,7 @@
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -6206,7 +6206,7 @@
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -6482,7 +6482,7 @@
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -6598,8 +6598,6 @@
- LIBS="$oldlibs"
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--test -f /lib/libsec.a || test -f /usr/lib/libsec.a && LIBS="$LIBS -lsec"
--test -f /lib/libshadow.a || test -f /usr/lib/libshadow.a && LIBS="$LIBS -lshadow"
- oldlibs="$LIBS"
- LIBS="$LIBS -lsun"
- { echo "$as_me:$LINENO: checking IRIX sun library..." >&5
-@@ -7004,7 +7002,7 @@
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -7056,7 +7054,7 @@
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -7110,7 +7108,7 @@
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -7951,7 +7949,7 @@
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot run test program while cross compiling
- See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- else
-   cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
-@@ -7982,7 +7980,7 @@
- ( exit $ac_status )
- { { echo "$as_me:$LINENO: error: Can't run the compiler - internal error. Sorry." >&5
- echo "$as_me: error: Can't run the compiler - internal error. Sorry." >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- fi
- rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-@@ -8251,7 +8249,7 @@
-   if test ! -f "$as_myself"; then
-     { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
- echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
--   { (exit 1); exit 1; }; }
-+    }
-   fi
-   case $CONFIG_SHELL in
-   '')
-@@ -8302,7 +8300,7 @@
-   chmod +x $as_me.lineno ||
-     { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
- echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
--   { (exit 1); exit 1; }; }
-+    }
- 
-   # Don't try to exec as it changes $[0], causing all sort of problems
-   # (the dirname of $[0] is not the place where we might find the
-@@ -8494,7 +8492,7 @@
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&2;}
--   { (exit 1); exit 1; }; };;
-+    };;
-   --help | --hel | -h )
-     echo "$ac_cs_usage"; exit 0 ;;
-   --debug | --d* | -d )
-@@ -8516,7 +8514,7 @@
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&2;}
--   { (exit 1); exit 1; }; } ;;
-+    } ;;
- 
-   *) ac_config_targets="$ac_config_targets $1" ;;
- 
-@@ -8555,7 +8553,7 @@
-   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
--   { (exit 1); exit 1; }; };;
-+    };;
-   esac
- done
- 
-@@ -8750,7 +8748,7 @@
-     test ! -n "$as_dirs" || mkdir $as_dirs
-   fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
- echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
--   { (exit 1); exit 1; }; }; }
-+    }; }
- 
-   ac_builddir=.
- 
-@@ -8816,7 +8814,7 @@
-          # Absolute (can't be DOS-style, as IFS=:)
-          test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
--   { (exit 1); exit 1; }; }
-+    }
-          echo $f;;
-       *) # Relative
-          if test -f "$f"; then
-@@ -8829,7 +8827,7 @@
-            # /dev/null tree
-            { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
--   { (exit 1); exit 1; }; }
-+    }
-          fi;;
-       esac
-     done` || { (exit 1); exit 1; }
-@@ -8907,7 +8905,7 @@
-          # Absolute (can't be DOS-style, as IFS=:)
-          test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
--   { (exit 1); exit 1; }; }
-+    }
-          echo $f;;
-       *) # Relative
-          if test -f "$f"; then
-@@ -8920,7 +8918,7 @@
-            # /dev/null tree
-            { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
--   { (exit 1); exit 1; }; }
-+    }
-          fi;;
-       esac
-     done` || { (exit 1); exit 1; }
-@@ -9073,7 +9071,7 @@
-     test ! -n "$as_dirs" || mkdir $as_dirs
-   fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
- echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
--   { (exit 1); exit 1; }; }; }
-+    }; }
- 
-       rm -f $ac_file
-       mv $tmp/config.h $ac_file
---- a/pty.c.orig	2003-09-08 16:26:18.000000000 +0200
-+++ b/pty.c	2007-07-28 12:45:19.000000000 +0200
-@@ -34,9 +34,9 @@
- #endif
- 
- /* for solaris 2.1, Unixware (SVR4.2) and possibly others */
--#ifdef HAVE_SVR4_PTYS
--# include <sys/stropts.h>
--#endif
-+//#ifdef HAVE_SVR4_PTYS
-+//# include <sys/stropts.h>
-+//#endif
- 
- #if defined(sun) && defined(LOCKPTY) && !defined(TIOCEXCL)
- # include <sys/ttold.h>
---- a/sched.h.orig	2002-01-08 16:42:43.000000000 +0100
-+++ b/sched.h	2007-07-28 12:45:19.000000000 +0200
-@@ -22,6 +22,11 @@
-  * $Id: sched.h,v 1.1.1.1 1993/06/16 23:51:13 jnweiger Exp $ FAU
-  */
- 
-+#ifndef __SCHED_H
-+#define __SCHED_H
-+
-+#include <sys/time.h>
-+
- struct event
- {
-   struct event *next;
-@@ -41,3 +46,5 @@
- #define EV_READ		1
- #define EV_WRITE	2
- #define EV_ALWAYS	3
-+
-+#endif
package/screen/screen-4.0.2_install-fix.patch deleted +0 -21
deleted file mode 100644
index a2fa35d..0000000
@@ -1,21 +0,0 @@
-diff -ru screen-4.0.2_vanilla/Makefile.in screen-4.0.2_install-fixup/Makefile.in
---- screen-4.0.2_vanilla/Makefile.in	2003-12-05 13:59:39.000000000 +0000
-+++ screen-4.0.2_install-fixup/Makefile.in	2009-01-03 15:20:22.000000000 +0000
-@@ -71,14 +71,9 @@
- 	$(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(DEFS) $(OPTIONS) $(CFLAGS) $<
- 
- install_bin: .version screen
--	-if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \
--		then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi
--	$(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN)
--	-chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN)
--# This doesn't work if $(bindir)/screen is a symlink
--	-if [ -f $(DESTDIR)$(bindir)/screen ] && [ ! -f $(DESTDIR)$(bindir)/screen.old ]; then mv $(DESTDIR)$(bindir)/screen $(DESTDIR)$(bindir)/screen.old; fi
--	rm -f $(DESTDIR)$(bindir)/screen
--	(cd $(DESTDIR)$(bindir) && ln -sf $(SCREEN) screen)
-+	$(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/screen
-+	-chmod 4755 $(DESTDIR)$(bindir)/screen
-+	mkdir -p $(DESTDIR)$(SCREENENCODINGS)
- 	cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS)
- 
- ###############################################################################
package/screen/screen-cross_compile_fix.patch new file +524 -0

524 lines not on this page · raw message

package/screen/screen-install-fix.patch new file +21 -0
new file mode 100644
index 0000000..a2fa35d
@@ -0,0 +1,21 @@
+diff -ru screen-4.0.2_vanilla/Makefile.in screen-4.0.2_install-fixup/Makefile.in
+--- screen-4.0.2_vanilla/Makefile.in	2003-12-05 13:59:39.000000000 +0000
++++ screen-4.0.2_install-fixup/Makefile.in	2009-01-03 15:20:22.000000000 +0000
+@@ -71,14 +71,9 @@
+ 	$(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(DEFS) $(OPTIONS) $(CFLAGS) $<
+ 
+ install_bin: .version screen
+-	-if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \
+-		then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi
+-	$(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN)
+-	-chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN)
+-# This doesn't work if $(bindir)/screen is a symlink
+-	-if [ -f $(DESTDIR)$(bindir)/screen ] && [ ! -f $(DESTDIR)$(bindir)/screen.old ]; then mv $(DESTDIR)$(bindir)/screen $(DESTDIR)$(bindir)/screen.old; fi
+-	rm -f $(DESTDIR)$(bindir)/screen
+-	(cd $(DESTDIR)$(bindir) && ln -sf $(SCREEN) screen)
++	$(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/screen
++	-chmod 4755 $(DESTDIR)$(bindir)/screen
++	mkdir -p $(DESTDIR)$(SCREENENCODINGS)
+ 	cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS)
+ 
+ ###############################################################################
package/screen/screen.mk +2 -5
index 7159b03..54a9c9c 100644
@@ -3,15 +3,12 @@
 # screen
 #
 #############################################################
-SCREEN_VERSION = 4.0.2
-SCREEN_SITE = $(BR2_GNU_MIRROR)/screen
 
+SCREEN_VERSION = 4.0.3
+SCREEN_SITE = $(BR2_GNU_MIRROR)/screen
 SCREEN_DEPENDENCIES = ncurses
-
 SCREEN_CONF_ENV = CFLAGS=-DSYSV=1
-
 SCREEN_MAKE_OPT = -j1
-
 SCREEN_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) SCREEN=screen install_bin
 
 $(eval $(call AUTOTARGETS,package,screen))
Signature · 1 line
1.7.2.2
#11 lore raw

PATCH 12/13 screen: bump to version 4.0.3

Hello,

Quoted 5 lines · On Fri, 17 Dec 2010 14:04:33 -0300 Gustavo Zacarias <[email protected]>…
---
 .../screen/screen-4.0.2-cross_compile_fix.patch    |  524 --------------------
 package/screen/screen-4.0.2_install-fix.patch      |   21 -
 package/screen/screen-cross_compile_fix.patch      |  524 ++++++++++++++++++++

I am not terribly happy about this cross_compile_fix patch that directly hacks the ./configure script.

In bce15df3bea6d1ab4a88db9d31fc2dd30418decc, Nikel Kukard said "The cross compile fix is unavoidable". But do we have an idea of what the problem is exactly ?

Regards,

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#12 lore raw

PATCH 12/13 screen: bump to version 4.0.3

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> Hello,
Thomas> On Fri, 17 Dec 2010 14:04:33 -0300

Quoted 5 lines · Thomas> Gustavo Zacarias <[email protected]> wrote:
Quoted 5 lines

---

.../screen/screen-4.0.2-cross_compile_fix.patch    |  524 --------------------
package/screen/screen-4.0.2_install-fix.patch      |   21 -
package/screen/screen-cross_compile_fix.patch      |  524 ++++++++++++++++++++

Thomas> I am not terribly happy about this cross_compile_fix patch that Thomas> directly hacks the ./configure script.

Me neither. Notice that it was just renamed here, not introduced.

Thomas> In bce15df3bea6d1ab4a88db9d31fc2dd30418decc, Nikel Kukard said "The Thomas> cross compile fix is unavoidable". But do we have an idea of what the Thomas> problem is exactly ?

Sorry, haven't looked at it in details.

Signature · 1 line
Bye, Peter Korsgaard
#13 lore raw

PATCH 12/13 screen: bump to version 4.0.3

Quoted 10 lines · On Thu, 23 Dec 2010 09:16:10 +0100 Peter Korsgaard <[email protected]> wrote:
Quoted 5 lines
Quoted 5 lines

---

.../screen/screen-4.0.2-cross_compile_fix.patch    |  524 --------------------
package/screen/screen-4.0.2_install-fix.patch      |   21 -
package/screen/screen-cross_compile_fix.patch      |  524 ++++++++++++++++++++

Thomas> I am not terribly happy about this cross_compile_fix patch that Thomas> directly hacks the ./configure script.

Me neither. Notice that it was just renamed here, not introduced.

Yes, yes, it really wasn't a criticism of Gustavo's work here, not at all. Just wondering what this patch does.

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#14 lore raw

PATCH 12/13 screen: bump to version 4.0.3

Quoted 2 lines · Thomas Petazzoni

Yes, yes, it really wasn't a criticism of Gustavo's work here, not at all. Just wondering what this patch does.

Hi.
I'm not quite fond of huge "configure" patches, i'd rather patch configure.in and autoreconf since it's easier to port to a newer version later on - though it adds up to a little more build time.
I can give it a shot if we're happy to go this route in the future for packages.
Regards.

#15 lore raw

PATCH 12/13 screen: bump to version 4.0.3

Quoted 3 lines · On Thu, 23 Dec 2010 08:58:59 -0300 Gustavo Zacarias <[email protected]>…

I'm not quite fond of huge "configure" patches, i'd rather patch configure.in and autoreconf since it's easier to port to a newer version later on - though it adds up to a little more build time.

Agreed.

The idea is also to have those patches submitted upstream, so hopefully in one of the next releases, we can get rid of the patch and the autoreconfiguration step.

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#16 lore raw

PATCH 13/13 ed: bump to version 1.5

In reply to Gustavo Zacarias

* Bump to version 1.5

* Really configure right (or wrong depending on perspective) since we weren't building ed for the target it was completely broken.

---
 package/ed/ed.mk |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
package/ed/ed.mk +5 -3
index 158667b..e7016bf 100644
@@ -3,8 +3,10 @@
 # ed
 #
 #############################################################
-ED_VERSION:=1.1
-ED_SOURCE:=ed-$(ED_VERSION).tar.bz2
-ED_SITE:=$(BR2_GNU_MIRROR)/ed/
+
+ED_VERSION = 1.5
+ED_SITE = $(BR2_GNU_MIRROR)/ed
+ED_CONF_OPT = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)"
 
 $(eval $(call AUTOTARGETS,package,ed))
Signature · 1 line
1.7.2.2
#17 lore raw

PATCH 1/13 portmap: install initscript

In reply to Gustavo Zacarias
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Thanks to patrick.ziegler at fh-kl.de in the mailing list for noticing. Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]> Gustavo> ---

 Gustavo>  package/portmap/portmap.mk |    2 ++

Gustavo> 1 files changed, 2 insertions(+), 0 deletions(-)

Thanks, committed the entire series + the 6 extra patches you have added to the branch in the mean time.

Signature · 1 line
Bye, Peter Korsgaard
#18 lore raw

PATCH 1/13 portmap: install initscript

Quoted 8 lines · On Thu, 23 Dec 2010 00:21:52 +0100 Peter Korsgaard <[email protected]> wrote:

Gustavo> Thanks to patrick.ziegler at fh-kl.de in the mailing list for Gustavo> noticing. Signed-off-by: Gustavo Zacarias
Gustavo> <[email protected]> ---

 Gustavo>  package/portmap/portmap.mk |    2 ++

Gustavo> 1 files changed, 2 insertions(+), 0 deletions(-)

Thanks, committed the entire series + the 6 extra patches you have added to the branch in the mean time.

I'd prefer if all patches were sent to the list, unless they are really trivial. The "icu" package conversion for example, wasn't really trivial.

Thanks!

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#19 lore raw

PATCH 1/13 portmap: install initscript

Quoted 4 lines
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thanks, committed the entire series + the 6 extra patches you have added to the branch in the mean time.

Thomas> I'd prefer if all patches were sent to the list, unless they are really Thomas> trivial. The "icu" package conversion for example, wasn't really Thomas> trivial.

True. I'll wait until Gustavoz posts them in the future.

Signature · 1 line
Bye, Peter Korsgaard