From patchwork Mon Apr 14 18:00:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grigory Shepelev X-Patchwork-Id: 41809 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 09EA627BC4A; Sat, 19 Apr 2025 19:26:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 54DA527BC49 for ; Sat, 19 Apr 2025 19:26:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u6CtC-0002rJ-8C; Sat, 19 Apr 2025 14:26:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u6Ct9-0002r8-HN for guix-patches@gnu.org; Sat, 19 Apr 2025 14:26:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u6Ct9-0003NT-7s for guix-patches@gnu.org; Sat, 19 Apr 2025 14:26:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=Date:MIME-Version:From:To:Subject; bh=xbRUgxwnq1leIgSZ7vejbSqMyDTeIRnFMpcRAegvoLo=; b=BQotYUzbssxWE40qFAPeiT1SXIurME6F15+Faa0E/MoTbMAdoUgJypPSTYvjzk/SWmSLe1uEXKbxKdkJH3wkjiFYyQx3Ypw4aiA779uasuOT10miwJe03pXjFAQ+CIFiC6GhYQjV9Q8oHUyw2roI+pDDkW612kKUhw37/SiYxkVxdyqVbyJQ6V83jXHteAvHWgCJbd0GzNXFC+WKXKN7Qz1MgItA3IxCRIdDVsXbF9mGZsWSMPVUKNa7lphzkAECvtkFkB/pppwSST/SdTg7dD/9/oWl3b61ZgeZiarFh9eBKiVyQw0UGHOHkdrcJxU9nWV9qQalBMg6IxPIgHRlgQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u6Ct8-0006Ug-3Y for guix-patches@gnu.org; Sat, 19 Apr 2025 14:26:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77926] [PATCH] gnu: Add proftpd Resent-From: Grigory Shepelev Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Apr 2025 18:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77926 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77926@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.174508713524833 (code B ref -1); Sat, 19 Apr 2025 18:26:01 +0000 Received: (at submit) by debbugs.gnu.org; 19 Apr 2025 18:25:35 +0000 Received: from localhost ([127.0.0.1]:37098 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u6Csg-0006SR-09 for submit@debbugs.gnu.org; Sat, 19 Apr 2025 14:25:34 -0400 Received: from lists.gnu.org ([2001:470:142::17]:45466) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u6Csa-0006Pa-GM for submit@debbugs.gnu.org; Sat, 19 Apr 2025 14:25:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u6CsP-0002Pv-TF for guix-patches@gnu.org; Sat, 19 Apr 2025 14:25:17 -0400 Received: from mail-lf1-x129.google.com ([2a00:1450:4864:20::129]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u6CsN-0003GR-9M for guix-patches@gnu.org; Sat, 19 Apr 2025 14:25:17 -0400 Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-54afb5fcebaso3746935e87.3 for ; Sat, 19 Apr 2025 11:25:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745087112; x=1745691912; darn=gnu.org; h=message-id:date:mime-version:subject:to:from:from:to:cc:subject :date:message-id:reply-to; bh=xbRUgxwnq1leIgSZ7vejbSqMyDTeIRnFMpcRAegvoLo=; b=Y0hfGaSUW/CAfPJowoBG6u6RowpzFLjHTP8ikoRfn7ymZFYRIhwYs+PNnsO9lIoo9z GtHdG82wteBlO/G6QfLraXHcEoPaCeGgnDHbK0Y4hxZtGxQ7w3p3m2pyF788row9o4Nx UYRPEVmm1Pz7EOIKJrI8ZO4nfvBpkI57JmMoBEoxnRVGalJWMcRNQgFeMn7Mm4xoc0Du QSSiEqo3XrMkR+NZTCeiXk2XBmyD1HU4qlNVZYBd7F+xk0VHbh8jpveyp9JTHj0cS1mE YjpE4bQ2403pWgFdNA+mM/bYTNZM/BWSL8InTEnrnDvKDcte4Hg6ofV5fjlKLS056q4Q JyxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745087112; x=1745691912; h=message-id:date:mime-version:subject:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=xbRUgxwnq1leIgSZ7vejbSqMyDTeIRnFMpcRAegvoLo=; b=mbasB6EqMjLIX6OLOvHYuUHjg4zKGTwoV7cFG51MGB/PmRsts9L1zKlog8WKklX8VZ Gyjp+h3nFPXx3nbBDhzJvAbslbeARBGoYQK5JEplB+pTdjbWfUDZ8z3C/phIpaeRQWO4 ClNsTkFcNRBPqgJ+b90QfnXLXbZ3+aS+R920dPPmWELsZj2U9ZZMY5SK/2nsaHA4gtxz 5hd1cCuetUL15zHS864iu58INAm5CC8zeBNLcZovJremWknDS5e0uSvYqAvvQVbIdHfM 51feKyfyipWG4DpsWSE0esQLtPFiZQ8K3gKLMr4s/ITJVFg07WDsNgTgpbwWV8c9tANd 4qvA== X-Gm-Message-State: AOJu0YxQ32i4K4yxSV0EcwCcdilRdMDcR9QgjEg+HgF8318+7v6tJvpN /AcrxIbALru/bgdJJ34vsBbCzzKQgFxFc6JQOpatr/R8P31rbQrE8vKnewHEmqk= X-Gm-Gg: ASbGncsUuMW5hHp4US98ReN+y03GfmtYvziF1p6kCro3QLUSZOObAXY/KsTVG0JoFQv k/bdqPjeJFmVqAaHS6dfWzfbZDAYs5rJmCpycFRPYnhmtH0+1unQm7rCDlIlaLJCY16AabAC2vl 732YjM3fRoDe6q3aU4XRS7uzPKm1iJMUThx0AaxSFe3YP/A5V0XI8Y2CrkKn7v35g00j81+XcOu 4o7Zt/73dMDuas+McCl92/gjxnDKvx4upoaRjWeQMm0l4uHV8E0qNRVhw4aYN7WMBbVk3ckKA89 bD6pZZ97xMfnm/qSjYBgM0KD8Y5TSeTWnBKC X-Google-Smtp-Source: AGHT+IEZjn47QA1m6u+S++D1GS5UPq1w7HDE4heqxuREW+9A2hZYQ8PS0y2pJ+kHsvOqdVI1WIM+Dw== X-Received: by 2002:a05:6512:118d:b0:54a:fa5a:e9b1 with SMTP id 2adb3069b0e04-54d6e61cd68mr1843983e87.10.1745087111991; Sat, 19 Apr 2025 11:25:11 -0700 (PDT) Received: from localhost ([82.151.112.249]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54d6e5d0837sm484727e87.118.2025.04.19.11.25.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Apr 2025 11:25:10 -0700 (PDT) From: Grigory Shepelev MIME-Version: 1.0 Date: Mon, 14 Apr 2025 21:00:11 +0300 Message-ID: <878qnw101p.fsf@gmail.com> Received-SPF: pass client-ip=2a00:1450:4864:20::129; envelope-from=shegeley@gmail.com; helo=mail-lf1-x129.google.com X-Spam_score_int: 13 X-Spam_score: 1.3 X-Spam_bar: + X-Spam_report: (1.3 / 5.0 requ) BAYES_00=-1.9, DATE_IN_PAST_96_XX=3.405, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Notes: 1. "no-install-user.patch" is stolen from nixpkgs 2. By default it looks for ScoreboardFile file in $output/var/ and won't find it 3. By default tries to setup PidFile in $CWD/var/proftpd.pid 4. By default mod_delay.c is on and proftpd looks for DelayTable file in $output/var/share Example configuration that disables all of that above: #+begin_src conf ServerName "Secure FTP Server" ServerType standalone DefaultServer on ScoreboardFile off # won't find $output/var/ PidFile /var/proftpd.pid # will try to launch in $CWD/var/proftpd.pid # http://proftpd.org/docs/modules/mod_delay.html#DelayTable # won't find delaytable in $output/var/share DelayEngine off # very minor security consern #+end_src Change-Id: Ic96745df7ef23664099f73d7130688151c5fc128 --- gnu/packages/ftp.scm | 31 ++++ gnu/packages/patches/no-install-user.patch | 189 +++++++++++++++++++++ 2 files changed, 220 insertions(+) create mode 100644 gnu/packages/patches/no-install-user.patch -- 2.49.0 diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index 2df6797c42..0027e3dfbc 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -25,6 +25,7 @@ (define-module (gnu packages ftp) #:use-module ((guix licenses) #:select (gpl2 gpl2+ gpl3+ clarified-artistic)) + #:use-module (gnu packages perl) #:use-module (guix build-system gnu) #:use-module (guix download) #:use-module (guix gexp) @@ -334,3 +335,33 @@ (define-public vsftpd guarantee.") (home-page "https://security.appspot.com/vsftpd.html") (license gpl2))) ; with OpenSSL exception + +(define-public proftpd + (package + (name "proftpd") + (version "1.3.9") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/proftpd/proftpd") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (patches (search-patches "no-install-user.patch")) + (sha256 + (base32 + "0zgx652qdwj2xkc7218v74x919dxmcs3q5s61v1kpdcw8f9v7370")))) + (build-system gnu-build-system) + (inputs (list libcap linux-pam openssl perl + libxcrypt ncurses zlib libsodium)) + (arguments + (list + #:configure-flags #~(list "--enable-openssl" + "--with-modules=mod_sftp"))) + (synopsis "Highly configurable GPL-licensed FTP server software") + (description + "ProFTPD grew out of the desire to have a secure and configurable FTP server, and out of a significant admiration of the Apache web server. + +ProFTPD is not a hack based on any other server, it's an independent source tree from the ground up. A number of well known and high traffic sites use ProFTPD.") + (home-page "http://www.proftpd.org/") + (license gpl2+))) diff --git a/gnu/packages/patches/no-install-user.patch b/gnu/packages/patches/no-install-user.patch new file mode 100644 index 0000000000..9a8e8edd04 --- /dev/null +++ b/gnu/packages/patches/no-install-user.patch @@ -0,0 +1,189 @@ +diff --git a/Make.rules.in b/Make.rules.in +index 2666b2c..bce4b2b 100644 +--- a/Make.rules.in ++++ b/Make.rules.in +@@ -30,9 +30,9 @@ INSTALL=@INSTALL@ + INSTALL_STRIP=@INSTALL_STRIP@ + INSTALL_USER=@install_user@ + INSTALL_GROUP=@install_group@ +-INSTALL_BIN=$(INSTALL) $(INSTALL_STRIP) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 +-INSTALL_SBIN=$(INSTALL) $(INSTALL_STRIP) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 +-INSTALL_MAN=$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 ++INSTALL_BIN=$(INSTALL) $(INSTALL_STRIP) -m 0755 ++INSTALL_SBIN=$(INSTALL) $(INSTALL_STRIP) -m 0755 ++INSTALL_MAN=$(INSTALL) -m 0644 + + RM=rm -f + SHELL=@CONFIG_SHELL@ +diff --git a/Makefile.in b/Makefile.in +index 32fd5f3..37c8907 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -129,7 +129,6 @@ check: proftpd$(EXEEXT) + $(DESTDIR)$(localedir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd $(DESTDIR)$(libdir) $(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(libdir)/proftpd $(DESTDIR)$(libexecdir) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man8: + @if [ ! -d $@ ]; then \ + mkdir -p $@; \ +- chown $(INSTALL_USER):$(INSTALL_GROUP) $@; \ + chmod 0755 $@; \ + fi + +@@ -139,7 +138,6 @@ install-proftpd: $(DESTDIR)$(includedir) $(DESTDIR)$(localstatedir) $(DESTDIR)$( + rm -f $(DESTDIR)$(sbindir)/in.proftpd ; \ + fi + ln -s $(top_builddir)/proftpd $(DESTDIR)$(sbindir)/in.proftpd +- -chown -h $(INSTALL_USER):$(INSTALL_GROUP) $(DESTDIR)$(sbindir)/in.proftpd + + install-libs: $(DESTDIR)$(libdir)/proftpd + cd lib/ && $(MAKE) install +@@ -177,11 +175,11 @@ install-utils: $(DESTDIR)$(sbindir) $(DESTDIR)$(bindir) + $(INSTALL_SBIN) $(top_builddir)/ftpshut $(DESTDIR)$(sbindir)/ftpshut + $(INSTALL_BIN) $(top_builddir)/ftptop $(DESTDIR)$(bindir)/ftptop + $(INSTALL_BIN) $(top_builddir)/ftpwho $(DESTDIR)$(bindir)/ftpwho +- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(top_builddir)/src/prxs $(DESTDIR)$(bindir)/prxs ++ $(INSTALL) -m 0755 $(top_builddir)/src/prxs $(DESTDIR)$(bindir)/prxs + + install-conf: $(DESTDIR)$(sysconfdir) + if [ ! -f $(DESTDIR)$(sysconfdir)/proftpd.conf ] ; then \ +- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 \ ++ $(INSTALL) -m 0644 \ + $(top_srcdir)/sample-configurations/basic.conf \ + $(DESTDIR)$(sysconfdir)/proftpd.conf ; \ + fi +diff --git a/contrib/Makefile.in b/contrib/Makefile.in +index d1a31af..65d2abc 100644 +--- a/contrib/Makefile.in ++++ b/contrib/Makefile.in +@@ -17,6 +17,6 @@ Makefile: Makefile.in ../config.status + cd ../ && ./config.status + + install-utils: +- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(srcdir)/ftpasswd $(DESTDIR)$(bindir)/ftpasswd +- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(srcdir)/ftpmail $(DESTDIR)$(bindir)/ftpmail +- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(srcdir)/ftpquota $(DESTDIR)$(bindir)/ftpquota ++ $(INSTALL) -m 0755 $(srcdir)/ftpasswd $(DESTDIR)$(bindir)/ftpasswd ++ $(INSTALL) -m 0755 $(srcdir)/ftpmail $(DESTDIR)$(bindir)/ftpmail ++ $(INSTALL) -m 0755 $(srcdir)/ftpquota $(DESTDIR)$(bindir)/ftpquota +diff --git a/contrib/mod_auth_otp/Makefile.in b/contrib/mod_auth_otp/Makefile.in +index 4026969..f07914c 100644 +--- a/contrib/mod_auth_otp/Makefile.in ++++ b/contrib/mod_auth_otp/Makefile.in +@@ -52,7 +52,6 @@ install: install-headers install-man install-utils + $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man8: + @if [ ! -d $@ ]; then \ + mkdir -p $@; \ +- chown $(INSTALL_USER):$(INSTALL_GROUP) $@; \ + chmod 0755 $@; \ + fi + +diff --git a/contrib/mod_dnsbl/Makefile.in b/contrib/mod_dnsbl/Makefile.in +index 4bb54c4..7d70972 100644 +--- a/contrib/mod_dnsbl/Makefile.in ++++ b/contrib/mod_dnsbl/Makefile.in +@@ -46,7 +46,6 @@ install: install-headers + $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd: + @if [ ! -d $@ ]; then \ + mkdir -p $@; \ +- chown $(INSTALL_USER):$(INSTALL_GROUP) $@; \ + chmod 0755 $@; \ + fi + +diff --git a/contrib/mod_load/Makefile.in b/contrib/mod_load/Makefile.in +index 5ec575e..e7e41cc 100644 +--- a/contrib/mod_load/Makefile.in ++++ b/contrib/mod_load/Makefile.in +@@ -47,7 +47,6 @@ install: install-headers + $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd: + @if [ ! -d $@ ]; then \ + mkdir -p $@; \ +- chown $(INSTALL_USER):$(INSTALL_GROUP) $@; \ + chmod 0755 $@; \ + fi + +diff --git a/contrib/mod_sftp/Makefile.in b/contrib/mod_sftp/Makefile.in +index 4b8df1f..f7526b9 100644 +--- a/contrib/mod_sftp/Makefile.in ++++ b/contrib/mod_sftp/Makefile.in +@@ -65,7 +65,6 @@ install: install-headers install-misc + $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd: + @if [ ! -d $@ ]; then \ + mkdir -p $@; \ +- chown $(INSTALL_USER):$(INSTALL_GROUP) $@; \ + chmod 0755 $@; \ + fi + +@@ -73,7 +72,6 @@ $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd: + $(DESTDIR)$(includedir)/proftpd/$(MODULE_NAME): + @if [ ! -d $@ ]; then \ + mkdir -p $@; \ +- chown $(INSTALL_USER):$(INSTALL_GROUP) $@; \ + chmod 0755 $@; \ + fi + +@@ -83,8 +81,8 @@ install-headers: $(DESTDIR)$(includedir)/proftpd $(DESTDIR)$(includedir)/proftpd + $(RM) $(DESTDIR)$(includedir)/proftpd/$(MODULE_NAME)/$(MODULE_NAME).h + + install-misc: +- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 $(top_srcdir)/dhparams.pem $(DESTDIR)$(sysconfdir)/dhparams.pem +- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 $(top_srcdir)/blacklist.dat $(DESTDIR)$(sysconfdir)/blacklist.dat ++ $(INSTALL) -m 0644 $(top_srcdir)/dhparams.pem $(DESTDIR)$(sysconfdir)/dhparams.pem ++ $(INSTALL) -m 0644 $(top_srcdir)/blacklist.dat $(DESTDIR)$(sysconfdir)/blacklist.dat + + clean: + $(LIBTOOL) --mode=clean $(RM) $(MODULE_NAME).a $(MODULE_NAME).la *.o *.lo .libs/*.o +diff --git a/contrib/mod_snmp/Makefile.in b/contrib/mod_snmp/Makefile.in +index 7de4c1c..5987896 100644 +--- a/contrib/mod_snmp/Makefile.in ++++ b/contrib/mod_snmp/Makefile.in +@@ -45,7 +45,6 @@ install: install-headers install-misc + $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd: + @if [ ! -d $@ ]; then \ + mkdir -p $@; \ +- chown $(INSTALL_USER):$(INSTALL_GROUP) $@; \ + chmod 0755 $@; \ + fi + +@@ -53,7 +52,7 @@ install-headers: $(DESTDIR)$(includedir)/proftpd + $(INSTALL_MAN) $(MODULE_NAME).h $(DESTDIR)$(includedir)/proftpd/$(MODULE_NAME).h + + install-misc: +- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 $(top_srcdir)/PROFTPD-MIB.txt $(DESTDIR)$(sysconfdir)/PROFTPD-MIB.txt ++ $(INSTALL) -m 0644 $(top_srcdir)/PROFTPD-MIB.txt $(DESTDIR)$(sysconfdir)/PROFTPD-MIB.txt + + clean: + $(LIBTOOL) --mode=clean $(RM) $(MODULE_NAME).a $(MODULE_NAME).la *.o *.lo .libs/*.o +diff --git a/contrib/mod_wrap2/Makefile.in b/contrib/mod_wrap2/Makefile.in +index 7da015f..d912d23 100644 +--- a/contrib/mod_wrap2/Makefile.in ++++ b/contrib/mod_wrap2/Makefile.in +@@ -46,7 +46,6 @@ install: install-headers + $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd: + @if [ ! -d $@ ]; then \ + mkdir -p $@; \ +- chown $(INSTALL_USER):$(INSTALL_GROUP) $@; \ + chmod 0755 $@; \ + fi + +diff --git a/include/Makefile.in b/include/Makefile.in +index 1b69d93..b7e8f5a 100644 +--- a/include/Makefile.in ++++ b/include/Makefile.in +@@ -24,7 +24,6 @@ Makefile: Makefile.in ../config.status + $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd: + @if [ ! -d $@ ]; then \ + mkdir -p $@; \ +- chown $(INSTALL_USER):$(INSTALL_GROUP) $@; \ + chmod 0755 $@; \ + fi + +diff --git a/locale/Makefile.in b/locale/Makefile.in +index 77fd787..1c41c0e 100644 +--- a/locale/Makefile.in ++++ b/locale/Makefile.in +@@ -52,7 +52,6 @@ install: $(LANGS) + if [ -f $(top_builddir)/locale/$$lang.mo ]; then \ + if [ ! -d $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES ]; then \ + mkdir -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \ +- chown $(INSTALL_USER):$(INSTALL_GROUP) $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \ + chmod 0755 $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \ + fi; \ + $(INSTALL_MAN) $$lang.mo $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \