From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sat, 9 Oct 2021 21:45:24 +0000 (+0200)
Subject: - rediff patch, rebuild with openssl 3.0.0, rel 7
X-Git-Tag: auto/th/amap-5.2-7
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=87dddaa24ab8c38f011f6248d1c996ed56008f01;p=packages%2Famap.git

- rediff patch, rebuild with openssl 3.0.0, rel 7
---

diff --git a/amap-system-pcre.patch b/amap-system-pcre.patch
index 9eab85c..54eaffd 100644
--- a/amap-system-pcre.patch
+++ b/amap-system-pcre.patch
@@ -1,6 +1,25 @@
-diff -urN amap-5.2/amap-inc.h amap-5.2.new/amap-inc.h
---- amap-5.2/amap-inc.h	2003-10-29 23:37:41.000000000 +0100
-+++ amap-5.2.new/amap-inc.h	2008-09-18 18:54:40.000000000 +0200
+diff -urNp -x '*.orig' amap-5.2.org/Makefile.am amap-5.2/Makefile.am
+--- amap-5.2.org/Makefile.am	2021-10-09 23:44:55.647512366 +0200
++++ amap-5.2/Makefile.am	2021-10-09 23:44:55.674178998 +0200
+@@ -1,5 +1,5 @@
+ CC=gcc
+-LIB=-lpcre -L./pcre-3.9/ -I./pcre-3.9/
++LIB=-lpcre
+ OPT=-O2
+ OPT_DEBUG=-ggdb -Wall -lefence
+ BINDIR=/bin
+@@ -7,7 +7,7 @@ DATADIR=/share/amap
+ MANDIR=/share/man/man1
+ SCRIPTS=appdefs.trig appdefs.resp appdefs.rpc
+ MANPAGE=amap.1
+-all:	pcre strip
++all:	amap amapcrap
+ 
+ pcre:
+ 	cd pcre-3.9 && make
+diff -urNp -x '*.orig' amap-5.2.org/amap-inc.h amap-5.2/amap-inc.h
+--- amap-5.2.org/amap-inc.h	2003-10-29 23:37:41.000000000 +0100
++++ amap-5.2/amap-inc.h	2021-10-09 23:44:55.674178998 +0200
 @@ -20,7 +20,7 @@
  #include <errno.h>
  #include <sys/resource.h>
@@ -10,10 +29,10 @@ diff -urN amap-5.2/amap-inc.h amap-5.2.new/amap-inc.h
  #ifdef OPENSSL
   #include <openssl/ssl.h>
   #include <openssl/err.h>
-diff -urN amap-5.2/configure amap-5.2.new/configure
---- amap-5.2/configure	2005-06-03 15:34:19.000000000 +0200
-+++ amap-5.2.new/configure	2008-09-18 18:54:57.000000000 +0200
-@@ -13,10 +13,6 @@
+diff -urNp -x '*.orig' amap-5.2.org/configure amap-5.2/configure
+--- amap-5.2.org/configure	2005-06-03 15:34:19.000000000 +0200
++++ amap-5.2/configure	2021-10-09 23:44:55.674178998 +0200
+@@ -13,10 +13,6 @@ if [ "$1" = "--help" ]; then
    exit 0
  fi
  
@@ -24,22 +43,3 @@ diff -urN amap-5.2/configure amap-5.2.new/configure
  echo
  echo
  echo "Starting amap auto configuration ..."
-diff -urN amap-5.2/Makefile.am amap-5.2.new/Makefile.am
---- amap-5.2/Makefile.am	2005-09-22 17:39:18.000000000 +0200
-+++ amap-5.2.new/Makefile.am	2008-09-18 18:55:34.000000000 +0200
-@@ -1,5 +1,5 @@
- CC=gcc
--LIB=-lpcre -L./pcre-3.9/ -I./pcre-3.9/
-+LIB=-lpcre
- OPT=-O2
- OPT_DEBUG=-ggdb -Wall -lefence
- BINDIR=/bin
-@@ -7,7 +7,7 @@
- MANDIR=/man/man1
- SCRIPTS=appdefs.trig appdefs.resp appdefs.rpc
- MANPAGE=amap.1
--all:	pcre strip
-+all:	amap amapcrap
- 
- pcre:
- 	cd pcre-3.9 && make
diff --git a/amap.spec b/amap.spec
index eaaf38f..6a34a0f 100644
--- a/amap.spec
+++ b/amap.spec
@@ -2,7 +2,7 @@ Summary:	Amap - a next-generation scanning tool
 Summary(pl.UTF-8):	Amap - skaner "następnej generacji"
 Name:		amap
 Version:	5.2
-Release:	6
+Release:	7
 License:	GPL v2 with exceptions (see LICENCE.AMAP)
 Group:		Networking
 Source0:	http://freeworld.thc.org/releases/%{name}-%{version}.tar.gz