mbox

pcre: Update to 8.38

Message ID 1459416021-1469-1-git-send-email-matthias.fischer@ipfire.org
State Accepted
Commit 0a0059c3e6a21a19f18542c170e57509a1eb53a3
Headers

Message

Matthias Fischer March 31, 2016, 8:20 p.m. UTC 
  Bugfix release

For complete changelog see:
http://www.pcre.org/original/changelog.txt

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
---
 config/rootfiles/common/pcre |  2 +-
 lfs/pcre                     | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

Comments

Michael Tremer March 31, 2016, 11:39 p.m. UTC | #1 
Hi,

I pulled this in, but had to add an extra commit to delete the patches.
Please take care of this next time or the patch directory will soon be
cluttered with unused patches.

Best,
-Michael

On Thu, 2016-03-31 at 11:20 +0200, Matthias Fischer wrote:
> Bugfix release
> 
> For complete changelog see:
> http://www.pcre.org/original/changelog.txt
> 
> Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
> ---
>  config/rootfiles/common/pcre |  2 +-
>  lfs/pcre                     | 11 +++--------
>  2 files changed, 4 insertions(+), 9 deletions(-)
> 
> diff --git a/config/rootfiles/common/pcre
> b/config/rootfiles/common/pcre
> index 8c4cc2a..1d6310f 100644
> --- a/config/rootfiles/common/pcre
> +++ b/config/rootfiles/common/pcre
> @@ -10,7 +10,7 @@
>  #usr/lib/libpcre.la
>  usr/lib/libpcre.so
>  usr/lib/libpcre.so.1
> -usr/lib/libpcre.so.1.2.5
> +usr/lib/libpcre.so.1.2.6
>  #usr/lib/libpcrecpp.la
>  usr/lib/libpcrecpp.so
>  usr/lib/libpcrecpp.so.0
> diff --git a/lfs/pcre b/lfs/pcre
> index fd66350..ddbd0b5 100644
> --- a/lfs/pcre
> +++ b/lfs/pcre
> @@ -1,7 +1,7 @@
>  ####################################################################
> ###########
>  #                                                                   
>           #
>  # IPFire.org - A linux based
> firewall                                         #
> -# Copyright (C) 2015  Michael Tremer & Christian
> Schmidt                      #
> +# Copyright (C) 2016  Michael Tremer & Christian
> Schmidt                      #
>  #                                                                   
>           #
>  # This program is free software: you can redistribute it and/or
> modify        #
>  # it under the terms of the GNU General Public License as published
> by        #
> @@ -24,7 +24,7 @@
>  
>  include Config
>  
> -VER        = 8.37
> +VER        = 8.38
>  
>  THISAPP    = pcre-$(VER)
>  DL_FILE    = $(THISAPP).tar.gz
> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
>  
>  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>  
> -$(DL_FILE)_MD5 = 6e0cc6d1bdac7a4308151f9b3571b86e
> +$(DL_FILE)_MD5 = 8a353fe1450216b6655dfcf3561716d9
>  
>  install : $(TARGET)
>  
> @@ -70,11 +70,6 @@ $(subst %,%_MD5,$(objects)) :
>  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>  	@$(PREBUILD)
>  	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf
> $(DIR_DL)/$(DL_FILE)
> -	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-
> 8.37-Fix-buffer-overflow-for-named-recursive-back-referen.patch
> -	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-
> 8.37-Fix-buffer-overflow-for-forward-reference-within-bac.patch
> -	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-
> 8.37-Fix-named-forward-reference-to-duplicate-group-numbe.patch
> -	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-
> 8.37-Fix-another-buffer-overflow.patch
> -	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-
> 8.37-Fix-buffer-overflow-for-named-references-in-situatio.patch
>  	cd $(DIR_APP) && ./configure \
>  		--prefix=/usr \
>  		--disable-static \
ummeegge April 1, 2016, 3:13 a.m. UTC | #2 
Hi Matthias,
great that you provide this update, tried some time ago the same and have had problems while build it cause the new pcre version needed bzlib.h. I changed the building order in make.sh as far as i remember so that bzip2 was build before pcre.

