[gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/files/ - gentoo-commits

From:	Patrick McLean <chutzpah@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/files/
Date:	Sun, 17 Nov 2019 18:41:03
Message-Id:	`1574015952.8e881feefc3889237b733e407bf6f55049ed67ac.chutzpah@gentoo`

1

commit:     8e881feefc3889237b733e407bf6f55049ed67ac

2

Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>

3

AuthorDate: Sun Nov 17 10:40:43 2019 +0000

4

Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>

5

CommitDate: Sun Nov 17 18:39:12 2019 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e881fee

7

8

net-misc/openssh: remove unused patches

9

10

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>

11

Closes: https://github.com/gentoo/gentoo/pull/13687

12

Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

13

14

 .../files/openssh-8.0_p1-X509-12.0-tests.patch        | 12 ------------

15

 .../openssh-8.0_p1-X509-dont-make-piddir-12.0.patch   | 16 ----------------

16

 .../openssh-8.0_p1-X509-dont-make-piddir-12.1.patch   | 16 ----------------

17

 .../openssh/files/openssh-8.0_p1-X509-glue-12.0.patch | 19 -------------------

18

 .../openssh/files/openssh-8.0_p1-X509-glue-12.1.patch | 19 -------------------

19

 5 files changed, 82 deletions(-)

20

21

diff --git a/net-misc/openssh/files/openssh-8.0_p1-X509-12.0-tests.patch b/net-misc/openssh/files/openssh-8.0_p1-X509-12.0-tests.patch

22

deleted file mode 100644

23

index 9766b1594ea..00000000000

24

--- a/net-misc/openssh/files/openssh-8.0_p1-X509-12.0-tests.patch

25

+++ /dev/null

26

@@ -1,12 +0,0 @@

27

-diff -ur openssh-7.9p1.orig/openbsd-compat/regress/Makefile.in openssh-7.9p1/openbsd-compat/regress/Makefile.in

28

---- openssh-7.9p1.orig/openbsd-compat/regress/Makefile.in	2018-10-16 17:01:20.000000000 -0700

29

-+++ openssh-7.9p1/openbsd-compat/regress/Makefile.in	2018-12-19 11:03:14.421028691 -0800

30

-@@ -7,7 +7,7 @@

31

- CC=@CC@

32

- LD=@LD@

33

- CFLAGS=@CFLAGS@

34

--CPPFLAGS=-I. -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@

35

-+CPPFLAGS=-I. -I.. -I$(srcdir) -I../.. @CPPFLAGS@ @DEFS@

36

- EXEEXT=@EXEEXT@

37

- LIBCOMPAT=../libopenbsd-compat.a

38

- LIBS=@LIBS@

39

40

diff --git a/net-misc/openssh/files/openssh-8.0_p1-X509-dont-make-piddir-12.0.patch b/net-misc/openssh/files/openssh-8.0_p1-X509-dont-make-piddir-12.0.patch

41

deleted file mode 100644

42

index aac98fef35d..00000000000

43

--- a/net-misc/openssh/files/openssh-8.0_p1-X509-dont-make-piddir-12.0.patch

44

+++ /dev/null

45

@@ -1,16 +0,0 @@

46

---- a/openssh-8.0p1+x509-12.0.diff	2019-04-18 14:53:26.850768799 -0700

47

-+++ b/openssh-8.0p1+x509-12.0.diff	2019-04-18 14:56:48.870364519 -0700

48

-@@ -33578,12 +33578,11 @@

49

-

50

-  install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config

51

-  install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf

52

--@@ -334,6 +352,8 @@

53

-+@@ -334,6 +352,7 @@

54

-  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5

55

-  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8

56

-  	$(MKDIR_P) $(DESTDIR)$(libexecdir)

57

- +	$(MKDIR_P) $(DESTDIR)$(sshcadir)

58

--+	$(MKDIR_P) $(DESTDIR)$(piddir)

59

-  	$(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH)

60

-  	$(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)

61

-  	$(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT)

62

63

diff --git a/net-misc/openssh/files/openssh-8.0_p1-X509-dont-make-piddir-12.1.patch b/net-misc/openssh/files/openssh-8.0_p1-X509-dont-make-piddir-12.1.patch

64

deleted file mode 100644

65

index 9bb081a5091..00000000000

66

--- a/net-misc/openssh/files/openssh-8.0_p1-X509-dont-make-piddir-12.1.patch

67

+++ /dev/null

68

@@ -1,16 +0,0 @@

69

---- a/openssh-8.0p1+x509-12.1.diff	2019-04-29 14:11:55.210175168 -0700

70

-+++ b/openssh-8.0p1+x509-12.1.diff	2019-04-29 14:12:55.603761971 -0700

71

-@@ -34176,12 +34176,11 @@

72

-

73

-  install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config

74

-  install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf

75

--@@ -334,6 +352,8 @@

76

-+@@ -334,6 +352,7 @@

77

-  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5

78

-  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8

79

-  	$(MKDIR_P) $(DESTDIR)$(libexecdir)

80

- +	$(MKDIR_P) $(DESTDIR)$(sshcadir)

81

--+	$(MKDIR_P) $(DESTDIR)$(piddir)

82

-  	$(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH)

83

-  	$(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)

84

-  	$(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT)

85

86

diff --git a/net-misc/openssh/files/openssh-8.0_p1-X509-glue-12.0.patch b/net-misc/openssh/files/openssh-8.0_p1-X509-glue-12.0.patch

87

deleted file mode 100644

88

index 1667e13850c..00000000000

89

--- a/net-misc/openssh/files/openssh-8.0_p1-X509-glue-12.0.patch

90

+++ /dev/null

91

@@ -1,19 +0,0 @@

92

---- a/openssh-8.0p1+x509-12.0.diff	2019-04-18 14:53:02.804935946 -0700

93

-+++ b/openssh-8.0p1+x509-12.0.diff	2019-04-18 14:53:26.850768799 -0700

94

-@@ -75925,16 +75925,6 @@

95

- +	return mbtowc(NULL, s, n);

96

- +}

