BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

prayer: remove

Browse source
This commit is contained in:
tu-maurice 2023-11-09 22:27:23 +01:00 committed by Anderson Torres
parent 7c5fb11143
commit 40c06a143f
9 changed files with 6 additions and 321 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/doc/manual/release-notes/rl-2311.section.md
View file

@ -363,6 +363,8 @@
- The `junicode` font package has been updated to [major version 2](https://github.com/psb1558/Junicode-font/releases/tag/v2.001), which is now a font family. In particular, plain `Junicode.ttf` no longer exists. In addition, TrueType font files are now placed in `font/truetype` instead of `font/junicode-ttf`; this change does not affect use via `fonts.packages` NixOS option.
- The `prayer` package as well as `services.prayer` have been removed because it's been unmaintained for several years and the author's website has vanished.
## Other Notable Changes {#sec-release-23.11-notable-changes}
- A new option `system.switch.enable` was added. By default, this is option is

4
nixos/modules/misc/ids.nix
View file

@ -86,7 +86,7 @@ in
#rtkit = 45; # dynamically allocated 2021-09-03
dovecot2 = 46;
dovenull2 = 47;
prayer = 49;
# prayer = 49; # dropped in 23.11
mpd = 50;
clamav = 51;
#fprot = 52; # unused
@ -411,7 +411,7 @@ in
#rtkit = 45; # unused
dovecot2 = 46;
dovenull2 = 47;
prayer = 49;
# prayer = 49; # dropped in 23.11
mpd = 50;
clamav = 51;
#fprot = 52; # unused

1
nixos/modules/module-list.nix
View file

@ -1041,7 +1041,6 @@
./services/networking/powerdns.nix
./services/networking/pppd.nix
./services/networking/pptpd.nix
./services/networking/prayer.nix
./services/networking/privoxy.nix
./services/networking/prosody.nix
./services/networking/quassel.nix

1
nixos/modules/rename.nix
View file

@ -111,6 +111,7 @@ in
(mkRemovedOptionModule [ "services" "riak" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "cryptpad" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "services" "rtsp-simple-server" ] "Package has been completely rebranded by upstream as mediamtx, and thus the service and the package were renamed in NixOS as well.")
(mkRemovedOptionModule [ "services" "prayer" ] "The corresponding package was removed from nixpkgs.")
(mkRemovedOptionModule [ "i18n" "inputMethod" "fcitx" ] "The fcitx module has been removed. Please use fcitx5 instead")
(mkRemovedOptionModule [ "services" "dhcpd4" ] ''

90
nixos/modules/services/networking/prayer.nix
View file

@ -1,90 +0,0 @@
{ config, lib, pkgs, ... }:
with lib;
let
inherit (pkgs) prayer;
cfg = config.services.prayer;
stateDir = "/var/lib/prayer";
prayerUser = "prayer";
prayerGroup = "prayer";
prayerExtraCfg = pkgs.writeText "extraprayer.cf" ''
prefix = "${prayer}"
var_prefix = "${stateDir}"
prayer_user = "${prayerUser}"
prayer_group = "${prayerGroup}"
sendmail_path = "/run/wrappers/bin/sendmail"
use_http_port ${cfg.port}
${cfg.extraConfig}
'';
prayerCfg = pkgs.runCommand "prayer.cf" { preferLocalBuild = true; } ''
# We have to remove the http_port 80, or it will start a server there
cat ${prayer}/etc/prayer.cf | grep -v http_port > $out
cat ${prayerExtraCfg} >> $out
'';
in
{
###### interface
options = {
services.prayer = {
enable = mkEnableOption (lib.mdDoc "the prayer webmail http server");
port = mkOption {
default = 2080;
type = types.port;
description = lib.mdDoc ''
Port the prayer http server is listening to.
'';
};
extraConfig = mkOption {
type = types.lines;
default = "" ;
description = lib.mdDoc ''
Extra configuration. Contents will be added verbatim to the configuration file.
'';
};
};
};
###### implementation
config = mkIf config.services.prayer.enable {
environment.systemPackages = [ prayer ];
users.users.${prayerUser} =
{ uid = config.ids.uids.prayer;
description = "Prayer daemon user";
home = stateDir;
};
users.groups.${prayerGroup} =
{ gid = config.ids.gids.prayer; };
systemd.services.prayer = {
wantedBy = [ "multi-user.target" ];
serviceConfig.Type = "forking";
preStart = ''
mkdir -m 0755 -p ${stateDir}
chown ${prayerUser}:${prayerGroup} ${stateDir}
'';
script = "${prayer}/sbin/prayer --config-file=${prayerCfg}";
};
};
}

56
pkgs/servers/prayer/default.nix
View file

@ -1,56 +0,0 @@
{ lib, stdenv, fetchurl, fetchpatch, perl, openssl, db, zlib, uwimap, html-tidy, pam}:
let
ssl = lib.optionals uwimap.withSSL
"-e 's/CCLIENT_SSL_ENABLE.*= false/CCLIENT_SSL_ENABLE=true/'";
in
stdenv.mkDerivation rec {
pname = "prayer";
version = "1.3.5";
src = fetchurl {
url = "ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/${pname}-${version}.tar.gz";
sha256 = "135fjbxjn385b6cjys6qhbwfw61mdcl2akkll4jfpdzfvhbxlyda";
};
patches = [
./install.patch
# fix build errors which result from openssl changes
(fetchpatch {
url = "https://sources.debian.org/data/main/p/prayer/1.3.5-dfsg1-6/debian/patches/disable_ssl3.patch";
sha256 = "1rx4bidc9prh4gffipykp144cyi3zd6qzd990s2aad3knzv5bkdd";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/p/prayer/1.3.5-dfsg1-6/debian/patches/openssl1.1.patch";
sha256 = "0zinylvq3bcifdmki867gir49pbjx6qb5h019hawwif2l4jmlxw1";
})
];
postPatch = ''
sed -i -e s/gmake/make/ -e 's/LDAP_ENABLE.*= true/LDAP_ENABLE=false/' \
${ssl} \
-e 's/CCLIENT_LIBS=.*/CCLIENT_LIBS=-lc-client/' \
-e 's,^PREFIX .*,PREFIX='$out, \
-e 's,^CCLIENT_DIR=.*,CCLIENT_DIR=${uwimap}/include/c-client,' \
Config
sed -i -e s,/usr/bin/perl,${perl}/bin/perl, \
templates/src/*.pl
sed -i -e '/<stropts.h>/d' lib/os_linux.h
'' + /* html-tidy updates */ ''
substituteInPlace ./session/html_secure_tidy.c \
--replace buffio.h tidybuffio.h
'';
buildInputs = [ openssl db zlib uwimap html-tidy pam ];
nativeBuildInputs = [ perl ];
NIX_LDFLAGS = "-lpam";
meta = {
homepage = "http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/";
description = "Yet another Webmail interface for IMAP servers on Unix systems written in C";
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.linux;
};
}

170
pkgs/servers/prayer/install.patch
View file

@ -1,170 +0,0 @@
diff --git a/accountd/Makefile b/accountd/Makefile
index c3e8107..7946776 100644
--- a/accountd/Makefile
+++ b/accountd/Makefile
@@ -75,6 +75,6 @@ clean:
-rm -f prayer-accountd test core *.o *~ \#*\#
install:
- $(INSTALL) -m 755 -o ${RO_USER} -g ${RW_GROUP} \
+ $(INSTALL) -m 755 \
prayer-accountd ${BROOT}${BIN_DIR}
diff --git a/files/Makefile b/files/Makefile
index 743d0ed..7eff064 100644
--- a/files/Makefile
+++ b/files/Makefile
@@ -52,20 +52,20 @@ distclean:
install-cert:
if [ -f certs/prayer.pem ]; then \
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) \
+ $(INSTALL) \
-m $(PRIVATE_FILE) certs/prayer.pem ${BROOT}${PREFIX}/certs; \
fi
install-config: etc/prayer.cf
- $(INSTALL) -D -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
+ $(INSTALL) -D -m $(PUBLIC_FILE) \
etc/prayer.cf ${BROOT}${PRAYER_CONFIG_FILE}
install-aconfig:
- $(INSTALL) -D -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
+ $(INSTALL) -D -m $(PUBLIC_FILE) \
etc/prayer-accountd.cf ${BROOT}${ACCOUNTD_CONFIG_FILE}
install-motd:
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
+ $(INSTALL) -m $(PUBLIC_FILE) \
etc/motd.html ${BROOT}${PREFIX}/etc
install:
@@ -83,6 +83,6 @@ install:
if [ ! -f $(BROOT)$(PREFIX)/etc/motd.html ]; then $(MAKE) install-motd; fi
redhat-install-init.d:
- install -D -o root -g root -m 755 \
+ install -D -m 755 \
./init.d/prayer $(BROOT)/etc/rc.d/init.d/prayer
#chkconfig prayer --level 2345 on
diff --git a/files/install.sh b/files/install.sh
index 8d1d1f4..0804a08 100755
--- a/files/install.sh
+++ b/files/install.sh
@@ -2,8 +2,6 @@
#
# $Cambridge: hermes/src/prayer/files/install.sh,v 1.7 2008/09/16 09:59:56 dpc22 Exp $
-PATH=/bin:/sbin/:/usr/bin:/usr/sbin
-
error=0
if [ "x$PREFIX" = "x" ]; then
@@ -55,24 +53,20 @@ if [ $error != 0 ]; then
exit 1
fi
-if [ ! -d ${VAR_PREFIX} -a `whoami` = "root" ]; then
- ${INSTALL} -d -o ${RW_USER} -g ${RW_GROUP} -m ${PRIVATE_DIR} ${VAR_PREFIX}
-fi
-
if [ ! -d ${PREFIX} ]; then
- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${PREFIX}
+ ${INSTALL} -d -m ${PUBLIC_DIR} ${PREFIX}
fi
if [ ! -d ${PREFIX}/etc ]; then
- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${PREFIX}/etc
+ ${INSTALL} -d -m ${PUBLIC_DIR} ${PREFIX}/etc
fi
if [ ! -d ${PREFIX}/certs ]; then
- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PRIVATE_DIR} ${PREFIX}/certs
+ ${INSTALL} -d -m ${PRIVATE_DIR} ${PREFIX}/certs
fi
if [ ! -d ${BIN_DIR} ]; then
- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${BIN_DIR}
+ ${INSTALL} -d -m ${PUBLIC_DIR} ${BIN_DIR}
fi
for i in icons static
@@ -83,5 +77,4 @@ do
fi
echo Copying ${i}
(tar cf - ${i}) | (cd ${PREFIX} ; tar xf -)
- (cd ${PREFIX}; chown -R ${RO_USER}:${RO_GROUP} ${i})
done
diff --git a/servers/Makefile b/servers/Makefile
index 021aed5..5ccbd08 100644
--- a/servers/Makefile
+++ b/servers/Makefile
@@ -107,13 +107,13 @@ clean:
-rm -f $(BIN) core *.o *.flc *~ \#*\#
install: all
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \
+ $(INSTALL) -m $(PUBLIC_DIR) -d \
$(BROOT)$(BIN_DIR)
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
+ $(INSTALL) -m $(PUBLIC_EXEC) \
prayer $(BROOT)$(BIN_DIR)
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
+ $(INSTALL) -m $(PUBLIC_EXEC) \
prayer-chroot $(BROOT)$(BIN_DIR)
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
+ $(INSTALL) -m $(PUBLIC_EXEC) \
prayer-session $(BROOT)$(BIN_DIR)
prayer: $(PRAYER_OBJS) prayer_main.o
diff --git a/templates/cam/Makefile b/templates/cam/Makefile
index 9f4122a..396b628 100644
--- a/templates/cam/Makefile
+++ b/templates/cam/Makefile
@@ -124,7 +124,7 @@ _template_index.c:
$(COMPILE) $(TYPE) $@ $*
install:
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \
+ $(INSTALL) -m $(PUBLIC_DIR) -d \
$(BROOT)$(PREFIX)/templates/$(TYPE)
cp *.t $(BROOT)$(PREFIX)/templates/$(TYPE)
cp *.vars $(BROOT)$(PREFIX)/templates/$(TYPE)
diff --git a/templates/old/Makefile b/templates/old/Makefile
index 31016cf..288a64c 100644
--- a/templates/old/Makefile
+++ b/templates/old/Makefile
@@ -123,7 +123,7 @@ _template_index.c:
$(COMPILE) $(TYPE) $@ $*
install:
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \
+ $(INSTALL) -m $(PUBLIC_DIR) -d \
$(BROOT)$(PREFIX)/templates/$(TYPE)
cp *.t $(BROOT)$(PREFIX)/templates/$(TYPE)
cp *.vars $(BROOT)$(PREFIX)/templates/$(TYPE)
diff --git a/utils/Makefile b/utils/Makefile
index 9c79916..ef82481 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -72,15 +72,15 @@ clean:
-rm -f $(BIN) core *.o *.flc *~ \#*\#
install: all
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \
+ $(INSTALL) -m $(PUBLIC_DIR) -d \
$(BROOT)$(BIN_DIR)
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
+ $(INSTALL) -m $(PUBLIC_EXEC) \
prayer-ssl-prune $(BROOT)$(BIN_DIR)
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
+ $(INSTALL) -m $(PUBLIC_EXEC) \
prayer-sem-prune $(BROOT)$(BIN_DIR)
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
+ $(INSTALL) -m $(PUBLIC_EXEC) \
prayer-db-prune $(BROOT)$(BIN_DIR)
- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
+ $(INSTALL) -m $(PUBLIC_EXEC) \
prayer-cyclog $(BROOT)$(BIN_DIR)
prayer-ssl-prune: $(PRUNE_OBJS)

1
pkgs/top-level/aliases.nix
View file

@ -714,6 +714,7 @@ mapAliases ({
pinentry_qt = throw "'pinentry_qt' has been renamed to/replaced by 'pinentry-qt'"; # Converted to throw 2023-09-10
pinentry_qt5 = pinentry-qt; # Added 2020-02-11
poetry2nix = throw "poetry2nix is now maintained out-of-tree. Please use https://github.com/nix-community/poetry2nix/"; # Added 2023-10-26
prayer = throw "prayer has been removed from nixpkgs"; # Added 2023-11-09
privacyidea = throw "privacyidea has been removed from nixpkgs"; # Added 2023-10-31
probe-rs-cli = throw "probe-rs-cli is now part of the probe-rs package"; # Added 2023-07-03
processing3 = throw "'processing3' has been renamed to/replaced by 'processing'"; # Converted to throw 2023-09-10

2
pkgs/top-level/all-packages.nix
View file

@ -28589,8 +28589,6 @@ with pkgs;
pps-tools = callPackage ../os-specific/linux/pps-tools { };
prayer = callPackage ../servers/prayer { };
procps = if stdenv.isLinux
then callPackage ../os-specific/linux/procps-ng { }
else unixtools.procps;