Don´t you experienced similar problems ?

Greetings,

Erik


Am 31.03.2016 um 11:20 schrieb Matthias Fischer <matthias.fischer@ipfire.org>:

> Bugfix release
> 
> For complete changelog see:
> http://www.pcre.org/original/changelog.txt
> 
> Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
> ---
> config/rootfiles/common/pcre |  2 +-
> lfs/pcre                     | 11 +++--------
> 2 files changed, 4 insertions(+), 9 deletions(-)
> 
> diff --git a/config/rootfiles/common/pcre b/config/rootfiles/common/pcre
> index 8c4cc2a..1d6310f 100644
> --- a/config/rootfiles/common/pcre
> +++ b/config/rootfiles/common/pcre
> @@ -10,7 +10,7 @@
> #usr/lib/libpcre.la
> usr/lib/libpcre.so
> usr/lib/libpcre.so.1
> -usr/lib/libpcre.so.1.2.5
> +usr/lib/libpcre.so.1.2.6
> #usr/lib/libpcrecpp.la
> usr/lib/libpcrecpp.so
> usr/lib/libpcrecpp.so.0
> diff --git a/lfs/pcre b/lfs/pcre
> index fd66350..ddbd0b5 100644
> --- a/lfs/pcre
> +++ b/lfs/pcre
> @@ -1,7 +1,7 @@
> ###############################################################################
> #                                                                             #
> # IPFire.org - A linux based firewall                                         #
> -# Copyright (C) 2015  Michael Tremer & Christian Schmidt                      #
> +# Copyright (C) 2016  Michael Tremer & Christian Schmidt                      #
> #                                                                             #
> # This program is free software: you can redistribute it and/or modify        #
> # it under the terms of the GNU General Public License as published by        #
> @@ -24,7 +24,7 @@
> 
> include Config
> 
> -VER        = 8.37
> +VER        = 8.38
> 
> THISAPP    = pcre-$(VER)
> DL_FILE    = $(THISAPP).tar.gz
> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
> 
> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> 
> -$(DL_FILE)_MD5 = 6e0cc6d1bdac7a4308151f9b3571b86e
> +$(DL_FILE)_MD5 = 8a353fe1450216b6655dfcf3561716d9
> 
> install : $(TARGET)
> 
> @@ -70,11 +70,6 @@ $(subst %,%_MD5,$(objects)) :
> $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> 	@$(PREBUILD)
> 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
> -	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-buffer-overflow-for-named-recursive-back-referen.patch
> -	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-buffer-overflow-for-forward-reference-within-bac.patch
> -	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-named-forward-reference-to-duplicate-group-numbe.patch
> -	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-another-buffer-overflow.patch
> -	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-buffer-overflow-for-named-references-in-situatio.patch
> 	cd $(DIR_APP) && ./configure \
> 		--prefix=/usr \
> 		--disable-static \
> --
> 2.8.0
>
Matthias Fischer April 1, 2016, 3:38 a.m. UTC | #3 
Hi,

On 31.03.2016 18:13, ummeegge wrote:
> Hi Matthias,
> great that you provide this update, tried some time ago the same and have had problems while build it cause the new pcre version needed bzlib.h. I changed the building order in make.sh as far as i remember so that bzip2 was build before pcre.
> 
> Don´t you experienced similar problems ?

No, I hadn't any problems at all:
In my 'make.sh' (based on current 'next'), 'bzip2' is being built on
line 299 (lfsmake1 bzip2) and 354 (lfsmake2 bzip2), 'pcre' on line 349
(lfsmake2 pcre), line 350 (lfsmake2 pcre-compat) and line 514
(ipfiremake pcre). No errors. Production machine is running.

