mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 04:00:05 +02:00
Merge branch 'package-management'
Conflicts: app-arch/p7zip/p7zip-9.04.bep app-arch/p7zip/p7zip-9.13.bep app-arch/tar/tar-1.22.bep app-arch/tar/tar-1.23.bep app-arch/tar/tar-1.25.bep app-arch/xz-utils/xz-utils-4.999.9.bep app-cdr/bchunk/bchunk-1.2.0.bep app-cdr/cdrtools/cdrtools-2.01.01a66.bep app-cdr/cdrtools/cdrtools-3.01a01.bep app-crypt/gnupg/gnupg-1.4.11.bep app-doc/doxygen/doxygen-1.6.3.bep app-editors/nano/nano-2.2.6.bep app-editors/vim/vim-7.3.bep app-text/antiword/antiword-0.37.bep app-text/libpaper/libpaper-1.1.23.bep app-text/libpaper/libpaper-1.1.24.bep app-text/rman/rman-3.2.bep dev-db/sqlite/sqlite-3.6.22.bep dev-db/sqlite/sqlite-3.6.23.bep dev-db/sqlite/sqlite-3.7.2.bep dev-db/sqlite/sqlite-3.7.3.bep dev-db/sqlite/sqlite-3.7.4.bep dev-db/sqlite/sqlite-3.7.5.bep dev-lang/lua/lua-5.1.4.bep dev-lang/nasm/nasm-2.08.01.bep dev-lang/perl/patches/perl-5.10.0.patch dev-lang/python/python-2.5.4.bep dev-lang/python/python-2.6.4.bep dev-lang/python/python-2.6.5.bep dev-lang/python/python-2.6.6.bep dev-lang/python/python-2.6.7.bep dev-lang/python/python-2.6.8.bep dev-lang/python/python-3.2.bep dev-lang/python/python-3.2.recipe dev-lang/python/python-3.2a4.bep dev-lang/yasm/yasm-1.1.0.bep dev-libs/apr-util/apr-util-1.3.10.bep dev-libs/apr-util/apr-util-1.3.9.bep dev-libs/apr/apr-1.3.8.bep dev-libs/apr/apr-1.3.9.bep dev-libs/apr/apr-1.4.2.bep dev-libs/apr/patches/apr-1.4.2.patch dev-libs/expat/expat-2.0.1.bep dev-libs/fribidi/fribidi-0.19.2.bep dev-libs/icu/icu-4.4.1.bep dev-libs/libedit/libedit-20090923.bep dev-libs/libedit/libedit-20100424.bep dev-libs/libevent/libevent-1.4.11.bep dev-libs/libevent/libevent-1.4.13.bep dev-libs/libevent/libevent-1.4.14b.bep dev-libs/libevent/libevent-2.0.10.bep dev-libs/libiconv/libiconv-1.12.bep dev-libs/libiconv/libiconv-1.13.1.bep dev-libs/libpcre/libpcre-8.00.bep dev-libs/libpcre/libpcre-8.02.bep dev-libs/libpcre/libpcre-8.12.bep dev-libs/libxml2/libxml2-2.7.3.bep dev-libs/libxml2/libxml2-2.7.6.bep dev-libs/libxml2/libxml2-2.7.7.bep dev-libs/libxml2/libxml2-2.7.8.bep dev-libs/openssl/openssl-0.9.8l.bep dev-libs/openssl/openssl-0.9.8m.bep dev-libs/openssl/openssl-1.0.0.bep dev-libs/openssl/openssl-1.0.0a.bep dev-libs/openssl/openssl-1.0.0c.bep dev-qt/qtcore/qtcore-4.8.x-git.bep dev-qt/qtcore/qtcore-4.8.x.recipe dev-util/ccache/ccache-3.0.1.bep dev-util/cmake/cmake-2.6.4.bep dev-util/cmake/cmake-2.8.0.bep dev-util/cmake/cmake-2.8.1.bep dev-util/cmake/cmake-2.8.2.bep dev-util/cmake/cmake-2.8.3.bep dev-util/cmake/cmake-2.8.4.bep dev-util/ctags/ctags-5.8.bep dev-util/fastdep/fastdep-0.16.bep dev-util/gperf/gperf-3.0.4.bep dev-util/pkgconfig/pkgconfig-0.23.bep dev-util/pkgconfig/pkgconfig-0.25.bep dev-vcs/cvs/cvs-1.12.13.1.bep dev-vcs/cvs/cvs-1.12.13.bep dev-vcs/subversion/subversion-1.6.11.bep dev-vcs/subversion/subversion-1.6.12.bep dev-vcs/subversion/subversion-1.6.13.bep dev-vcs/subversion/subversion-1.6.15.bep dev-vcs/subversion/subversion-1.6.6.bep dev-vcs/subversion/subversion-1.6.9.bep dev-vcs/subversion/subversion-1.7.xx-svn.bep haiku-apps/bepdf/bepdf-1.1.1b4.bep haiku-apps/libwalter/libwalter-97.bep haiku-apps/paladin/paladin-1.3-hg.bep haiku-apps/pe/pe-2.4.3-600.bep haiku-apps/vision/patches/vision-908-gcc4.patch haiku-apps/vision/vision-0.9.7.bep haiku-libs/libwalter/libwalter-97.bep haiku-libs/libwalter/libwalter-97.recipe media-gfx/graphviz/graphviz-2.24.bep media-gfx/graphviz/graphviz-2.26.3.bep media-libs/flac/flac-1.2.1.bep media-libs/freetype/freetype-2.3.11.bep media-libs/freetype/freetype-2.4.2.bep media-libs/freetype/freetype-2.4.4.bep media-libs/ftgl/ftgl-2.1-svn.bep media-libs/guilib/guilib-1.2.1.bep media-libs/jpeg/jpeg-7.bep media-libs/jpeg/jpeg-8b.bep media-libs/jpeg/jpeg-8c.bep media-libs/libao/libao-1.0.0.bep media-libs/libmad/libmad-0.15.1b.bep media-libs/libmng/libmng-1.0.10.bep media-libs/libogg/libogg-1.1.4.bep media-libs/libogg/libogg-1.2.0.bep media-libs/libogg/libogg-1.2.2.bep media-libs/libpng/libpng-1.2.29.bep media-libs/libpng/libpng-1.2.30.bep media-libs/libpng/libpng-1.2.40.bep media-libs/libpng/libpng-1.2.41.bep media-libs/libpng/libpng-1.2.43.bep media-libs/libpng/libpng-1.2.44.bep media-libs/libpng/libpng-1.4.1.bep media-libs/libpng/libpng-1.4.2.bep media-libs/libpng/libpng-1.4.3.bep media-libs/libpng/libpng-1.4.4.bep media-libs/libpng/libpng-1.5.0.bep media-libs/libsdl/patches/libsdl-1.2-hg.patch media-libs/libtheora/libtheora-1.1.1.bep media-libs/libvorbis/libvorbis-1.2.3.bep media-libs/libvorbis/libvorbis-1.3.1.bep media-libs/libvorbis/libvorbis-1.3.2.bep media-libs/libvpx/libvpx-0.9.2-git.bep media-libs/smpeg/smpeg-0.4.5.bep media-libs/speex/speex-1.2-git.bep media-libs/speex/speex-1.2rc1.bep media-sound/lame/lame-3.98.4.bep media-sound/lame/lame-398-2.bep media-sound/vorbis-tools/vorbis-tools-1.2.0.bep media-sound/vorbis-tools/vorbis-tools-1.4.0.bep media-video/ffmpeg/ffmpeg-0.5.bep media-video/ffmpeg/ffmpeg-0.6.bep net-misc/curl/curl-7.18.2.bep net-misc/curl/curl-7.19.1.bep net-misc/curl/curl-7.19.2.bep net-misc/curl/curl-7.19.5.bep net-misc/curl/curl-7.19.7.bep net-misc/curl/curl-7.20.0.bep net-misc/curl/curl-7.20.1.bep net-misc/curl/curl-7.21.1.bep net-misc/curl/curl-7.21.2.bep net-misc/curl/curl-7.21.3.bep net-misc/openssh/openssh-5.4p1.bep net-misc/openssh/openssh-5.5p1.bep net-misc/openssh/openssh-5.6p1.bep net-misc/openssh/openssh-5.7p1.bep net-misc/openssh/openssh-5.8p1.bep net-wireless/b43-fwcutter/b43-fwcutter-012.bep sci-libs/gsl/gsl-1.14.bep sys-apps/ed/ed-1.4.bep sys-apps/gawk/gawk-3.1.8.bep sys-apps/grep/grep-2.5.4.bep sys-apps/grep/grep-2.7.bep sys-apps/groff/groff-1.20.1.bep sys-apps/man/man-1.6f.bep sys-apps/sed/sed-4.2.1.bep sys-apps/texinfo/texinfo-4.13a.bep sys-devel/autoconf/autoconf-2.68.bep sys-devel/automake/automake-1.11.1.bep sys-devel/bison/bison-2.4.1.bep sys-devel/bison/bison-2.4.bep sys-devel/flex/flex-2.5.35.bep sys-devel/gettext/gettext-0.18.1.1-dev.bep sys-devel/gettext/gettext-0.18.1.1.bep sys-devel/jam/jam-2.5.bep sys-devel/m4/m4-1.4.14.bep sys-libs/ncurses/ncurses-5.6.bep sys-libs/ncurses/ncurses-5.7.bep sys-libs/readline/readline-5.2.bep sys-libs/readline/readline-6.0.bep sys-libs/readline/readline-6.1.bep sys-libs/zlib/zlib-1.2.3.bep sys-libs/zlib/zlib-1.2.5.bep x11-libs/qt/qt-4.8.x-git.bep
This commit is contained in:
Oliver Tappe
@@ -1,32 +0,0 @@
|
||||
DESCRIPTION="GNU regular expression matcher"
|
||||
HOMEPAGE="http://www.gnu.org/software/grep/"
|
||||
SRC_URI="http://ftpmirror.gnu.org/grep/grep-2.12.tar.xz"
|
||||
CHECKSUM_MD5="8d2f0346d08b13c18afb81f0e8aa1e2f"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND="sys-devel/gettext >= 0.17
|
||||
sys-devel/libiconv >= 1.13.1"
|
||||
BUILD {
|
||||
cd grep-2.12
|
||||
libtoolize --force --copy --install
|
||||
aclocal -I m4
|
||||
autoconf
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
|
||||
--datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \
|
||||
--infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \
|
||||
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
cd grep-2.12
|
||||
make install
|
||||
}
|
||||
|
||||
TEST {
|
||||
cd grep-2.12
|
||||
make check
|
||||
}
|
||||
|
||||
LICENSE="GNU GPL v3"
|
||||
COPYRIGHT="1992-2012 Free Software Foundation, Inc."
|
||||
@@ -1,27 +0,0 @@
|
||||
DESCRIPTION="GNU regular expression matcher"
|
||||
HOMEPAGE="http://www.gnu.org/software/grep/"
|
||||
SRC_URI="http://ports-space.haiku-files.org/source/grep-2.14.tar.bz2"
|
||||
CHECKSUM_MD5="db55b9fc67d8c0895f3c73e94e2aebe3"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND="sys-devel/gettext >= 0.17
|
||||
sys-devel/libiconv >= 1.13.1"
|
||||
BUILD {
|
||||
cd grep-2.14
|
||||
|
||||
libtoolize --force --copy --install
|
||||
aclocal -I m4
|
||||
autoconf
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
|
||||
--datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \
|
||||
--infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \
|
||||
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
cd grep-2.14
|
||||
make install
|
||||
}
|
||||
LICENSE="GNU GPL v3"
|
||||
COPYRIGHT="1992-2012 Free Software Foundation, Inc."
|
||||
@@ -1,34 +0,0 @@
|
||||
DESCRIPTION="GNU regular expression matcher"
|
||||
HOMEPAGE="http://www.gnu.org/software/grep/"
|
||||
SRC_URI="http://ftp.gnu.org/pub/gnu/grep/grep-2.14.tar.xz"
|
||||
CHECKSUM_MD5="d4a3f03849d1e17ce56ab76aa5a24cab"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND="sys-devel/gettext >= 0.17
|
||||
sys-devel/libiconv >= 1.13.1"
|
||||
|
||||
BUILD {
|
||||
cd grep-2.14
|
||||
libtoolize --force --copy --install
|
||||
aclocal -I m4
|
||||
autoconf
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
|
||||
--datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \
|
||||
--infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \
|
||||
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
|
||||
--disable-perl-regexp
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
cd grep-2.14
|
||||
make install
|
||||
}
|
||||
|
||||
TEST {
|
||||
cd grep-2.14
|
||||
make check
|
||||
}
|
||||
|
||||
LICENSE="GNU GPL v3"
|
||||
COPYRIGHT="1992-2012 Free Software Foundation, Inc."
|
||||
71
sys-apps/grep/grep-2.14.recipe
Normal file
71
sys-apps/grep/grep-2.14.recipe
Normal file
@@ -0,0 +1,71 @@
|
||||
SUMMARY="GNU regular expression matcher"
|
||||
DESCRIPTION="The grep command searches one or more input files for lines containing a match to a specified pattern. By default, grep prints the matching lines."
|
||||
HOMEPAGE="http://www.gnu.org/software/grep/"
|
||||
LICENSE="GNU GPL v3"
|
||||
COPYRIGHT="1992-2012 Free Software Foundation, Inc."
|
||||
SRC_URI="http://ports-space.haiku-files.org/source/grep-2.14.tar.bz2"
|
||||
CHECKSUM_MD5="db55b9fc67d8c0895f3c73e94e2aebe3"
|
||||
# XZ file format:
|
||||
#SRC_URI="http://ftp.gnu.org/pub/gnu/grep/grep-2.14.tar.xz"
|
||||
#CHECKSUM_MD5="d4a3f03849d1e17ce56ab76aa5a24cab"
|
||||
REVISION="5"
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
||||
|
||||
PATCHES="grep-2.14-gcc2.patch"
|
||||
|
||||
PROVIDES="
|
||||
grep = $portVersion compat >= 2
|
||||
cmd:egrep = $portVersion compat >= 2
|
||||
cmd:fgrep = $portVersion compat >= 2
|
||||
cmd:grep = $portVersion compat >= 2
|
||||
"
|
||||
REQUIRES="
|
||||
haiku >= $haikuVersion
|
||||
lib:libiconv
|
||||
lib:libintl
|
||||
"
|
||||
BUILD_REQUIRES="
|
||||
devel:libiconv
|
||||
devel:libintl
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
haiku_devel >= $haikuVersion
|
||||
cmd:aclocal
|
||||
cmd:autoconf
|
||||
cmd:automake
|
||||
cmd:gcc
|
||||
cmd:gettext
|
||||
cmd:ld
|
||||
cmd:libtoolize
|
||||
cmd:make
|
||||
"
|
||||
|
||||
defineDebugInfoPackage grep \
|
||||
$binDir/egrep \
|
||||
$binDir/fgrep \
|
||||
$binDir/grep
|
||||
|
||||
SOURCE_DIR="$portVersionedName"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
libtoolize --force --copy --install
|
||||
aclocal -I m4
|
||||
autoconf
|
||||
runConfigure ./configure \
|
||||
--disable-perl-regexp
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
|
||||
rm $libDir/charset.alias
|
||||
rmdir $libDir
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
make check
|
||||
}
|
||||
@@ -1,26 +0,0 @@
|
||||
DESCRIPTION="GNU regular expression matcher"
|
||||
HOMEPAGE="http://www.gnu.org/software/grep/"
|
||||
SRC_URI="http://ftp.gnu.org/gnu/grep/grep-2.5.4.tar.bz2"
|
||||
CHECKSUM_MD5="5650ee2ae6ea4b39e9459d7d0585b315"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND=""
|
||||
BUILD {
|
||||
cd grep-2.5.4
|
||||
libtoolize --force --copy --install
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY`
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
cd grep-2.5.4
|
||||
make install
|
||||
}
|
||||
|
||||
TEST {
|
||||
cd grep-2.5.4
|
||||
make check
|
||||
}
|
||||
|
||||
LICENSE="GNU GPL v3"
|
||||
COPYRIGHT="1992-2010 Free Software Foundation, Inc."
|
||||
@@ -1,26 +0,0 @@
|
||||
DESCRIPTION="GNU regular expression matcher"
|
||||
HOMEPAGE="http://www.gnu.org/software/grep/"
|
||||
SRC_URI="http://ftp.gnu.org/gnu/grep/grep-2.6.1.tar.gz"
|
||||
CHECKSUM_MD5="8d1496da11029112a4d0986cbf09e26f"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND=""
|
||||
BUILD {
|
||||
cd grep-2.6.1
|
||||
libtoolize --force --copy --install
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY`
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
cd grep-2.6.1
|
||||
make install
|
||||
}
|
||||
|
||||
TEST {
|
||||
cd grep-2.6.1
|
||||
make check
|
||||
}
|
||||
|
||||
LICENSE="GNU GPL v3"
|
||||
COPYRIGHT="1992-2010 Free Software Foundation, Inc."
|
||||
@@ -1,26 +0,0 @@
|
||||
DESCRIPTION="GNU regular expression matcher"
|
||||
HOMEPAGE="http://www.gnu.org/software/grep/"
|
||||
SRC_URI="http://ftp.gnu.org/gnu/grep/grep-2.6.3.tar.gz"
|
||||
CHECKSUM_MD5="3095b57837b312f087c0680559de7f13"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND=""
|
||||
BUILD {
|
||||
cd grep-2.6.3
|
||||
libtoolize --force --copy --install
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY`
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
cd grep-2.6.3
|
||||
make install
|
||||
}
|
||||
|
||||
TEST {
|
||||
cd grep-2.6.3
|
||||
make check
|
||||
}
|
||||
|
||||
LICENSE="GNU GPL v3"
|
||||
COPYRIGHT="1992-2010 Free Software Foundation, Inc."
|
||||
@@ -1,32 +0,0 @@
|
||||
DESCRIPTION="GNU regular expression matcher"
|
||||
HOMEPAGE="http://www.gnu.org/software/grep/"
|
||||
SRC_URI="ftp://mirrors.kernel.org/gnu/grep/grep-2.7.tar.gz"
|
||||
CHECKSUM_MD5="e848f07e3e79aa7899345d17c7e4115e"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="stable"
|
||||
DEPEND="sys-devel/gettext >= 0.17
|
||||
sys-devel/libiconv >= 1.13.1"
|
||||
BUILD {
|
||||
cd grep-2.7
|
||||
libtoolize --force --copy --install
|
||||
aclocal -I m4
|
||||
autoconf
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
|
||||
--datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \
|
||||
--infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \
|
||||
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL {
|
||||
cd grep-2.7
|
||||
make install
|
||||
}
|
||||
|
||||
TEST {
|
||||
cd grep-2.7
|
||||
make check
|
||||
}
|
||||
|
||||
LICENSE="GNU GPL v3"
|
||||
COPYRIGHT="1992-2010 Free Software Foundation, Inc."
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur ./grep-2.14-original/lib/fts.c ./grep-2.14/lib/fts.c
|
||||
--- ./grep-2.14-original/lib/fts.c 2012-02-26 14:01:23.001310720 +0000
|
||||
+++ ./grep-2.14/lib/fts.c 2012-12-26 19:30:29.630718464 +0000
|
||||
diff -Naur grep-2.14-original/lib/fts.c grep-2.14/lib/fts.c
|
||||
--- grep-2.14-original/lib/fts.c 2012-02-26 14:01:23.001310720 +0000
|
||||
+++ grep-2.14/lib/fts.c 2012-12-26 19:30:29.630718464 +0000
|
||||
@@ -1278,6 +1278,7 @@
|
||||
nlink_t nlinks;
|
||||
bool nostat;
|
||||
@@ -20,9 +20,9 @@ diff -Naur ./grep-2.14-original/lib/fts.c ./grep-2.14/lib/fts.c
|
||||
|
||||
/*
|
||||
* Nlinks is the number of possible entries of type directory in the
|
||||
diff -Naur ./grep-2.14-original/lib/regcomp.c ./grep-2.14/lib/regcomp.c
|
||||
--- ./grep-2.14-original/lib/regcomp.c 2012-07-03 12:54:55.058982400 +0000
|
||||
+++ ./grep-2.14/lib/regcomp.c 2012-12-26 19:31:31.972029952 +0000
|
||||
diff -Naur grep-2.14-original/lib/regcomp.c grep-2.14/lib/regcomp.c
|
||||
--- grep-2.14-original/lib/regcomp.c 2012-07-03 12:54:55.058982400 +0000
|
||||
+++ grep-2.14/lib/regcomp.c 2012-12-26 19:31:31.972029952 +0000
|
||||
@@ -952,10 +952,10 @@
|
||||
internal_function
|
||||
init_word_char (re_dfa_t *dfa)
|
||||
@@ -35,9 +35,9 @@ diff -Naur ./grep-2.14-original/lib/regcomp.c ./grep-2.14/lib/regcomp.c
|
||||
if (BE (dfa->map_notascii == 0, 1))
|
||||
{
|
||||
bitset_word_t bits0 = 0x00000000;
|
||||
diff -Naur ./grep-2.14-original/src/dfasearch.c ./grep-2.14/src/dfasearch.c
|
||||
--- ./grep-2.14-original/src/dfasearch.c 2012-08-07 15:01:53.033030144 +0000
|
||||
+++ ./grep-2.14/src/dfasearch.c 2012-12-26 19:33:56.699138048 +0000
|
||||
diff -Naur grep-2.14-original/src/dfasearch.c grep-2.14/src/dfasearch.c
|
||||
--- grep-2.14-original/src/dfasearch.c 2012-08-07 15:01:53.033030144 +0000
|
||||
+++ grep-2.14/src/dfasearch.c 2012-12-26 19:33:56.699138048 +0000
|
||||
@@ -216,6 +216,7 @@
|
||||
int backref;
|
||||
regoff_t start;
|
||||
@@ -55,9 +55,9 @@ diff -Naur ./grep-2.14-original/src/dfasearch.c ./grep-2.14/src/dfasearch.c
|
||||
mb_case_map_apply (map, &off, &len);
|
||||
*match_size = len;
|
||||
ret_val = off;
|
||||
diff -Naur ./grep-2.14-original/src/kwsearch.c ./grep-2.14/src/kwsearch.c
|
||||
--- ./grep-2.14-original/src/kwsearch.c 2012-06-16 17:08:38.034078720 +0000
|
||||
+++ ./grep-2.14/src/kwsearch.c 2012-12-26 19:36:28.265814016 +0000
|
||||
diff -Naur grep-2.14-original/src/kwsearch.c grep-2.14/src/kwsearch.c
|
||||
--- grep-2.14-original/src/kwsearch.c 2012-06-16 17:08:38.034078720 +0000
|
||||
+++ grep-2.14/src/kwsearch.c 2012-12-26 19:36:28.265814016 +0000
|
||||
@@ -39,9 +39,9 @@
|
||||
? mbtolower (pattern, &psize, &map)
|
||||
: pattern);
|
||||
@@ -104,9 +104,9 @@ diff -Naur ./grep-2.14-original/src/kwsearch.c ./grep-2.14/src/kwsearch.c
|
||||
mb_case_map_apply (map, &off, &len);
|
||||
|
||||
*match_size = len;
|
||||
diff -Naur ./grep-2.14-original/src/main.c ./grep-2.14/src/main.c
|
||||
--- ./grep-2.14-original/src/main.c 2012-08-06 11:38:32.032768000 +0000
|
||||
+++ ./grep-2.14/src/main.c 2012-12-26 19:39:22.737411072 +0000
|
||||
diff -Naur grep-2.14-original/src/main.c grep-2.14/src/main.c
|
||||
--- grep-2.14-original/src/main.c 2012-08-06 11:38:32.032768000 +0000
|
||||
+++ grep-2.14/src/main.c 2012-12-26 19:39:22.737411072 +0000
|
||||
@@ -460,6 +460,7 @@
|
||||
if (SEEK_HOLE != SEEK_END && usable_st_size (st))
|
||||
{
|
||||
@@ -140,9 +140,9 @@ diff -Naur ./grep-2.14-original/src/main.c ./grep-2.14/src/main.c
|
||||
if (fstat (STDOUT_FILENO, &tmp_stat) == 0 && S_ISREG (tmp_stat.st_mode))
|
||||
out_stat = tmp_stat;
|
||||
|
||||
diff -Naur ./grep-2.14-original/src/searchutils.c ./grep-2.14/src/searchutils.c
|
||||
--- ./grep-2.14-original/src/searchutils.c 2012-06-16 17:08:38.034340864 +0000
|
||||
+++ ./grep-2.14/src/searchutils.c 2012-12-26 19:32:59.044826624 +0000
|
||||
diff -Naur grep-2.14-original/src/searchutils.c grep-2.14/src/searchutils.c
|
||||
--- grep-2.14-original/src/searchutils.c 2012-06-16 17:08:38.034340864 +0000
|
||||
+++ grep-2.14/src/searchutils.c 2012-12-26 19:32:59.044826624 +0000
|
||||
@@ -80,6 +80,7 @@
|
||||
static mb_len_map_t *len_map;
|
||||
static size_t outalloc;
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
diff -urN grep-2.7/src/kwsearch.c grep-2.7-haiku/src/kwsearch.c
|
||||
--- grep-2.7/src/kwsearch.c 2010-08-13 23:36:17.039059456 +0000
|
||||
+++ grep-2.7-haiku/src/kwsearch.c 2010-09-22 12:39:11.677642240 +0000
|
||||
@@ -111,8 +111,9 @@
|
||||
/* The match was a part of multibyte character, advance at least
|
||||
one byte to ensure no infinite loop happens. */
|
||||
mbstate_t s;
|
||||
+ size_t mb_len;
|
||||
memset (&s, 0, sizeof s);
|
||||
- size_t mb_len = mbrlen (mb_start, (buf + size) - (beg + offset), &s);
|
||||
+ mb_len = mbrlen (mb_start, (buf + size) - (beg + offset), &s);
|
||||
if (mb_len == (size_t) -2)
|
||||
goto failure;
|
||||
beg = mb_start;
|
||||
Reference in New Issue
Block a user