Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/apache-tools/files/
Date: Wed, 01 Feb 2023 01:18:11
Message-Id: 1675213995.7fd31f24b627a3d9d67b078ade3fdcda63c335a3.conikost@gentoo
1 commit: 7fd31f24b627a3d9d67b078ade3fdcda63c335a3
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Mon Jan 30 19:07:58 2023 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 1 01:13:15 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fd31f24
7
8 app-admin/apache-tools: remove unused patch
9
10 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
11 Closes: https://github.com/gentoo/gentoo/pull/29344
12 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
13
14 .../files/apache-tools-2.4.7-Makefile.patch | 47 ----------------------
15 1 file changed, 47 deletions(-)
16
17 diff --git a/app-admin/apache-tools/files/apache-tools-2.4.7-Makefile.patch b/app-admin/apache-tools/files/apache-tools-2.4.7-Makefile.patch
18 deleted file mode 100644
19 index b7d3c274ea48..000000000000
20 --- a/app-admin/apache-tools/files/apache-tools-2.4.7-Makefile.patch
21 +++ /dev/null
22 @@ -1,47 +0,0 @@
23 -https://bugs.gentoo.org/459446
24 -
25 -https://raw.github.com/archlinuxcn/repo/master/apache-tools/apache-tools-Makefile.patch
26 -
27 ---- a/support/Makefile.in
28 -+++ b/support/Makefile.in
29 -@@ -1,9 +1,9 @@
30 - DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \
31 -- logresolve.pl phf_abuse_log.cgi split-logfile envvars-std
32 -+ logresolve.pl phf_abuse_log.cgi split-logfile
33 -
34 - CLEAN_TARGETS = suexec
35 -
36 --bin_PROGRAMS = htpasswd htdigest htdbm ab logresolve httxt2dbm
37 -+bin_PROGRAMS = htpasswd htdigest htdbm ab logresolve httxt2dbm dbmmanage
38 - sbin_PROGRAMS = htcacheclean rotatelogs $(NONPORTABLE_SUPPORT)
39 - TARGETS = $(bin_PROGRAMS) $(sbin_PROGRAMS)
40 -
41 -@@ -15,26 +15,18 @@
42 - install:
43 - @test -d $(DESTDIR)$(bindir) || $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
44 - @test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
45 -- @test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir)
46 -- @cp -p $(top_builddir)/server/httpd.exp $(DESTDIR)$(libexecdir)
47 -- @for i in apxs dbmmanage; do \
48 -+ @for i in $(bin_PROGRAMS); do \
49 - if test -f "$(builddir)/$$i"; then \
50 - cp -p $$i $(DESTDIR)$(bindir); \
51 - chmod 755 $(DESTDIR)$(bindir)/$$i; \
52 - fi ; \
53 - done
54 -- @for i in apachectl; do \
55 -+ @for i in $(sbin_PROGRAMS); do \
56 - if test -f "$(builddir)/$$i"; then \
57 - cp -p $$i $(DESTDIR)$(sbindir); \
58 - chmod 755 $(DESTDIR)$(sbindir)/$$i; \
59 - fi ; \
60 - done
61 -- @if test -f "$(builddir)/envvars-std"; then \
62 -- cp -p envvars-std $(DESTDIR)$(sbindir); \
63 -- if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
64 -- cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
65 -- fi ; \
66 -- fi
67 -
68 - htpasswd.lo: passwd_common.h
69 - passwd_common.lo: passwd_common.h