summaryrefslogtreecommitdiff
path: root/comms
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2005-07-14 19:48:57 +0000
committerwiz <wiz@pkgsrc.org>2005-07-14 19:48:57 +0000
commit84b4d072dcef75ff00c190e1719b1a6fb5621d5b (patch)
tree13ac527c36e44a24f6573c737c41211fce5938e2 /comms
parent0eb0c25938308185e846faa5461ccc712af8afde (diff)
downloadpkgsrc-84b4d072dcef75ff00c190e1719b1a6fb5621d5b.tar.gz
Replace with official patch.
Diffstat (limited to 'comms')
-rw-r--r--comms/scmxx/distinfo4
-rw-r--r--comms/scmxx/patches/patch-aa26
2 files changed, 7 insertions, 23 deletions
diff --git a/comms/scmxx/distinfo b/comms/scmxx/distinfo
index a41d43b654d..71e35db1ccc 100644
--- a/comms/scmxx/distinfo
+++ b/comms/scmxx/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.26 2005/07/14 19:15:56 wiz Exp $
+$NetBSD: distinfo,v 1.27 2005/07/14 19:48:57 wiz Exp $
SHA1 (scmxx-0.8.0.tar.bz2) = 86757ac0e171d81c1887353316caf935dd260899
RMD160 (scmxx-0.8.0.tar.bz2) = 17541ed99b736a76f380e6255d982b2283031a6a
Size (scmxx-0.8.0.tar.bz2) = 212558 bytes
-SHA1 (patch-aa) = 549a9146132749143b23f2f4e151b8b4789f0b1e
+SHA1 (patch-aa) = 6c448c6a0dbe4551297a976e8608e63ad950865e
SHA1 (patch-ab) = 5bd30d280e7c4ad91570f56c96de3b90f6168d77
SHA1 (patch-ac) = a4bc9571948b032427a3b9dd3fdbdd9f1f12ebc3
SHA1 (patch-ad) = a4f40faa7fa1c921fef7cbb059adac9ef97a0921
diff --git a/comms/scmxx/patches/patch-aa b/comms/scmxx/patches/patch-aa
index 920161ba5c0..cd3d30c476c 100644
--- a/comms/scmxx/patches/patch-aa
+++ b/comms/scmxx/patches/patch-aa
@@ -1,38 +1,22 @@
-$NetBSD: patch-aa,v 1.9 2005/07/14 19:17:00 wiz Exp $
+$NetBSD: patch-aa,v 1.10 2005/07/14 19:48:57 wiz Exp $
--- src/pinfile.c.orig 2005-06-08 19:49:17.000000000 +0200
+++ src/pinfile.c
-@@ -220,7 +220,14 @@ char* pinfile_get_subdata (const char* s
+@@ -220,7 +220,7 @@ char* pinfile_get_subdata (const char* s
mem_realloc(temp,0);
if (pin != NULL) {
//find_pinpuk() already checked it
- puk = strndup(puk,strchr(puk,';')-puk);
-+ char *foo;
-+
-+ foo = strchr(puk,';');
-+ if (foo != NULL)
-+ *foo = '\0';
-+ puk = strdup(puk);
-+ if (foo != NULL)
-+ *foo = ';';
++ puk = strn_dup(puk,strchr(puk,';')-puk);
}
}
} else {
-@@ -232,9 +239,16 @@ char* pinfile_get_subdata (const char* s
- print_verbose(0,"%s\n",_("not found"));
- return strdup("");
+@@ -234,7 +234,7 @@ char* pinfile_get_subdata (const char* s
} else {
-+ char *foo;
-+
print_verbose(0,"%s\n",_("found"));
//find_pinpuk() already checked it
- pin = strndup(pin,strchr(pin,';')-pin);
-+ foo = strchr(pin,';');
-+ if (foo != NULL)
-+ *foo = '\0';
-+ pin = strdup(pin);
-+ if (foo != NULL)
-+ *foo = ';';
++ pin = strn_dup(pin,strchr(pin,';')-pin);
mem_realloc(data,0);
if (puk == NULL) {
return pin;