The only thing that bugged me: as a burned child, I wasn't REALLY sure
that this update would work for everyone. I tested - it worked - amongst
other things it worked with 'snort 2.9.8.0', so finally I pushed it. But
being too careful I left the old patch-files... Michael took care of
them. ;-).

Best,
Matthias

> Greetings,
> 
> Erik
> 
> 
> Am 31.03.2016 um 11:20 schrieb Matthias Fischer <matthias.fischer@ipfire.org>:
> 
>> Bugfix release
>> 
>> For complete changelog see:
>> http://www.pcre.org/original/changelog.txt
>> 
>> Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
>> ---
>> config/rootfiles/common/pcre |  2 +-
>> lfs/pcre                     | 11 +++--------
>> 2 files changed, 4 insertions(+), 9 deletions(-)
>> 
>> diff --git a/config/rootfiles/common/pcre b/config/rootfiles/common/pcre
>> index 8c4cc2a..1d6310f 100644
>> --- a/config/rootfiles/common/pcre
>> +++ b/config/rootfiles/common/pcre
>> @@ -10,7 +10,7 @@
>> #usr/lib/libpcre.la
>> usr/lib/libpcre.so
>> usr/lib/libpcre.so.1
>> -usr/lib/libpcre.so.1.2.5
>> +usr/lib/libpcre.so.1.2.6
>> #usr/lib/libpcrecpp.la
>> usr/lib/libpcrecpp.so
>> usr/lib/libpcrecpp.so.0
>> diff --git a/lfs/pcre b/lfs/pcre
>> index fd66350..ddbd0b5 100644
>> --- a/lfs/pcre
>> +++ b/lfs/pcre
>> @@ -1,7 +1,7 @@
>> ###############################################################################
>> #                                                                             #
>> # IPFire.org - A linux based firewall                                         #
>> -# Copyright (C) 2015  Michael Tremer & Christian Schmidt                      #
>> +# Copyright (C) 2016  Michael Tremer & Christian Schmidt                      #
>> #                                                                             #
>> # This program is free software: you can redistribute it and/or modify        #
>> # it under the terms of the GNU General Public License as published by        #
>> @@ -24,7 +24,7 @@
>> 
>> include Config
>> 
>> -VER        = 8.37
>> +VER        = 8.38
>> 
>> THISAPP    = pcre-$(VER)
>> DL_FILE    = $(THISAPP).tar.gz
>> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
>> 
>> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>> 
>> -$(DL_FILE)_MD5 = 6e0cc6d1bdac7a4308151f9b3571b86e
>> +$(DL_FILE)_MD5 = 8a353fe1450216b6655dfcf3561716d9
>> 
>> install : $(TARGET)
>> 
>> @@ -70,11 +70,6 @@ $(subst %,%_MD5,$(objects)) :
>> $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>> 	@$(PREBUILD)
>> 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
>> -	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-buffer-overflow-for-named-recursive-back-referen.patch
>> -	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-buffer-overflow-for-forward-reference-within-bac.patch
>> -	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-named-forward-reference-to-duplicate-group-numbe.patch
>> -	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-another-buffer-overflow.patch
>> -	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-buffer-overflow-for-named-references-in-situatio.patch
>> 	cd $(DIR_APP) && ./configure \
>> 		--prefix=/usr \
>> 		--disable-static \
>> --
>> 2.8.0
>> 
>
ummeegge April 1, 2016, 4:25 a.m. UTC | #4 
Great :-)
Greetings,

Erik

Am 31.03.2016 um 18:38 schrieb Matthias Fischer <matthias.fischer@ipfire.org>:

