From 599d388f335d9476662762431d4a3d5aba2e07b3 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Wed, 5 Nov 2003 23:24:41 +0000
Subject: [PATCH] - todays update from SPECS

Changed files:
    pldnotify.awk -> 1.5
---
 pldnotify.awk | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/pldnotify.awk b/pldnotify.awk
index d7916d2..7272722 100644
--- a/pldnotify.awk
+++ b/pldnotify.awk
@@ -8,6 +8,15 @@ function fixedsub(s1,s2,t,	ind) {
 	return t
 }
 
+function ispre(s) {
+	if ((s~"pre")||(s~"PRE")||(s~"beta")||(s~"BETA")||(s~"alpha")||(s~"ALPHA")||(s~"rc")||(s~"RC")) {
+		if (DEBUG) print "pre-version"
+		return 1
+	} else {
+		return 0
+	}
+}
+	
 function compare_ver(v1,v2) {
 # compares version numbers
 	while (match(v1,/[a-zA-Z][0-9]|[0-9][a-zA-Z]/))
@@ -46,19 +55,19 @@ function compare_ver(v1,v2) {
 				return 1
 			else if (v1a[i]>v2a[i])
 				return 0
-		} else if ((v1a[i]~"pre")||(v1a[i]~"beta")||(v1a[i]~"alpha")||(v1a[i]~"rc"))
+		} else if (ispre(v1a[i]) == 1)
 			return 1
 		else
 			return 0
 	}
 	if ((count2==mincount)&&(count!=count2)) {
 		for (i=count2+1; i<=count; i++)
-			if ((v1a[i]~"pre")||(v1a[i]~"beta")||(v1a[i]~"alpha")||(v1a[i]~"rc")) 
+			if (ispre(v1a[i]) == 1)
 				return 1
 		return 0
 	} else if (count!=count2) {
 		for (i=count+1; i<=count2; i++)
-			if ((v2a[i]~"pre")||(v2a[i]~"beta")||(v2a[i]~"alpha")||(v2a[i]~"rc"))
+			if (ispre(v2a[i]) == 1)
 				return 0
 		return 1
 	}
@@ -108,19 +117,19 @@ function compare_ver_dec(v1,v2) {
 				return 1
 			else if (v1a[i]>v2a[i])
 				return 0
-		} else if ((v1a[i]~"pre")||(v1a[i]~"beta")||(v1a[i]~"alpha")||(v1a[i]~"rc"))
+		} else if (ispre(v1a[i]) == 1)
 			return 1
 		else
 			return 0
 	}
 	if ((count2==mincount)&&(count!=count2)) {
 		for (i=count2+1; i<=count; i++)
-			if ((v1a[i]~"pre")||(v1a[i]~"beta")||(v1a[i]~"alpha")||(v1a[i]~"rc")) 
+			if (ispre(v1a[i]) == 1)
 				return 1
 		return 0
 	} else if (count!=count2) {
 		for (i=count+1; i<=count2; i++)
-			if ((v2a[i]~"pre")||(v2a[i]~"beta")||(v2a[i]~"alpha")||(v2a[i]~"rc"))
+			if (ispre(v2a[i]) == 1)
 				return 0
 		return 1
 	}
@@ -253,7 +262,8 @@ function process_source(number,lurl,name,version) {
 
 	filenameexp=filename
 	gsub("\+","\\+",filenameexp)
-	sub(version,"[A-Za-z0-9\\.]+",filenameexp)
+	sub(version,"[A-Za-z0-9.]+",filenameexp)
+	gsub("\.","\\.",filenameexp)
 	if ( DEBUG ) print "Wzorzec: " filenameexp
 	match(filename,version)
 	prever=substr(filename,1,RSTART-1)
@@ -278,7 +288,7 @@ function process_source(number,lurl,name,version) {
 		for (nr=1; nr<=c; nr++) {
 			addr=linki[nr]
 			if (DEBUG) print "Znaleziony link: " addr
-			if (addr ~ filenameexp) {
+			if ((addr ~ filenameexp) && !(addr ~ "[-_.0-9A-Za-z]" filenameexp)) {
 				match(addr,filenameexp)
 				newfilename=substr(addr,RSTART,RLENGTH)
 				if (DEBUG) print "Hipotetyczny nowy: " newfilename
-- 
2.44.0