JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

krb5: fix for stores with paths containing '+' character

Browse Source
This commit is contained in:
Dmitry Kalinkin 2016-06-17 06:18:33 -04:00
parent 8fccaa9011
commit 2a91dd0f65
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/kerberos/krb5.nix
View File

@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
buildInputs = [ openssl ]
++ optionals (!libOnly) [ openldap libedit ];
patches = [ ./path_char_fix.patch ];
preConfigure = "cd ./src";
buildPhase = optionalString libOnly ''

37
pkgs/development/libraries/kerberos/path_char_fix.patch Normal file
View File

@ -0,0 +1,37 @@
diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index 4bb11e4..cb4b44b 100644
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -57,19 +57,19 @@ SBINDIR = @sbindir@
LIBDIR = @libdir@
SYSCONFCONF = @SYSCONFCONF@
-PROCESS_REPLACE = -e "s+@KRB5RCTMPDIR+$(KRB5RCTMPDIR)+" \
- -e "s+@PREFIX+$(INSTALL_PREFIX)+" \
- -e "s+@EXEC_PREFIX+$(INSTALL_EXEC_PREFIX)+" \
- -e "s+@BINDIR+$(BINDIR)+" \
- -e "s+@LIBDIR+$(LIBDIR)+" \
- -e "s+@SBINDIR+$(SBINDIR)+" \
- -e "s+@MODULEDIR+$(MODULE_DIR)+" \
- -e "s+@GSSMODULEDIR+$(GSS_MODULE_DIR)+" \
- -e 's+@LOCALSTATEDIR+$(LOCALSTATEDIR)+' \
- -e 's+@RUNSTATEDIR+$(RUNSTATEDIR)+' \
- -e 's+@SYSCONFDIR+$(SYSCONFDIR)+' \
- -e 's+@DYNOBJEXT+$(DYNOBJEXT)+' \
- -e 's+@SYSCONFCONF+$(SYSCONFCONF)+'
+PROCESS_REPLACE = -e "s\"@KRB5RCTMPDIR\"$(KRB5RCTMPDIR)\"" \
+ -e "s\"@PREFIX\"$(INSTALL_PREFIX)\"" \
+ -e "s\"@EXEC_PREFIX\"$(INSTALL_EXEC_PREFIX)\"" \
+ -e "s\"@BINDIR\"$(BINDIR)\"" \
+ -e "s\"@LIBDIR\"$(LIBDIR)\"" \
+ -e "s\"@SBINDIR\"$(SBINDIR)\"" \
+ -e "s\"@MODULEDIR\"$(MODULE_DIR)\"" \
+ -e "s\"@GSSMODULEDIR\"$(GSS_MODULE_DIR)\"" \
+ -e "s\"@LOCALSTATEDIR\"$(LOCALSTATEDIR)\"" \
+ -e "s\"@RUNSTATEDIR\"$(RUNSTATEDIR)\"" \
+ -e "s\"@SYSCONFDIR\"$(SYSCONFDIR)\"" \
+ -e "s\"@DYNOBJEXT\"$(DYNOBJEXT)\"" \
+ -e "s\"@SYSCONFCONF\"$(SYSCONFCONF)\""
OSCONFSRC = $(srcdir)/osconf.hin