Unverified Commit 032faca4 authored by Lassulus's avatar Lassulus Committed by GitHub
Browse files

Merge pull request #173181 from malte-v/init-opensmtpd-filter-dkimsign

libopensmtpd: init at 0.7; opensmtpd-filter-dkimsign: init at 0.6
parents 6d02b029 f58f0e6b
Loading
Loading
Loading
Loading
+36 −0
Original line number Diff line number Diff line
{ lib
, stdenv
, fetchurl
, libopensmtpd
, openssl
, mandoc
}:
stdenv.mkDerivation rec {
  pname = "opensmtpd-filter-dkimsign";
  version = "0.6";

  src = fetchurl {
    url = "https://imperialat.at/releases/filter-dkimsign-${version}.tar.gz";
    hash = "sha256-O18NtAuSNg82uKnUx+R4h3e1IBSElTrFWBBkr2AYNsM=";
  };

  patches = [ ./no-chown-while-installing.patch ];

  buildInputs = [ libopensmtpd openssl ];

  nativeBuildInputs = [ mandoc ];

  makeFlags = [
    "-f Makefile.gnu"
    "HAVE_ED25519=1"
    "DESTDIR=$(out)"
    "LOCALBASE="
  ];

  meta = with lib; {
    description = "OpenSMTPD filter for DKIM signing";
    homepage = "http://imperialat.at/dev/filter-dkimsign/";
    license = licenses.isc;
    maintainers = with maintainers; [ malvo ];
  };
}
+24 −0
Original line number Diff line number Diff line
diff --git a/Makefile.gnu b/Makefile.gnu
index 1f97bd2..807b692 100644
--- a/Makefile.gnu
+++ b/Makefile.gnu
@@ -46,11 +46,7 @@ NEED_PLEDGE?=		1
 
 MANFORMAT?=		mangz
 
-BINOWN?=	root
-BINGRP?=	root
 BINPERM?=	755
-MANOWN?=	root
-MANGRP?=	root
 MANPERM?=	644
 
 ifeq (${MANFORMAT}, mangz)
@@ -115,5 +111,5 @@ clean:
 
 .PHONY: install
 install: ${PROG}
-	${INSTALL} -D -o ${BINOWN} -g ${BINGRP} -m ${BINPERM} ${PROG} ${DESTDIR}${BINDIR}/${PROG}
-	${INSTALL} -D -o ${MANOWN} -g ${MANGRP} -m ${MANPERM} ${TARGET_MAN} ${DESTDIR}${MANDIR}/${TARGET_MAN}
+	${INSTALL} -D -m ${BINPERM} ${PROG} ${DESTDIR}${BINDIR}/${PROG}
+	${INSTALL} -D -m ${MANPERM} ${TARGET_MAN} ${DESTDIR}${MANDIR}/${TARGET_MAN}
+34 −0
Original line number Diff line number Diff line
{ lib
, stdenv
, fetchurl
, libevent
, mandoc
}:
stdenv.mkDerivation rec {
  pname = "libopensmtpd";
  version = "0.7";

  src = fetchurl {
    url = "https://imperialat.at/releases/libopensmtpd-${version}.tar.gz";
    hash = "sha256-zdbV4RpwY/kmXaQ6QjCcZGVUuLaLA5gsqEctvisIphM=";
  };

  patches = [ ./no-chown-while-installing.patch ];

  buildInputs = [ libevent ];

  nativeBuildInputs = [ mandoc ];

  makeFlags = [
    "-f Makefile.gnu"
    "DESTDIR=$(out)"
    "LOCALBASE="
  ];

  meta = with lib; {
    description = "Library for creating OpenSMTPD filters";
    homepage = "http://imperialat.at/dev/libopensmtpd/";
    license = licenses.isc;
    maintainers = with maintainers; [ malvo ];
  };
}
+38 −0
Original line number Diff line number Diff line
diff --git a/Makefile.gnu b/Makefile.gnu
index b4bcaef..981721c 100644
--- a/Makefile.gnu
+++ b/Makefile.gnu
@@ -27,7 +27,7 @@ SYMBOL_LIST=	${CURDIR}/Symbols.list
 includes:
 	@cd ${CURDIR}; for i in ${HDRS}; do \
 	    j="cmp -s $$i ${DESTDIR}${LOCALBASE}/include/$$i || \
-	    ${INSTALL} -D -o ${BINOWN} -g ${BINGRP} -m 444 $$i\
+	    ${INSTALL} -D -m 444 $$i\
 		${DESTDIR}${LOCALBASE}/include/$$i"; \
 	    echo $$j; \
 	    eval "$$j"; \
@@ -52,11 +52,7 @@ MANFORMAT?=		mangz
 INSTALL?=	install
 LINK?=		ln
 
-BINOWN?=	root
-BINGRP?=	root
 LIBPERM?=	755
-MANOWN?=	root
-MANGRP?=	root
 MANPERM?=	644
 
 include ${CURDIR}/shlib_version
@@ -138,10 +134,10 @@ all: ${TARGET_LIB} ${TARGET_MAN}
 
 .PHONY: install
 install: includes ${TARGET_LIB} ${TARGET_MAN}
-	${INSTALL} -D -o ${BINOWN} -g ${BINGRP} -m ${LIBPERM} ${TARGET_LIB} ${DESTDIR}${LIBDIR}/${TARGET_LIB}
+	${INSTALL} -D -m ${LIBPERM} ${TARGET_LIB} ${DESTDIR}${LIBDIR}/${TARGET_LIB}
 	${LINK} -s ${TARGET_LIB} ${DESTDIR}${LIBDIR}/${SONAME_LIB}
 	${LINK} -s ${TARGET_LIB} ${DESTDIR}${LIBDIR}/${BASE_LIB}
-	${INSTALL} -D -o ${MANOWN} -g ${MANGRP} -m ${MANPERM} ${TARGET_MAN} ${DESTDIR}${MANDIR}/${TARGET_MAN}
+	${INSTALL} -D -m ${MANPERM} ${TARGET_MAN} ${DESTDIR}${MANDIR}/${TARGET_MAN}
 
 CLEANFILES+=	*.o ${TARGET_LIB}
 
+2 −0
Original line number Diff line number Diff line
@@ -23677,6 +23677,8 @@ with pkgs;
  opensmtpd = callPackage ../servers/mail/opensmtpd { };
  opensmtpd-extras = callPackage ../servers/mail/opensmtpd/extras.nix { };
  opensmtpd-filter-rspamd = callPackage ../servers/mail/opensmtpd/filter-rspamd.nix { };
  opensmtpd-filter-dkimsign = callPackage ../servers/mail/opensmtpd/filter-dkimsign { };
  libopensmtpd = callPackage ../servers/mail/opensmtpd/libopensmtpd { };
  openxr-loader = callPackage ../development/libraries/openxr-loader { };