97

- +#endif

98

--diff -ruN openssh-8.0p1/version.h openssh-8.0p1+x509-12.0/version.h

99

----- openssh-8.0p1/version.h	2019-04-18 01:52:57.000000000 +0300

100

--+++ openssh-8.0p1+x509-12.0/version.h	2019-04-18 19:07:00.000000000 +0300

101

--@@ -2,5 +2,4 @@

102

--

103

-- #define SSH_VERSION	"OpenSSH_8.0"

104

--

105

---#define SSH_PORTABLE	"p1"

106

---#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE

107

--+#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1"

108

- diff -ruN openssh-8.0p1/version.m4 openssh-8.0p1+x509-12.0/version.m4

109

- --- openssh-8.0p1/version.m4	1970-01-01 02:00:00.000000000 +0200

110

- +++ openssh-8.0p1+x509-12.0/version.m4	2019-04-18 19:07:00.000000000 +0300

111

112

diff --git a/net-misc/openssh/files/openssh-8.0_p1-X509-glue-12.1.patch b/net-misc/openssh/files/openssh-8.0_p1-X509-glue-12.1.patch

113

deleted file mode 100644

114

index d6b6c5ac2f7..00000000000

115

--- a/net-misc/openssh/files/openssh-8.0_p1-X509-glue-12.1.patch

116

+++ /dev/null

117

@@ -1,19 +0,0 @@

118

---- a/openssh-8.0p1+x509-12.1.diff	2019-06-17 10:42:03.233392491 -0700

119

-+++ b/openssh-8.0p1+x509-12.1.diff	2019-06-17 10:42:24.696248976 -0700

120

-@@ -78536,16 +78536,6 @@

121

- +	return mbtowc(NULL, s, n);

122

- +}

123

- +#endif

124

--diff -ruN openssh-8.0p1/version.h openssh-8.0p1+x509-12.1/version.h

125

----- openssh-8.0p1/version.h	2019-04-18 01:52:57.000000000 +0300

126

--+++ openssh-8.0p1+x509-12.1/version.h	2019-06-16 15:07:00.000000000 +0300

127

--@@ -2,5 +2,4 @@

128

--

129

-- #define SSH_VERSION	"OpenSSH_8.0"

130

--

131

---#define SSH_PORTABLE	"p1"

132

---#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE

133

--+#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1"

134

- diff -ruN openssh-8.0p1/version.m4 openssh-8.0p1+x509-12.1/version.m4

135

- --- openssh-8.0p1/version.m4	1970-01-01 02:00:00.000000000 +0200

136

- +++ openssh-8.0p1+x509-12.1/version.m4	2019-06-16 15:07:00.000000000 +0300

1	commit: 8e881feefc3889237b733e407bf6f55049ed67ac
2	Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3	AuthorDate: Sun Nov 17 10:40:43 2019 +0000
4	Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
5	CommitDate: Sun Nov 17 18:39:12 2019 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e881fee
7
8	net-misc/openssh: remove unused patches
9
10	Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
11	Closes: https://github.com/gentoo/gentoo/pull/13687
12	Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
13
14	.../files/openssh-8.0_p1-X509-12.0-tests.patch \| 12 ------------
15	.../openssh-8.0_p1-X509-dont-make-piddir-12.0.patch \| 16 ----------------
16	.../openssh-8.0_p1-X509-dont-make-piddir-12.1.patch \| 16 ----------------
17	.../openssh/files/openssh-8.0_p1-X509-glue-12.0.patch \| 19 -------------------
18	.../openssh/files/openssh-8.0_p1-X509-glue-12.1.patch \| 19 -------------------
19	5 files changed, 82 deletions(-)
20
21	diff --git a/net-misc/openssh/files/openssh-8.0_p1-X509-12.0-tests.patch b/net-misc/openssh/files/openssh-8.0_p1-X509-12.0-tests.patch
22	deleted file mode 100644
23	index 9766b1594ea..00000000000
24	--- a/net-misc/openssh/files/openssh-8.0_p1-X509-12.0-tests.patch
25	+++ /dev/null
26	@@ -1,12 +0,0 @@
27	-diff -ur openssh-7.9p1.orig/openbsd-compat/regress/Makefile.in openssh-7.9p1/openbsd-compat/regress/Makefile.in
28	---- openssh-7.9p1.orig/openbsd-compat/regress/Makefile.in 2018-10-16 17:01:20.000000000 -0700
29	-+++ openssh-7.9p1/openbsd-compat/regress/Makefile.in 2018-12-19 11:03:14.421028691 -0800
30	-@@ -7,7 +7,7 @@
31	- CC=@CC@
32	- LD=@LD@
33	- CFLAGS=@CFLAGS@
34	--CPPFLAGS=-I. -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@
35	-+CPPFLAGS=-I. -I.. -I$(srcdir) -I../.. @CPPFLAGS@ @DEFS@
36	- EXEEXT=@EXEEXT@
37	- LIBCOMPAT=../libopenbsd-compat.a
38	- LIBS=@LIBS@
39
40	diff --git a/net-misc/openssh/files/openssh-8.0_p1-X509-dont-make-piddir-12.0.patch b/net-misc/openssh/files/openssh-8.0_p1-X509-dont-make-piddir-12.0.patch
41	deleted file mode 100644
42	index aac98fef35d..00000000000
43	--- a/net-misc/openssh/files/openssh-8.0_p1-X509-dont-make-piddir-12.0.patch
44	+++ /dev/null
45	@@ -1,16 +0,0 @@
46	---- a/openssh-8.0p1+x509-12.0.diff 2019-04-18 14:53:26.850768799 -0700
47	-+++ b/openssh-8.0p1+x509-12.0.diff 2019-04-18 14:56:48.870364519 -0700
48	-@@ -33578,12 +33578,11 @@
49	-
50	- install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config
51	- install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf
52	--@@ -334,6 +352,8 @@
53	-+@@ -334,6 +352,7 @@
54	- $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
55	- $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
56	- $(MKDIR_P) $(DESTDIR)$(libexecdir)
57	- + $(MKDIR_P) $(DESTDIR)$(sshcadir)
58	--+ $(MKDIR_P) $(DESTDIR)$(piddir)
59	- $(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH)
60	- $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)
61	- $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT)
62
63	diff --git a/net-misc/openssh/files/openssh-8.0_p1-X509-dont-make-piddir-12.1.patch b/net-misc/openssh/files/openssh-8.0_p1-X509-dont-make-piddir-12.1.patch
64	deleted file mode 100644
65	index 9bb081a5091..00000000000
66	--- a/net-misc/openssh/files/openssh-8.0_p1-X509-dont-make-piddir-12.1.patch
67	+++ /dev/null
68	@@ -1,16 +0,0 @@
69	---- a/openssh-8.0p1+x509-12.1.diff 2019-04-29 14:11:55.210175168 -0700
70	-+++ b/openssh-8.0p1+x509-12.1.diff 2019-04-29 14:12:55.603761971 -0700
71	-@@ -34176,12 +34176,11 @@
72	-
73	- install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config
74	- install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf
75	--@@ -334,6 +352,8 @@
76	-+@@ -334,6 +352,7 @@
77	- $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
78	- $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
79	- $(MKDIR_P) $(DESTDIR)$(libexecdir)
80	- + $(MKDIR_P) $(DESTDIR)$(sshcadir)
81	--+ $(MKDIR_P) $(DESTDIR)$(piddir)
82	- $(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH)
83	- $(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)
84	- $(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT)
85
86	diff --git a/net-misc/openssh/files/openssh-8.0_p1-X509-glue-12.0.patch b/net-misc/openssh/files/openssh-8.0_p1-X509-glue-12.0.patch
87	deleted file mode 100644
88	index 1667e13850c..00000000000
89	--- a/net-misc/openssh/files/openssh-8.0_p1-X509-glue-12.0.patch
90	+++ /dev/null
91	@@ -1,19 +0,0 @@
92	---- a/openssh-8.0p1+x509-12.0.diff 2019-04-18 14:53:02.804935946 -0700
93	-+++ b/openssh-8.0p1+x509-12.0.diff 2019-04-18 14:53:26.850768799 -0700
94	-@@ -75925,16 +75925,6 @@
95	- + return mbtowc(NULL, s, n);
96	- +}
97	- +#endif
98	--diff -ruN openssh-8.0p1/version.h openssh-8.0p1+x509-12.0/version.h
99	----- openssh-8.0p1/version.h 2019-04-18 01:52:57.000000000 +0300
100	--+++ openssh-8.0p1+x509-12.0/version.h 2019-04-18 19:07:00.000000000 +0300
101	--@@ -2,5 +2,4 @@
102	--
103	-- #define SSH_VERSION "OpenSSH_8.0"
104	--
105	---#define SSH_PORTABLE "p1"
106	---#define SSH_RELEASE SSH_VERSION SSH_PORTABLE
107	--+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1"
108	- diff -ruN openssh-8.0p1/version.m4 openssh-8.0p1+x509-12.0/version.m4
109	- --- openssh-8.0p1/version.m4 1970-01-01 02:00:00.000000000 +0200
110	- +++ openssh-8.0p1+x509-12.0/version.m4 2019-04-18 19:07:00.000000000 +0300
111
112	diff --git a/net-misc/openssh/files/openssh-8.0_p1-X509-glue-12.1.patch b/net-misc/openssh/files/openssh-8.0_p1-X509-glue-12.1.patch
113	deleted file mode 100644
114	index d6b6c5ac2f7..00000000000
115	--- a/net-misc/openssh/files/openssh-8.0_p1-X509-glue-12.1.patch
116	+++ /dev/null
117	@@ -1,19 +0,0 @@
118	---- a/openssh-8.0p1+x509-12.1.diff 2019-06-17 10:42:03.233392491 -0700
119	-+++ b/openssh-8.0p1+x509-12.1.diff 2019-06-17 10:42:24.696248976 -0700
120	-@@ -78536,16 +78536,6 @@
121	- + return mbtowc(NULL, s, n);
122	- +}
123	- +#endif
124	--diff -ruN openssh-8.0p1/version.h openssh-8.0p1+x509-12.1/version.h
125	----- openssh-8.0p1/version.h 2019-04-18 01:52:57.000000000 +0300
126	--+++ openssh-8.0p1+x509-12.1/version.h 2019-06-16 15:07:00.000000000 +0300
127	--@@ -2,5 +2,4 @@
128	--
129	-- #define SSH_VERSION "OpenSSH_8.0"
130	--
131	---#define SSH_PORTABLE "p1"
132	---#define SSH_RELEASE SSH_VERSION SSH_PORTABLE
133	--+#define SSH_RELEASE PACKAGE_STRING ", " SSH_VERSION "p1"
134	- diff -ruN openssh-8.0p1/version.m4 openssh-8.0p1+x509-12.1/version.m4
135	- --- openssh-8.0p1/version.m4 1970-01-01 02:00:00.000000000 +0200
136	- +++ openssh-8.0p1+x509-12.1/version.m4 2019-06-16 15:07:00.000000000 +0300

Gentoo Archives: gentoo-commits