> Hi,
> 
> On 31.03.2016 18:13, ummeegge wrote:
>> Hi Matthias,
>> great that you provide this update, tried some time ago the same and have had problems while build it cause the new pcre version needed bzlib.h. I changed the building order in make.sh as far as i remember so that bzip2 was build before pcre.
>> 
>> Don´t you experienced similar problems ?
> 
> No, I hadn't any problems at all:
> In my 'make.sh' (based on current 'next'), 'bzip2' is being built on
> line 299 (lfsmake1 bzip2) and 354 (lfsmake2 bzip2), 'pcre' on line 349
> (lfsmake2 pcre), line 350 (lfsmake2 pcre-compat) and line 514
> (ipfiremake pcre). No errors. Production machine is running.
> 
> The only thing that bugged me: as a burned child, I wasn't REALLY sure
> that this update would work for everyone. I tested - it worked - amongst
> other things it worked with 'snort 2.9.8.0', so finally I pushed it. But
> being too careful I left the old patch-files... Michael took care of
> them. ;-).
> 
> Best,
> Matthias
> 
>> Greetings,
>> 
>> Erik
>> 
>> 
>> Am 31.03.2016 um 11:20 schrieb Matthias Fischer <matthias.fischer@ipfire.org>:
>> 
>>> Bugfix release
>>> 
>>> For complete changelog see:
>>> http://www.pcre.org/original/changelog.txt
>>> 
>>> Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
>>> ---
>>> config/rootfiles/common/pcre |  2 +-
>>> lfs/pcre                     | 11 +++--------
>>> 2 files changed, 4 insertions(+), 9 deletions(-)
>>> 
>>> diff --git a/config/rootfiles/common/pcre b/config/rootfiles/common/pcre
>>> index 8c4cc2a..1d6310f 100644
>>> --- a/config/rootfiles/common/pcre
>>> +++ b/config/rootfiles/common/pcre
>>> @@ -10,7 +10,7 @@
>>> #usr/lib/libpcre.la
>>> usr/lib/libpcre.so
>>> usr/lib/libpcre.so.1
>>> -usr/lib/libpcre.so.1.2.5
>>> +usr/lib/libpcre.so.1.2.6
>>> #usr/lib/libpcrecpp.la
>>> usr/lib/libpcrecpp.so
>>> usr/lib/libpcrecpp.so.0
>>> diff --git a/lfs/pcre b/lfs/pcre
>>> index fd66350..ddbd0b5 100644
>>> --- a/lfs/pcre
>>> +++ b/lfs/pcre
>>> @@ -1,7 +1,7 @@
>>> ###############################################################################
>>> #                                                                             #
>>> # IPFire.org - A linux based firewall                                         #
>>> -# Copyright (C) 2015  Michael Tremer & Christian Schmidt                      #
>>> +# Copyright (C) 2016  Michael Tremer & Christian Schmidt                      #
>>> #                                                                             #
>>> # This program is free software: you can redistribute it and/or modify        #
>>> # it under the terms of the GNU General Public License as published by        #
>>> @@ -24,7 +24,7 @@
>>> 
>>> include Config
>>> 
>>> -VER        = 8.37
>>> +VER        = 8.38
>>> 
>>> THISAPP    = pcre-$(VER)
>>> DL_FILE    = $(THISAPP).tar.gz
>>> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
>>> 
>>> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>>> 
>>> -$(DL_FILE)_MD5 = 6e0cc6d1bdac7a4308151f9b3571b86e
>>> +$(DL_FILE)_MD5 = 8a353fe1450216b6655dfcf3561716d9
>>> 
>>> install : $(TARGET)
>>> 
>>> @@ -70,11 +70,6 @@ $(subst %,%_MD5,$(objects)) :
>>> $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>>> 	@$(PREBUILD)
>>> 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
>>> -	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-buffer-overflow-for-named-recursive-back-referen.patch
>>> -	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-buffer-overflow-for-forward-reference-within-bac.patch
>>> -	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-named-forward-reference-to-duplicate-group-numbe.patch
>>> -	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-another-buffer-overflow.patch
>>> -	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pcre-8.37-Fix-buffer-overflow-for-named-references-in-situatio.patch
>>> 	cd $(DIR_APP) && ./configure \
>>> 		--prefix=/usr \
>>> 		--disable-static \
>>> --
>>> 2.8.0
>>> 
>> 
>