aboutsummaryrefslogtreecommitdiffstats
path: root/ports-mgmt
diff options
context:
space:
mode:
authorknu <knu@FreeBSD.org>2004-07-13 00:12:47 +0800
committerknu <knu@FreeBSD.org>2004-07-13 00:12:47 +0800
commitbe644b105a69f7902c8d3f37a887ed5c44cabe10 (patch)
tree8c03c23252dfff34f4fc5255736f6c1f578ed2d8 /ports-mgmt
parent2e618b16f2ca7b04321f634ea4eaf495d6a63519 (diff)
downloadfreebsd-ports-gnome-be644b105a69f7902c8d3f37a887ed5c44cabe10.tar.gz
freebsd-ports-gnome-be644b105a69f7902c8d3f37a887ed5c44cabe10.tar.zst
freebsd-ports-gnome-be644b105a69f7902c8d3f37a887ed5c44cabe10.zip
Add a patch to read the index file via sort(1) instead of reading
directly to avoid core dump.
Diffstat (limited to 'ports-mgmt')
-rw-r--r--ports-mgmt/portupgrade-devel/Makefile2
-rw-r--r--ports-mgmt/portupgrade-devel/files/patch-portsdb.rb14
-rw-r--r--ports-mgmt/portupgrade/Makefile2
-rw-r--r--ports-mgmt/portupgrade/files/patch-portsdb.rb14
4 files changed, 30 insertions, 2 deletions
diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index 0ed777b6f395..02520dc47f13 100644
--- a/ports-mgmt/portupgrade-devel/Makefile
+++ b/ports-mgmt/portupgrade-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= portupgrade
PORTVERSION= 20040701
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \
${MASTER_SITE_LOCAL}
diff --git a/ports-mgmt/portupgrade-devel/files/patch-portsdb.rb b/ports-mgmt/portupgrade-devel/files/patch-portsdb.rb
new file mode 100644
index 000000000000..7317dcc85de5
--- /dev/null
+++ b/ports-mgmt/portupgrade-devel/files/patch-portsdb.rb
@@ -0,0 +1,14 @@
+Index: lib/portsdb.rb
+===================================================================
+RCS file: /home/cvs/pkgtools/lib/portsdb.rb,v
+retrieving revision 1.80
+diff -u -2 -r1.80 portsdb.rb
+--- lib/portsdb.rb 30 Jun 2004 16:22:35 -0000 1.80
++++ lib/portsdb.rb 12 Jul 2004 16:08:12 -0000
+@@ -550,5 +550,5 @@
+ open_db_for_rebuild!
+
+- File.open(index_file) do |f|
++ open("| sort #{shelljoin(index_file)}") do |f|
+ f.each_with_index do |line, i|
+ lineno = i + 1
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile
index 0ed777b6f395..02520dc47f13 100644
--- a/ports-mgmt/portupgrade/Makefile
+++ b/ports-mgmt/portupgrade/Makefile
@@ -7,7 +7,7 @@
PORTNAME= portupgrade
PORTVERSION= 20040701
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \
${MASTER_SITE_LOCAL}
diff --git a/ports-mgmt/portupgrade/files/patch-portsdb.rb b/ports-mgmt/portupgrade/files/patch-portsdb.rb
new file mode 100644
index 000000000000..7317dcc85de5
--- /dev/null
+++ b/ports-mgmt/portupgrade/files/patch-portsdb.rb
@@ -0,0 +1,14 @@
+Index: lib/portsdb.rb
+===================================================================
+RCS file: /home/cvs/pkgtools/lib/portsdb.rb,v
+retrieving revision 1.80
+diff -u -2 -r1.80 portsdb.rb
+--- lib/portsdb.rb 30 Jun 2004 16:22:35 -0000 1.80
++++ lib/portsdb.rb 12 Jul 2004 16:08:12 -0000
+@@ -550,5 +550,5 @@
+ open_db_for_rebuild!
+
+- File.open(index_file) do |f|
++ open("| sort #{shelljoin(index_file)}") do |f|
+ f.each_with_index do |line, i|
+ lineno = i + 1