Fix apg

+46 -4
+44
pkgs/tools/security/apg/apg.patch
···
··· 1 + diff -rc apg-2.2.3/Makefile apg-2.2.3-new/Makefile 2 + *** apg-2.2.3/Makefile 2003-08-07 17:40:30.000000000 +0200 3 + --- apg-2.2.3-new/Makefile 2013-07-24 12:25:31.159938436 +0200 4 + *************** 5 + *** 113,131 **** 6 + if test -x ./apg; then \ 7 + ./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \ 8 + ./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \ 9 + ! ./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apg ${INSTALL_PREFIX}${APG_BIN_DIR}; \ 10 + ./install-sh -c -m 0444 ./doc/man/apg.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \ 11 + fi 12 + if test -x ./apgd; then \ 13 + ./mkinstalldirs ${INSTALL_PREFIX}${APGD_BIN_DIR}; \ 14 + ./mkinstalldirs ${INSTALL_PREFIX}${APGD_MAN_DIR}; \ 15 + ! ./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apgd ${INSTALL_PREFIX}${APGD_BIN_DIR}; \ 16 + ./install-sh -c -m 0444 ./doc/man/apgd.8 ${INSTALL_PREFIX}${APGD_MAN_DIR}; \ 17 + fi 18 + if test -x ./apgbfm; then \ 19 + ./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \ 20 + ./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \ 21 + ! ./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apgbfm ${INSTALL_PREFIX}${APG_BIN_DIR}; \ 22 + ./install-sh -c -m 0444 ./doc/man/apgbfm.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \ 23 + fi 24 + 25 + --- 113,131 ---- 26 + if test -x ./apg; then \ 27 + ./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \ 28 + ./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \ 29 + ! ./install-sh -c -m 0755 ./apg ${INSTALL_PREFIX}${APG_BIN_DIR}; \ 30 + ./install-sh -c -m 0444 ./doc/man/apg.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \ 31 + fi 32 + if test -x ./apgd; then \ 33 + ./mkinstalldirs ${INSTALL_PREFIX}${APGD_BIN_DIR}; \ 34 + ./mkinstalldirs ${INSTALL_PREFIX}${APGD_MAN_DIR}; \ 35 + ! ./install-sh -c -m 0755 ./apgd ${INSTALL_PREFIX}${APGD_BIN_DIR}; \ 36 + ./install-sh -c -m 0444 ./doc/man/apgd.8 ${INSTALL_PREFIX}${APGD_MAN_DIR}; \ 37 + fi 38 + if test -x ./apgbfm; then \ 39 + ./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \ 40 + ./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \ 41 + ! ./install-sh -c -m 0755 ./apgbfm ${INSTALL_PREFIX}${APG_BIN_DIR}; \ 42 + ./install-sh -c -m 0444 ./doc/man/apgbfm.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \ 43 + fi 44 +
+2 -4
pkgs/tools/security/apg/default.nix
··· 8 configurePhase = '' 9 substituteInPlace Makefile --replace /usr/local "$out" 10 ''; 11 - preInstall = '' 12 - export CHOWNPROG=true 13 - export CHGRPPROG=true 14 - ''; 15 16 meta = { 17 description = "A tool set for random password generation.";
··· 8 configurePhase = '' 9 substituteInPlace Makefile --replace /usr/local "$out" 10 ''; 11 + 12 + patches = [ ./apg.patch ]; 13 14 meta = { 15 description = "A tool set for random password generation.";