Merge pull request #173181 from malte-v/init-opensmtpd-filter-dkimsign
libopensmtpd: init at 0.7; opensmtpd-filter-dkimsign: init at 0.6main
commit
032faca4f7
@ -0,0 +1,36 @@ |
|||||||
|
{ 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 ]; |
||||||
|
}; |
||||||
|
} |
@ -0,0 +1,24 @@ |
|||||||
|
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}
|
@ -0,0 +1,34 @@ |
|||||||
|
{ 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 ]; |
||||||
|
}; |
||||||
|
} |
@ -0,0 +1,38 @@ |
|||||||
|
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}
|
||||||
|
|
Loading…
Reference in new issue