Hi Junichi, On Fri, Sep 30, 2005 at 07:37:27AM +0900, Junichi Uekawa wrote: > If you can provide information backing up that it works reliably, > patch will be accepted. I use the attached patch (just adding of the options to the diff call). After setting DPEP_DIFF_OPTIONS="-p" my C source patches have the function in the dpatch (see patch_c_source.diff). All other file types (eg. a Makefile, see patch_no_c_source.diff) have also a (fake) function line, but since diff ignores the stuff after the @@, it works.
As for reliability, I think the diff tool and its options are very stable and tested. And of course it is a custom and explicitly set option. If it does not work then I would just not add it to DPEP_DIFF_OPTIONS. Just a thought: perhaps it would be better to name it DPEP_DIFF_EXTRA_OPTIONS, since the standard dif options (-urNad) are always there. Regards, Bastian -- ,''`. Bastian Kleineidam : :' : GnuPG Schlüssel `. `' gpg --keyserver wwwkeys.pgp.net --recv-keys 32EC6F3E `-
--- dpatch-edit-patch.orig 2005-09-30 09:24:42.752170647 +0200
+++ dpatch-edit-patch 2005-09-30 09:25:05.866674732 +0200
@@ -285,7 +285,7 @@
DIFFHOLDER="$(tempfile -d "$WORKDIR" -p "dpep." -s ".diff")"
dpep_message debug1 "Diff temporary file is $DIFFHOLDER"
cd "$REFDIR"
-diff -urNad $DPEP_DIFF_EXCLUDE . "$WORKDIR/$(basename "$DPEP_SOURCEDIR")" |
+diff -urNad $DPEP_DIFF_OPTIONS $DPEP_DIFF_EXCLUDE . "$WORKDIR/$(basename
"$DPEP_SOURCEDIR")" |
sed -e "/^--- \|^diff /s: \./: $(basename "$DPEP_SOURCEDIR")~/:" \
-e "/^+++ \|^diff /s: $WORKDIR/: :" \
-e "/^diff /s: $DPEP_DIFF_EXCLUDE::" > "$DIFFHOLDER" || true
--- libpam-mount-0.9.25/debian/patches/38_mount_links.dpatch 2005-09-23
14:50:57.355547547 +0200
+++ libpam-mount-0.9.25_/debian/patches/38_mount_links.dpatch 2005-09-30
09:26:13.704414726 +0200
@@ -9,10 +9,10 @@
## DP: In case of match with realpath, return the original volume path.
@DPATCH@
-diff -urNad libpam-mount-0.9.25~/src/mount.c libpam-mount-0.9.25/src/mount.c
---- libpam-mount-0.9.25~/src/mount.c 2005-09-23 14:42:28.458514829 +0200
-+++ libpam-mount-0.9.25/src/mount.c 2005-09-23 14:47:04.758726265 +0200
-@@ -126,6 +126,7 @@
+diff -urNad -p libpam-mount-0.9.25_~/src/mount.c
libpam-mount-0.9.25_/src/mount.c
+--- libpam-mount-0.9.25_~/src/mount.c 2005-09-30 09:26:12.273631123 +0200
++++ libpam-mount-0.9.25_/src/mount.c 2005-09-30 09:26:12.620578649 +0200
+@@ -126,6 +126,7 @@ static int already_mounted(const struct
fmt_ptrn_t *vinfo)
{
char match[PATH_MAX + 1];
@@ -20,7 +20,7 @@
int mounted = 0;
#if defined(__linux__)
FILE *mtab;
-@@ -184,6 +185,17 @@
+@@ -184,6 +185,17 @@ static int already_mounted(const struct
l0g("pam_mount: %s\n", "could not open /etc/mtab");
return -1;
}
@@ -38,7 +38,7 @@
w4rn("pam_mount: checking to see if %s is already mounted at %s\n",
match, config->volume[vol].mountpoint);
while ((mtab_record = getmntent(mtab)) != NULL) {
-@@ -205,8 +217,14 @@
+@@ -205,8 +217,14 @@ static int already_mounted(const struct
}
}
/* FIXME: okay to always ignore case (needed for NCP)? */
--- libpam-mount-0.9.25/debian/patches/15_no_error_warnings.dpatch 2005-05-30 15:50:55.470518000 +0200 +++ libpam-mount-0.9.25_/debian/patches/15_no_error_warnings.dpatch 2005-09-30 09:27:32.383515037 +0200 @@ -6,10 +6,10 @@ ## DP: for such a variety of platforms. Use -Wall instead. @DPATCH@ -diff -urNad libpam-mount-0.9.24/src/Makefile.in /tmp/dpep.yRJOgY/libpam-mount-0.9.24/src/Makefile.in ---- libpam-mount-0.9.24/src/Makefile.in 2005-05-30 15:50:52.904906235 +0200 -+++ /tmp/dpep.yRJOgY/libpam-mount-0.9.24/src/Makefile.in 2005-05-30 15:50:53.234856332 +0200 -@@ -271,7 +271,7 @@ +diff -urNad -p libpam-mount-0.9.25_~/src/Makefile.in libpam-mount-0.9.25_/src/Makefile.in +--- libpam-mount-0.9.25_~/src/Makefile.in 2005-09-30 09:27:30.725765761 +0200 ++++ libpam-mount-0.9.25_/src/Makefile.in 2005-09-30 09:27:31.100709053 +0200 +@@ -271,7 +271,7 @@ pmvarrun_LDFLAGS = -lz $(GLIB_LIBS) @[EMAIL PROTECTED] = @CHECK_LIBS@ @[EMAIL PROTECTED] = -lz $(GLIB_LIBS) INCLUDES = -I$(srcdir)/../include @LOCAL_FMT_PTRN_INCLUDES@
signature.asc
Description: Digital signature
