SHA256
3
0
forked from pool/libedit

Accepting request 106720 from home:elvigia:branches:devel:libraries:c_c++

- Update to version 20110802, fix use after free triggerable
  with sftp autocompletion and MALLOC_PERTURB set.

OBS-URL: https://build.opensuse.org/request/show/106720
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libedit?expand=0&rev=45
This commit is contained in:
Cristian Rodríguez 2012-02-23 19:01:31 +00:00 committed by Git OBS Bridge
parent 0bfc3455b3
commit 1aea2acc31
6 changed files with 33 additions and 52 deletions

View File

@ -1,19 +1,19 @@
--- configure.ac.orig --- configure.ac.orig
+++ configure.ac +++ configure.ac
@@ -34,7 +34,7 @@ EL_MANTYPE @@ -48,7 +48,7 @@ AC_CHECK_LIB(terminfo, tgetent,,
[AC_CHECK_LIB(termcap, tgetent,,
[AC_CHECK_LIB(termlib, tgetent,,
AC_CHECK_LIB(curses, tgetent,, [AC_CHECK_LIB(curses, tgetent,,
- [AC_CHECK_LIB(ncurses, tgetent,, - [AC_CHECK_LIB(ncurses, tgetent,,
+ [AC_CHECK_LIB(ncursesw, tgetent,, + [AC_CHECK_LIB(ncursesw, tgetent,,
[AC_MSG_ERROR([libcurses or libncurses are required!])] )] ) [AC_MSG_ERROR([libcurses or libncurses are required!])]
)]
)]
--- src/Makefile.am.orig --- src/Makefile.am.orig
+++ src/Makefile.am +++ src/Makefile.am
@@ -44,6 +44,7 @@ libedit_la_SOURCES = chared.c common.c e @@ -44,6 +44,7 @@ libedit_la_SOURCES = chared.c common.c e
histedit.h key.h map.h chartype.h parse.h prompt.h read.h refresh.h \ histedit.h keymacro.h map.h chartype.h parse.h prompt.h read.h refresh.h \
search.h sig.h sys.h el_term.h tty.h vis.h filecomplete.h \ search.h sig.h sys.h terminal.h tty.h vis.h filecomplete.h \
editline/readline.h editline/readline.h
+libedit_la_CFLAGS = $(shell ncursesw6-config --cflags) +libedit_la_CFLAGS = $(shell ncursesw6-config --cflags)
if WIDECHAR if WIDECHAR

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2f3ec1581a0b3a767fa0393eb47890965bdca5daee8c0e0b6e911d32671f0864
size 366942

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0b5ec9aa41faff761cda7819add93e9d8cb9c0bad85e65a686475e8375ac8a71
size 445533

View File

@ -1,24 +0,0 @@
--- aclocal.m4.orig 2010-04-24 23:29:53.000000000 +0200
+++ aclocal.m4 2010-04-24 23:30:29.000000000 +0200
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
-[m4_warning([this file was generated for autoconf 2.65.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.60],,
+[m4_warning([this file was generated for autoconf 2.60.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
--- configure.ac.orig 2010-04-24 23:30:34.000000000 +0200
+++ configure.ac 2010-04-24 23:30:42.000000000 +0200
@@ -9,7 +9,7 @@
# "./configure --disable-silent-rules" or "make V=1"
#
-AC_PREREQ(2.65)
+AC_PREREQ(2.60)
AC_INIT(libedit, [EL_RELEASE],, libedit-[EL_TIMESTAMP])
AC_CONFIG_SRCDIR([src/strlcat.c])
AC_CONFIG_HEADER([config.h])

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Feb 23 18:56:27 UTC 2012 - crrodriguez@opensuse.org
- Update to version 20110802, fix use after free triggerable
with sftp autocompletion and MALLOC_PERTURB set.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Nov 13 14:49:40 UTC 2011 - jengelh@medozas.de Sun Nov 13 14:49:40 UTC 2011 - jengelh@medozas.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package libedit # spec file for package libedit
# #
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,29 +16,29 @@
# #
Name: libedit Name: libedit
Version: 3.0.snap20100424 Version: 3.0.snap20110802
Release: 9 Release: 0
%define pkg_name libedit %define pkg_name libedit
%define pkg_version 20100424-3.0 %define pkg_version 20110802-3.0
# #
License: BSD-3-Clause
Group: Development/Libraries/C and C++
# #
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++ ncurses-devel pkgconfig BuildRequires: gcc-c++
BuildRequires: libtool BuildRequires: libtool
BuildRequires: ncurses-devel
BuildRequires: pkgconfig
# #
URL: http://www.thrysoee.dk/editline/ Url: http://www.thrysoee.dk/editline/
# http://www.thrysoee.dk/editline/%{pkg_name}-%{pkg_version}.tar.gz # http://www.thrysoee.dk/editline/%{pkg_name}-%{pkg_version}.tar.gz
Source: %{pkg_name}-%{pkg_version}.tar.bz2 Source: %{pkg_name}-%{pkg_version}.tar.gz
Source1: README.SuSE Source1: README.SuSE
Source2: baselibs.conf Source2: baselibs.conf
Patch1: libedit-downgrade_autoconf.patch
Patch2: libedit-20100424-3.0-ncurses.patch Patch2: libedit-20100424-3.0-ncurses.patch
# #
Summary: Command Line Editing and History Library Summary: Command Line Editing and History Library
License: BSD-3-Clause
Group: Development/Libraries/C and C++
%description %description
libedit is a command line editing and history library. It is designed libedit is a command line editing and history library. It is designed
@ -49,10 +49,10 @@ at a terminal prompt.
%define soname 0 %define soname 0
%package -n %{library_name} %package -n %{library_name}
Group: Development/Libraries/C and C++
Provides: %{pkg_name} = %{version}-%{release} Provides: %{pkg_name} = %{version}-%{release}
Obsoletes: %{pkg_name} < %{version} Obsoletes: %{pkg_name} < %{version}
Summary: Command Line Editing and History Library Summary: Command Line Editing and History Library
Group: Development/Libraries/C and C++
%description -n %{library_name} %description -n %{library_name}
libedit is a command line editing and history library. It is designed libedit is a command line editing and history library. It is designed
@ -60,11 +60,11 @@ to be used by interactive programs that allow the user to type commands
at a terminal prompt. at a terminal prompt.
%package -n libedit-devel %package -n libedit-devel
Group: Development/Libraries/C and C++
Requires: %{library_name} = %{version} Requires: %{library_name} = %{version}
Provides: %{library_name}-devel = %{version}-%{release} Provides: %{library_name}-devel = %{version}-%{release}
Requires: glibc-devel Requires: glibc-devel
Summary: Development files for libedit Summary: Development files for libedit
Group: Development/Libraries/C and C++
%description -n libedit-devel %description -n libedit-devel
libedit is a command line editing and history library. It is designed libedit is a command line editing and history library. It is designed
@ -76,7 +76,6 @@ This package holds the development files for libedit.
%prep %prep
%setup -n %{pkg_name}-%{pkg_version} %setup -n %{pkg_name}-%{pkg_version}
%{__cp} %{S:1} . %{__cp} %{S:1} .
%patch1
%patch2 %patch2
%build %build