diff options
| author | Rob Vermaas <rob.vermaas@gmail.com> | 2013-07-24 12:27:06 +0200 |
|---|---|---|
| committer | Rob Vermaas <rob.vermaas@gmail.com> | 2013-07-24 12:27:58 +0200 |
| commit | 850f20567efbcacdee4615b4dbf74daaec8925ab (patch) | |
| tree | db06c78a5d7b1a1c93339baba131eefeb5cdef34 /pkgs/tools/security/apg | |
| parent | 58c08fdefbce5d81d3f429de1eadc096b8be7f8d (diff) | |
| download | nixpkgs-850f20567efbcacdee4615b4dbf74daaec8925ab.tar nixpkgs-850f20567efbcacdee4615b4dbf74daaec8925ab.tar.gz nixpkgs-850f20567efbcacdee4615b4dbf74daaec8925ab.tar.bz2 nixpkgs-850f20567efbcacdee4615b4dbf74daaec8925ab.tar.lz nixpkgs-850f20567efbcacdee4615b4dbf74daaec8925ab.tar.xz nixpkgs-850f20567efbcacdee4615b4dbf74daaec8925ab.tar.zst nixpkgs-850f20567efbcacdee4615b4dbf74daaec8925ab.zip | |
Fix apg
Diffstat (limited to 'pkgs/tools/security/apg')
| -rw-r--r-- | pkgs/tools/security/apg/apg.patch | 44 | ||||
| -rw-r--r-- | pkgs/tools/security/apg/default.nix | 6 |
2 files changed, 46 insertions, 4 deletions
diff --git a/pkgs/tools/security/apg/apg.patch b/pkgs/tools/security/apg/apg.patch new file mode 100644 index 00000000000..abc22647d52 --- /dev/null +++ b/pkgs/tools/security/apg/apg.patch @@ -0,0 +1,44 @@ +diff -rc apg-2.2.3/Makefile apg-2.2.3-new/Makefile +*** apg-2.2.3/Makefile 2003-08-07 17:40:30.000000000 +0200 +--- apg-2.2.3-new/Makefile 2013-07-24 12:25:31.159938436 +0200 +*************** +*** 113,131 **** + if test -x ./apg; then \ + ./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \ + ./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \ +! ./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apg ${INSTALL_PREFIX}${APG_BIN_DIR}; \ + ./install-sh -c -m 0444 ./doc/man/apg.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \ + fi + if test -x ./apgd; then \ + ./mkinstalldirs ${INSTALL_PREFIX}${APGD_BIN_DIR}; \ + ./mkinstalldirs ${INSTALL_PREFIX}${APGD_MAN_DIR}; \ +! ./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apgd ${INSTALL_PREFIX}${APGD_BIN_DIR}; \ + ./install-sh -c -m 0444 ./doc/man/apgd.8 ${INSTALL_PREFIX}${APGD_MAN_DIR}; \ + fi + if test -x ./apgbfm; then \ + ./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \ + ./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \ +! ./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apgbfm ${INSTALL_PREFIX}${APG_BIN_DIR}; \ + ./install-sh -c -m 0444 ./doc/man/apgbfm.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \ + fi + +--- 113,131 ---- + if test -x ./apg; then \ + ./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \ + ./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \ +! ./install-sh -c -m 0755 ./apg ${INSTALL_PREFIX}${APG_BIN_DIR}; \ + ./install-sh -c -m 0444 ./doc/man/apg.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \ + fi + if test -x ./apgd; then \ + ./mkinstalldirs ${INSTALL_PREFIX}${APGD_BIN_DIR}; \ + ./mkinstalldirs ${INSTALL_PREFIX}${APGD_MAN_DIR}; \ +! ./install-sh -c -m 0755 ./apgd ${INSTALL_PREFIX}${APGD_BIN_DIR}; \ + ./install-sh -c -m 0444 ./doc/man/apgd.8 ${INSTALL_PREFIX}${APGD_MAN_DIR}; \ + fi + if test -x ./apgbfm; then \ + ./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \ + ./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \ +! ./install-sh -c -m 0755 ./apgbfm ${INSTALL_PREFIX}${APG_BIN_DIR}; \ + ./install-sh -c -m 0444 ./doc/man/apgbfm.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \ + fi + diff --git a/pkgs/tools/security/apg/default.nix b/pkgs/tools/security/apg/default.nix index 7eeb491374a..28f66e1e492 100644 --- a/pkgs/tools/security/apg/default.nix +++ b/pkgs/tools/security/apg/default.nix @@ -8,10 +8,8 @@ stdenv.mkDerivation rec { configurePhase = '' substituteInPlace Makefile --replace /usr/local "$out" ''; - preInstall = '' - export CHOWNPROG=true - export CHGRPPROG=true - ''; + + patches = [ ./apg.patch ]; meta = { description = "A tool set for random password generation."; |