From 92351ff5ccbb5ac032b300e6384df49008a880fc Mon Sep 17 00:00:00 2001 From: Bandie Date: Sat, 3 Nov 2018 01:01:17 +0100 Subject: [PATCH 1/6] clearer variable name; predefine writeout --- src/pam_panic_config/pam_panic_config | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pam_panic_config/pam_panic_config b/src/pam_panic_config/pam_panic_config index 2206b36..c53c0eb 100755 --- a/src/pam_panic_config/pam_panic_config +++ b/src/pam_panic_config/pam_panic_config @@ -258,12 +258,12 @@ esac config="$config\naccount requisite pam_panic.so" - # Write config file +writeout=0 if [ -f $CONFIGFILE ]; then ask "Configfile exist" "$CONFIGFILE exists. Overwrite it?" - ov=$? - case $ov in + writeout=$? + case $writeout in "0") echo -e "$config" > $CONFIGFILE ;; @@ -275,7 +275,7 @@ fi # Finished message clear -[ $ov -eq 0 ] && echo "Done! <3" || echo "Nothing done! Date: Sat, 3 Nov 2018 01:47:02 +0100 Subject: [PATCH 2/6] Ignore pam_panic_config since it will be "built" --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 944ef87..f50bfe8 100644 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,7 @@ po/*.sin src/pam_panic/man/* !src/pam_panic/man/Makefile.am !src/pam_panic/man/man8/ +src/pam_panic_config/pam_panic_config src/pam_panic_pw/pam_panic_pw src/pam_panic_pw/man/* !src/pam_panic_pw/man/Makefile.am From 69997ca7d39fd56d448ef8e61c8f8e3bf28fe188 Mon Sep 17 00:00:00 2001 From: Bandie Date: Sat, 3 Nov 2018 01:50:17 +0100 Subject: [PATCH 3/6] Build pam_panic_config with SECUREDIR --- src/pam_panic_config/Makefile.am | 6 ++++++ .../{pam_panic_config => pam_panic_config.prebuild} | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) rename src/pam_panic_config/{pam_panic_config => pam_panic_config.prebuild} (97%) diff --git a/src/pam_panic_config/Makefile.am b/src/pam_panic_config/Makefile.am index 0dd48d1..7564abd 100644 --- a/src/pam_panic_config/Makefile.am +++ b/src/pam_panic_config/Makefile.am @@ -1,2 +1,8 @@ SUBDIRS = applications icons bin_SCRIPTS = pam_panic_config + +%: %.prebuild + { sldr=$$(echo "$(SECUREDIR)" | $(SED) 's/\//\\\//g'); $(SED) "s/__SECURELIBDIR__/$$sldr/" $< > $@ ; } + +clean-local: + $(RM) *.tmp diff --git a/src/pam_panic_config/pam_panic_config b/src/pam_panic_config/pam_panic_config.prebuild similarity index 97% rename from src/pam_panic_config/pam_panic_config rename to src/pam_panic_config/pam_panic_config.prebuild index c53c0eb..ec1bf16 100755 --- a/src/pam_panic_config/pam_panic_config +++ b/src/pam_panic_config/pam_panic_config.prebuild @@ -8,6 +8,9 @@ CONFIGFILE="/etc/pam.d/pampanic" LHBU="$HOME/LUKSHeaderBackup" +# Set on build time +SECUREDIR="__SECURELIBDIR__" + if [ $EUID -ne 0 ]; then echo "Please run this script as root or using sudo." exit 1 @@ -230,7 +233,7 @@ power=$? # Configuration generation dialog --backtitle "pam_panic's Configuration Generator" \ --infobox "Generating configuration..." 3 40 -config="#%PAM-1.0\nauth requisite pam_panic.so" +config="#%PAM-1.0\nauth requisite $SECUREDIR/pam_panic.so" case $power in "0") @@ -255,7 +258,7 @@ case $serious in config="$config serious=$serious_dev" ;; esac -config="$config\naccount requisite pam_panic.so" +config="$config\naccount requisite $SECUREDIR/pam_panic.so" # Write config file From 4ff63b4548a05ca6f28054a5f4bb7ddacc25347c Mon Sep 17 00:00:00 2001 From: Bandie Date: Sat, 3 Nov 2018 02:33:05 +0100 Subject: [PATCH 4/6] 64x64 for KDE --- configure.ac | 3 ++- src/pam_panic_config/Makefile.am | 2 +- src/pam_panic_config/icons/64x64/Makefile.am | 2 ++ src/pam_panic_config/icons/64x64/pampanic.png | Bin 0 -> 3533 bytes .../icons/{ => scalable}/Makefile.am | 0 .../icons/{ => scalable}/pampanic.svg | 0 6 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 src/pam_panic_config/icons/64x64/Makefile.am create mode 100644 src/pam_panic_config/icons/64x64/pampanic.png rename src/pam_panic_config/icons/{ => scalable}/Makefile.am (100%) rename src/pam_panic_config/icons/{ => scalable}/pampanic.svg (100%) diff --git a/configure.ac b/configure.ac index f2b8ce2..1572df8 100644 --- a/configure.ac +++ b/configure.ac @@ -77,7 +77,8 @@ AC_CONFIG_FILES([ src/pam_panic_pw/man/Makefile src/pam_panic_config/Makefile src/pam_panic_config/applications/Makefile - src/pam_panic_config/icons/Makefile + src/pam_panic_config/icons/64x64/Makefile + src/pam_panic_config/icons/scalable/Makefile test/Makefile ]) diff --git a/src/pam_panic_config/Makefile.am b/src/pam_panic_config/Makefile.am index 7564abd..b928997 100644 --- a/src/pam_panic_config/Makefile.am +++ b/src/pam_panic_config/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = applications icons +SUBDIRS = applications icons/64x64 icons/scalable bin_SCRIPTS = pam_panic_config %: %.prebuild diff --git a/src/pam_panic_config/icons/64x64/Makefile.am b/src/pam_panic_config/icons/64x64/Makefile.am new file mode 100644 index 0000000..2b97668 --- /dev/null +++ b/src/pam_panic_config/icons/64x64/Makefile.am @@ -0,0 +1,2 @@ +appicondir=$(datadir)/icons/hicolor/64x64/apps +appicon_DATA=pampanic.png diff --git a/src/pam_panic_config/icons/64x64/pampanic.png b/src/pam_panic_config/icons/64x64/pampanic.png new file mode 100644 index 0000000000000000000000000000000000000000..cf7876bcbf034af4860330d15734f54d24e7d9cd GIT binary patch literal 3533 zcmV;;4KnhHP)w#xu;M6y8GL|$G3moR{<#?&MA5sfZ`Os45d!#@t@WJ1CY}uaEfaHr#0ZT z2Al@qGytdSWsbZLP$<&`t&dR*@e$Vr-y8CofzlQzK|JqRnbs)79H`@YpcG1*AcA-f z$jC-*bEFZ~d4*V0W)PV$74cj!44l3cPE!M3TQhz(gEB32Nf}nfOmxU1+js!4y$R5m z<&z0dnugPT1m{RIMl?>WY6ecK2mAAVc)cAX3xZ`?>3|IV|8K((v#LfO*uGD;b!TN` zQ(D#??2)~_Il1t`=OsM5PK^9w302id_09LoN8SChJDHQk_dg+_S+!zTOp~Q|KPqo_ zX5=5<*(-@9Ka%QS-7RmnXJlPNt5~z@M46V1SbssZ*7_FT_pOo9egi#zBG>%nZ`hkP zc=he=JpS4iE~=fwva`R#$4-PJjfbiD?qxi7%StRGM7!&A)q=U~Oe$L2TB$qld>W%A z)K{FrJ6Vfsmt4$_q)$~rj7_g>!fiQpyeXY@JV1l(cnE^!*d%wp&zt)Xv9T@71@-lW zYv!?R*$*iQhj{6W7M|YuN0b5AFT0e;lxni3#r`i2^3;cWx$NA<%$iWfi@*N^p6i0| zk2rB3*(jhCh8Vbp!bRcupkpzjmc@jyrpHYYDxJv1^XAZ+^ZC~oUgG6fH_?*yC?7wL zaWiHkS`$il@!y+YCXsAs?fOk*_J4{ag3{_Fj{*WHA0M!NC@Y^x)rH^Z%9?3(=5pNe z+s#;}=8Kd|!i0EH5oRPx&V&7F2OWu^l*U5nJ@6_2c>6BECp2LSN&wFsc>qQ@0)h-I zFne<@%g&lkMRA8ZV%}a33 zvgOPkUr2w>;}3`05EDfCCp!-i5D!bBD5UxKt=oC|U;YWF=^%bjCqfX*4TbFq_dT`_ zr#r=ixBm)D87LG=8O)e5n}ziep7_t-Gi%CZmY+2bOKA)}^1N-tC5rNigiI0^NOzLl zA3wo8+<@293QiWkzaQm8T!a7R5xgS@5ziyz`S|!)+9VM&Y41t0b>n)rY~4;Q6vEUR zUxWc$IGL$%*2T%@SX2}v)zb~OeT>1m4sNoO8F7noVU69_OD>h9P{X;UalF1Hx&AcY zD~*#&r^z)plI?0_QE`Nrc=&z2BOV1*G#X83GMU&&MFCwjh=OP*R_`u;h$9;d?vj^hXf4d`3#T<*2SaA_7IXA*}*Du91^LhEDmw0h=FU_qZzS=$c5+bICN#(HSo>h!1 z?jfu{;?8^SXZlnKje$OndQvnTg6UHf_2Hvi%vB{@@Do5~IIOWg5olVxSe|7e;ySoquNCx-B>kTyn`|CRHvS z5*9`gfYA>DV0%Jdem>>p7P+iYQc{X#M8;&JZqxzj&%*BAja+%nh~UW%`uoDjepCWacrlpWm?@i{ijL;af?;_TH|7~=d;NN8S-o01pMF~QtX?h4O;gH13P9>Xo?Ea$x;Ac<-M8H) zKQc|J0I3D}aOFyAfAmpVJ9DO71M=Esmr47RPs&4c=gMDeEuYOgKQDUr?>UXYHpYo+^@SLB7oi=`eU#z1OtHpsgxR!GMaPsnZ4 zrb+Qv`u|tqurxpXupIvNujTt%OZWsEBVS`d8kic5QfOJkMEKpk_ww{ zhi1>?=Cx~i;of_R_Vp2W95&o{A2&bp2uaW5{GuXme(pJ9m6g1=W({sz8<#)z6gSk> zQ4;j85U89vlhBu6GOfHEbBHM^U{W|tfl`!~lrYgSPRK5e;e3EL4BTWAFPY>M-)Hmo z?YM8hO?g=v_4)anV;Ed<>#ayn4-G3# zj!G$V!QkQ|UAkLS90N}U*h z;WWSx-YH?iWV09|_<eV=9WgL9w8SY!NhJ&8R6@`U3ot>Pqd^tbKWXP|t zC%0h(OrAV2KoRC&eKpSh{TNG@uxs~jrk;5w38e-*V~T)M_#%TgtO3g~5TypgpdKa+ ztD_pEH8Moz(U57lE`|uovQXcULmZX}X#m5($mMwGjyrfim!k| zYae)k+Uja9T(V@~FauziCPpa4;XQjOoivHM+FCNH6sBno4%YBIlx2bA41jSgON*ft zp4Jor(}Fg;gOHa!3WRAATDXw()~$n~dJrfP%xTjQ%OV?S(*N27e86*Elx5*ZA~cDx z4cG;A1+i5`Fye8thQVh*hh?E65mY!lFayyjMm)}8+vctH>zV)4pE9ku7-bkFfJs0| zWB>@Qu{@87Kp1E~aDeC~mrzhx$hlf``~3NAeDOsdSh|#w06ZIbcg-3;U$u&ZAAa~X z6KG4P`Q(?s2rQRZ&g zz=CI=C1RQ<1VDvCp|ow=gNq>xm}?kZS5rgEws~gXKK2Iy0OSKp^72?bbt(s%n|Y(X zovKiXAI_OWTSo^U9XiCk$&)E9F6PxedpK;{oL5ppO=Tq?H#E?g$?(0IGbt-5AmcbF z-zOG{(Ae3@ZyFkC^L=I+23OCU2O^k}2ycJ#39qJ7vKhqxJfO@2#K>D|nv`%KRbq6G1zf;2t{5k)XZ=^>QcD0L!w{j^m6$I`ZVW zPM;GL8JpAcmK7o%kKy}1$z&g6b!vZ1G@!V!kXS5=<2Z=#QBhGfb|x?u8eoM(xUNHG zrNxZu1RWiR$V()?{TiUuz)B6WEI4O6hg%{z{$$R-;1UusbMTvQZB8(j7a>|Sk+W;Y zktis}-q}H0cMCmz4waR0G7>{b(c7Nd?E6{9-%ft@O)ZV?e{v>NoYS)%3B8DCsNCfP&G40BfPbXskPhPU_8+n4@!M*-7R zbZqZn$F|p*GC9k{iX_{%{0?czp^ec$A)ySzNc+A&YD_R1voQQHws$;1wG0c Date: Sat, 3 Nov 2018 02:35:22 +0100 Subject: [PATCH 5/6] Generic path --- src/pam_panic_config/applications/pampanic-config.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pam_panic_config/applications/pampanic-config.desktop b/src/pam_panic_config/applications/pampanic-config.desktop index 7bd38ae..0493db1 100644 --- a/src/pam_panic_config/applications/pampanic-config.desktop +++ b/src/pam_panic_config/applications/pampanic-config.desktop @@ -18,7 +18,7 @@ Keywords[es]=PAM;seguridad;contraseña;autenticación;usb; Keywords[jp]=PAM;セキュリティ;パスワード;認証;USB; Exec=sudo pam_panic_config TryExec=pam_panic_config -Icon=/usr/share/icons/hicolor/scalable/apps/pampanic.svg +Icon=pampanic Terminal=true Categories=Settings;Security;ConsoleOnly; StartupNotify=false From bf5c12131f13c6d87fd3b836e550d3f924138dc0 Mon Sep 17 00:00:00 2001 From: Bandie Date: Sat, 3 Nov 2018 02:57:43 +0100 Subject: [PATCH 6/6] 48x48 --- configure.ac | 1 + src/pam_panic_config/Makefile.am | 2 +- src/pam_panic_config/icons/48x48/Makefile.am | 2 ++ src/pam_panic_config/icons/48x48/pampanic.png | Bin 0 -> 2272 bytes 4 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 src/pam_panic_config/icons/48x48/Makefile.am create mode 100644 src/pam_panic_config/icons/48x48/pampanic.png diff --git a/configure.ac b/configure.ac index 1572df8..2af0092 100644 --- a/configure.ac +++ b/configure.ac @@ -77,6 +77,7 @@ AC_CONFIG_FILES([ src/pam_panic_pw/man/Makefile src/pam_panic_config/Makefile src/pam_panic_config/applications/Makefile + src/pam_panic_config/icons/48x48/Makefile src/pam_panic_config/icons/64x64/Makefile src/pam_panic_config/icons/scalable/Makefile test/Makefile diff --git a/src/pam_panic_config/Makefile.am b/src/pam_panic_config/Makefile.am index b928997..0fa7216 100644 --- a/src/pam_panic_config/Makefile.am +++ b/src/pam_panic_config/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = applications icons/64x64 icons/scalable +SUBDIRS = applications icons/48x48 icons/64x64 icons/scalable bin_SCRIPTS = pam_panic_config %: %.prebuild diff --git a/src/pam_panic_config/icons/48x48/Makefile.am b/src/pam_panic_config/icons/48x48/Makefile.am new file mode 100644 index 0000000..9fe0d3e --- /dev/null +++ b/src/pam_panic_config/icons/48x48/Makefile.am @@ -0,0 +1,2 @@ +appicondir=$(datadir)/icons/hicolor/48x48/apps +appicon_DATA=pampanic.png diff --git a/src/pam_panic_config/icons/48x48/pampanic.png b/src/pam_panic_config/icons/48x48/pampanic.png new file mode 100644 index 0000000000000000000000000000000000000000..ba5c1d0a1b44296ef3dce93a8a4f04abfc4b1a88 GIT binary patch literal 2272 zcmV<62p{)}P)sS-?-nq|H(j9& z9Z(2>c;LFDK94b!q}^2dw+@;b8lw~_J^ep9I{=JxOPF!<5_|y**K-NCws4~UAGm}4 z80X|u@U81Ge15t=s>Y4H(aYu>vI| zJeYUU1QW%D!wr&TaDSUntg*ToU z9$yfMe2)7;~(ftV)3NK}YxJ;j%&BhJC zWzWZZDas1s;+!oD2+pyi474An=KU(XL<~d_H$~flMxxyz+V<}y5$hw-b%d6~O~iYT zG1W3j9NfkBTsXgU8hxJ}9O93$I zkWFU~h-6?R(=^A%#Aj%x4|!lkp?uo7Qkv=?l(mn~k*vU%yT=F{B*jCp9;2=es#;S@68ussJ z|MBB2n>UZvjt;uRVHTB_ljZZFlp>l+v8kbf)_9y{MMZpL_H2@=6u+;nWv>V>upk&@ z*_BuFT75nBi3DC+pF5{ap?u~{UaYGlbSe}0e7+GP%LCc9W{o6YdrjUdDUreIYH3`% zR<6}FS!!9*yJ?d+AAc;zD=THG-!JzCgVOQD6Vm(av$9^-CHnHqQvcXva;vV(+9^|H zaN|Z9+_+JGQdlV0>$*HXb*k8njk0I?av7|tk@_c}lna!S0LZ%e^Cj`d8?tuJ9I-~} z^U+gJN&MAUWwEY{b_yap$pU)XC6dj}RCRS>zVs5;FIvQPfdCaZ-NfXnQ`vFXU0n6b zEBt8bQfjtrp{1#bzRpg*yKo_?P>3wQpFOTiS5FU*w6&o$jjg@CoB&=}v4T`p6)(R2 zI(B6xGxGCE4s(ZXv<#DN(ann6sMyD<1~b;@daP?qERG~pb(fob0*sK=>#2z z`Ilc#Z)GJ_&CT>yR&w>+xfBDs&qwm;QO;YkgpS?2Nk$@gKoqb&56AOHl+@yJ?7lwQ zfj>fpU5B*tYE%rmsT9idPRqF3=q#iF5kVOS_doOyvz9I67f(OU4%;Rb ziI7`X#vQlc&N;JY;dFPS1G7s@xnbo>Iu9J+uOEDXZQCPj4ISIulWeYrPEklYfaUX| z3|tq_vQE;+F$_cm=iezM1aL)=REn22Y@ni|g7t?E(G7@FL|R&Sb@OHh+S@_b(Eu|y zm$scdF#-W*1Oga-KYBVlSW02&I>zurL@%hbK-c-6-%nwB?_>S_=w)RL4h)Qd z@_@nMQ2+pr9X!a<+FFt#r(|+n)3i07=jp>}a>8Ny<8l7b)I@lc*^7NX_8mUVhiz?` zj>FO8$N8wa8Gk_m?^ajyepeUMrcI-E`*xgIj3u|+!ii*(-o8F&l$O%i+Ddgt2g#i~ znLc+eU7--G*R5l(=ivd9b)D%KU(A+<2L5T=Bm0)*6{FoKd228+VEd5J$Kl*eZw)8Zpk#SSn2s5kVwxZ-Djo8*`s2>pWY)j zN}tmLn2^`&l96*>n%M&ZOf$0&pc#7~C@9EB(=;Y!TV!WXnpgn*em{{&KgGoXN@wO% zT$DR;0GO7+xy4giym&rwcQUq@M literal 0 HcmV?d00001