mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-22 12:53:54 +00:00
571c71e6f7
We are migrating packages that meet below requirements:
1. using `callPackage`
2. called path is a directory
3. overriding set is empty (`{ }`)
4. not containing path expressions other than relative path (to
makenixpkgs-vet happy)
5. not referenced by nix files outside of the directory, other
than`pkgs/top-level/all-packages.nix`
6. not referencing nix files outside of the directory
7. not referencing `default.nix` (since it's changed to `package.nix`)
8. `outPath` doesn't change after migration
The tool is here: https://github.com/Aleksanaa/by-name-migrate.
33 lines
1.3 KiB
Diff
33 lines
1.3 KiB
Diff
Index: strongswan-5.2.1/src/starter/confread.c
|
|
===================================================================
|
|
--- strongswan-5.2.1.orig/src/starter/confread.c
|
|
+++ strongswan-5.2.1/src/starter/confread.c
|
|
@@ -43,7 +43,7 @@
|
|
static const char ike_defaults[] = "aes128-sha1-modp2048,3des-sha1-modp1536";
|
|
static const char esp_defaults[] = "aes128-sha1,3des-sha1";
|
|
|
|
-static const char firewall_defaults[] = IPSEC_SCRIPT " _updown iptables";
|
|
+static const char firewall_defaults[] = IPSEC_SBINDIR "/" IPSEC_SCRIPT " _updown iptables";
|
|
|
|
/**
|
|
* Provided by GPERF
|
|
Index: strongswan-5.2.1/src/starter/Makefile.am
|
|
===================================================================
|
|
--- strongswan-5.2.1.orig/src/starter/Makefile.am
|
|
+++ strongswan-5.2.1/src/starter/Makefile.am
|
|
@@ -18,10 +18,12 @@ AM_CPPFLAGS = \
|
|
-I$(top_srcdir)/src/libhydra \
|
|
-I$(top_srcdir)/src/starter \
|
|
-I$(top_srcdir)/src/stroke \
|
|
- -DIPSEC_DIR=\"${ipsecdir}\" \
|
|
+ -DIPSEC_BINDIR=\"${bindir}\" \
|
|
-DIPSEC_CONFDIR=\"${sysconfdir}\" \
|
|
- -DIPSEC_PIDDIR=\"${piddir}\" \
|
|
+ -DIPSEC_DIR=\"${ipsecdir}\" \
|
|
-DIPSEC_EAPDIR=\"${eapdir}\" \
|
|
+ -DIPSEC_PIDDIR=\"${piddir}\" \
|
|
+ -DIPSEC_SBINDIR=\"${sbindir}\" \
|
|
-DIPSEC_SCRIPT=\"${ipsec_script}\" \
|
|
-DDEV_RANDOM=\"${random_device}\" \
|
|
-DDEV_URANDOM=\"${urandom_device}\" \
|