head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.62
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.60
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.58
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.56
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.54
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.52
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.50
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.48
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.46
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.44
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.42
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.40
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.38
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.36
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.34
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.32
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.30
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.28
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.26
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.24
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.22
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.20
	pkgsrc-2020Q4-base:1.1
	pkgsrc-2020Q3:1.1.0.18
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.16
	pkgsrc-2020Q2-base:1.1
	pkgsrc-2020Q1:1.1.0.12
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.14
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.10
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.8
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.6
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.4
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.2;
locks; strict;
comment	@# @;


1.1
date	2018.10.18.19.26.16;	author leot;	state Exp;
branches
	1.1.2.1;
next	;
commitid	Ugghw0l1TCiyAtWA;

1.1.2.1
date	2018.10.18.19.26.16;	author spz;	state dead;
branches;
next	1.1.2.2;
commitid	6HhEWZJwlzV5sIWA;

1.1.2.2
date	2018.10.20.16.12.15;	author spz;	state Exp;
branches;
next	;
commitid	6HhEWZJwlzV5sIWA;


desc
@@


1.1
log
@patch: Backport patches for several security fixes

pkgsrc changes:
 - Remove custom and no longer needed do-patch target, it was fixed upstream
 - Minor cosmetic improvements pointed out by pkglint

Changes:
 - Backport patches for CVE-2018-6951, CVE-2018-6952 and CVE-2018-1000156

Patch provided by Attila Fülöp via NetBSD/pkgsrc#33, thanks!

Bump PKGREVISION
@
text
@$NetBSD$

 - Add ed-style test, related to CVE-2018-1000156 fix.

--- tests/ed-style.orig	2018-10-09 17:51:47.148455875 +0000
+++ tests/ed-style
@@@@ -0,0 +1,41 @@@@
+# Copyright (C) 2018 Free Software Foundation, Inc.
+#
+# Copying and distribution of this file, with or without modification,
+# in any medium, are permitted without royalty provided the copyright
+# notice and this notice are preserved.
+
+. $srcdir/test-lib.sh
+
+require cat
+use_local_patch
+use_tmpdir
+
+# ==============================================================
+
+cat > ed1.diff <<EOF
+0a
+foo
+.
+EOF
+
+check 'patch -e foo -i ed1.diff' <<EOF
+EOF
+
+check 'cat foo' <<EOF
+foo
+EOF
+
+cat > ed2.diff <<EOF
+1337a
+r !echo bar
+,p
+EOF
+
+check 'patch -e foo -i ed2.diff 2> /dev/null || echo "Status: $?"' <<EOF
+?
+Status: 2
+EOF
+
+check 'cat foo' <<EOF
+foo
+EOF
@


1.1.2.1
log
@file patch-tests_ed-style was added on branch pkgsrc-2018Q3 on 2018-10-20 16:12:15 +0000
@
text
@d1 48
@


1.1.2.2
log
@Pullup ticket #5847 - requested by bsiegert
devel/patch: security patches

Revisions pulled up:
- devel/patch/Makefile                                          1.45
- devel/patch/distinfo                                          1.13
- devel/patch/patches/patch-src_pch.c                           1.1
- devel/patch/patches/patch-tests_Makefile.in                   1.1
- devel/patch/patches/patch-tests_ed-style                      1.1

-------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   leot
   Date:           Thu Oct 18 19:26:16 UTC 2018

   Modified Files:
           pkgsrc/devel/patch: Makefile distinfo
   Added Files:
           pkgsrc/devel/patch/patches: patch-src_pch.c patch-tests_Makefile.in
               patch-tests_ed-style

   Log Message:
   patch: Backport patches for several security fixes

   pkgsrc changes:
    - Remove custom and no longer needed do-patch target, it was fixed upstream
    - Minor cosmetic improvements pointed out by pkglint

   Changes:
    - Backport patches for CVE-2018-6951, CVE-2018-6952 and CVE-2018-1000156

   Patch provided by Attila Fülöp via NetBSD/pkgsrc#33, thanks!

   Bump PKGREVISION


   To generate a diff of this commit:
   cvs rdiff -u -r1.44 -r1.45 pkgsrc/devel/patch/Makefile
   cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/patch/distinfo
   cvs rdiff -u -r0 -r1.1 pkgsrc/devel/patch/patches/patch-src_pch.c \
       pkgsrc/devel/patch/patches/patch-tests_Makefile.in \
       pkgsrc/devel/patch/patches/patch-tests_ed-style
@
text
@a0 48
$NetBSD$

 - Add ed-style test, related to CVE-2018-1000156 fix.

--- tests/ed-style.orig	2018-10-09 17:51:47.148455875 +0000
+++ tests/ed-style
@@@@ -0,0 +1,41 @@@@
+# Copyright (C) 2018 Free Software Foundation, Inc.
+#
+# Copying and distribution of this file, with or without modification,
+# in any medium, are permitted without royalty provided the copyright
+# notice and this notice are preserved.
+
+. $srcdir/test-lib.sh
+
+require cat
+use_local_patch
+use_tmpdir
+
+# ==============================================================
+
+cat > ed1.diff <<EOF
+0a
+foo
+.
+EOF
+
+check 'patch -e foo -i ed1.diff' <<EOF
+EOF
+
+check 'cat foo' <<EOF
+foo
+EOF
+
+cat > ed2.diff <<EOF
+1337a
+r !echo bar
+,p
+EOF
+
+check 'patch -e foo -i ed2.diff 2> /dev/null || echo "Status: $?"' <<EOF
+?
+Status: 2
+EOF
+
+check 'cat foo' <<EOF
+foo
+EOF
@