From cba27d354de2ad822bb93b12af539b20b6e1e7d2 Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Mon, 8 Feb 2021 21:10:34 +0300
Subject: [PATCH 1/6] macos deploy fixes

---
 deploy/PrivacyTechAppleCert.p12            | Bin 3342 -> 0 bytes
 deploy/PrivacyTechAppleCertDeveloperId.p12 | Bin 0 -> 3336 bytes
 deploy/PrivacyTechAppleCertInstallerId.p12 | Bin 0 -> 3332 bytes
 deploy/WWDRCA.cer                          | Bin 0 -> 1062 bytes
 deploy/build_macos.sh                      |  36 +++++++++++++++++----
 5 files changed, 29 insertions(+), 7 deletions(-)
 delete mode 100644 deploy/PrivacyTechAppleCert.p12
 create mode 100755 deploy/PrivacyTechAppleCertDeveloperId.p12
 create mode 100755 deploy/PrivacyTechAppleCertInstallerId.p12
 create mode 100644 deploy/WWDRCA.cer
 mode change 100644 => 100755 deploy/build_macos.sh

diff --git a/deploy/PrivacyTechAppleCert.p12 b/deploy/PrivacyTechAppleCert.p12
deleted file mode 100644
index f8b91957454e3a310079aa7adc24a7ae148d31be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3342
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

diff --git a/deploy/PrivacyTechAppleCertDeveloperId.p12 b/deploy/PrivacyTechAppleCertDeveloperId.p12
new file mode 100755
index 0000000000000000000000000000000000000000..a04ec85a02ac7e68cd42ccd951d286abb33fe7ae
GIT binary patch
literal 3336
zcmY*abyO4nyWYk&7^yH)I;0c^NDKo}x*H@U$0&(O4FzPN2oe$k(hbrvQcwvAi2;HG
zsUcHBIz&+5x9>go-tWDCyyrRZ^Stl#{_#2I^B`~xU=WZBfukRS!X%z)Jv(9mQUmjG
z^c`RveJh2=BXH2|e<f%>4oad>b08pq0#pAgKm<3G_P-tIflve^n5NHi#9u~!>Kp{3
z0X)G$%hx#p4n>D-OANfcsaQz=xNVoO?ngs#fT^~ZZ7@N~@!L&Bi>11UBWsBAg_{=+
zcG8=<gMn9>cZ2u5E9a<R8KCEK-?i7I+wt`o;F*8&G=dLYEqU_Z`Q0**!1L`#|G9FF
z+-PB*R=wDvmttS>4L@xuUJshSDEA%Rlr1yASOdaiX_Axq*jiF9V<1C;`?``NPs4g%
zcE?#>P8Gq9R|FE>NmO-imrS&hOUX@@qs*jAFn95>l3%6qZEQyb`E~gLhBJj8mnNhW
zUV(<zU?P7kasBeGxcY7A_rqT|`nekrm|Qw8IhmHB$dcSXxb}yxkH#uXCiUrWsA7uJ
z=klL_M<S(nN%E!e)H7eh3AD|=!IOJ8ghz!!8zU@jm7w2!%HRGvRTA=gN0UXalYhD#
zQ2w`fYGJ`>xuCXzVPG#mSHTBWFQNfhcIULK=U-Q#m7OyyrPH>vzh<u8^%Ycv+NM3$
zAHJ_w3XY0LR0_iMij|ZHJt{I|=AB+?=6(BJIRQIbIXl}_3LSfMq_-b&Te#Qub5S+s
z$ecsUFLJ+m!$`s_&{JVEzO78RZ7(VZ)XmcqvK2`#Q$)oJMQ!i326jx%uuBUQ0bO2}
znAsSD#Sf+y=eGn$S2)v^8cv>=7IgFU1O!z(^f;6}mA(zKDrGA;q`$ua^E}n;<s8;C
zDvZ0!m9~Xi?;G`yiY0vtL3?rc8b!v8%W1|9z07ZHuySmKlyQFercst8foCa7DnvC-
zEAmQRDQqQ*?sF2Nqb%}@2+my6X?KgcB3=`5CTkyjRTH%fMIPR2Y(5r!dMigP%W_Z{
zD{>CW9>^{o(#e&#@dNThC&32cRHSR;N*XjF)AT9ggDlwTr`ytU3SO#=$VRq_?!R_H
z*IQ48(z2uy$eChvD}3F-R>iGSFFr@01tH`=aYSP3E(XzW>d$T<K+mqi3d8g<&`Jm=
z4Y?Z8?LOZbNV2ww<Mw6d$Y4z!F3LJTuR9oCLUyku$>>+Fhx_}jr~K~hOUGS9M~`OL
zC3`&IaVC5%j`9MW@ZZf&3sY=MIQ^upcgG*qMCS1BA;;1u>aQg~g<l4!H5b*YSfmba
z|Fqjv&;{<c?U;P2v&y`sW9-Pr>l(r)!rUtlMM~Z;UJA32qbfE1!Kyn9UT#pikSeb}
zngI*$Lsc{roC*Vsu}%jN)#i|}4|UxscSFu%+Ge`Iv?b>n76$Omot470XS)8XtGVia
z@!4u;UTwDP<4YV)<J=Y{S}ZYfdgwc6QuQuT;#?RG<?S{GYXQz1d`<;e;pwq40b(M$
z7-D~6<L}b@(dJdWQq;2}CjfNScJzhH_8%6hjV-<Uid9GaE6gKV__3g7J={uXYBsfL
zw8AW&rs1QYt!K@3-hgbS!*(KvW1xeiu$qRGVS$txi5Id_gFi5i8!kv$1eET$orE9y
zIJgU1K^aRQ`<=MHoQYaVPr15t#y_WtUu0+{GqzA0?<{Ed^dEQ@-=D4iU0^L-+ow4g
z;1XmLRCAG-u0SO|EC#262%29iznNF-@S1VW294Z}5z|ZAGLN4e!MnTgKTy2}n2>cN
zKis~|L;JZmM>SpjG->jp!%5Mr&C`oBs?brb=kD~c1@cV252SX1PixvMCcdsd^OBiV
zV3KxD@%WAU!N+J)QWVOowl&z+Bat>6_`y~)IXl5@LTz=_4Iz(zL2tFGCsfHltY`6{
z>2S5`ng}m3#C~^OeJt`_WoVfum8@RgAl&#73=dx%i(T|fxWO?3gtn--JgV_588&ot
z-$H;f$#rWwi$NPOeShTiRswFbG-Bs@eb=$5#9@G!TFMH(BOoryAlKXT^UvZWt1AfY
zT@Jyrp76*5wALnPy~pX3Doc%wZ|Gdn-2k$Qi7ylRp&Hwk=d-}#&}e9|A(LX_r{}2w
zL0~l5N7yosFV-F@AZ{~#G8-gQo$4JnrCR%Yhnjh(_J$dW$=``TljGN(l;iP)YT|E2
z8$a#b<}5Xhna$^K{mPIsAu{_{nHXr-4N43Xivt5nT*J%Xf1AosyC?PK^X3<6Z`ED)
zR|eFZ{*F=>gV?N6WaVQ)k^L;tD%VZHxJh9BGh5P((Bs=}UD3Rxb0kssy32$~#)Ex~
zxywuzZz~&%^xcI=``2}tZBQ`a#W?f5%<|z~2yYkX>-KvLpl;EzfuNum_!(+kY<UHk
z{dGilT<hohH84T#UagqOnAcFyc$e0z*6-A66WPkNnN%-`DhgxPO75ju2ppvI{{&k;
z4pIZgK`JP8DWwXbbpI1`v_Mck4!niHf!F_E`ceIpelylbGi%|l@&BYB7zZ9Gns*3p
zEV9I~t9{g4NgTEZhDS=siceujX5u_U>>x?A=_MrN#-xcT+b#>t*pa{MVstN|@kJFZ
zW_d{~QD|0ir!r{SpIt-4q4+Nyx;89-d71m}lN-{eAFfv3xXfL>;PTh!Jb;7Np~!&h
z5Jkm$U0XGuw6fZIuu0Pr7S+{Lh3wz9VQRT|@xfMD{wM6$C~jtq^+E58-d|eU)+~MK
z-n>7;=(dSVx(+{%+EMdeR)m{R!O<eGRs;Sv^vIgt8^2RaXnZp>X*QWRC8*3Yd<WZj
z)4fprRt=8LZA&Xprk$mddN(G{4<H-?GDIqXKt??Vr(+N73pq~@+@^<>Ci~L?>Q@$j
zuDsT_GZ|Og-owbOpkCuOre_K0oQ(!KNa)n@IJ=n9uJUjd{ZO9Hz`MMAP@TsiFFBFP
z(tLtRR@Cm>x#<t<F^*QJynH2hd8&~IyI!Ai9}se8*3<ab&Ntj;4KuXd64+WV3u_{5
zQ?HV~_oWY9rb{I-liVv)dZ(0}kn-9*hm+(c9%$ZtU<ZtyAa^_WvA{aqh1Y}GW-TEW
z>zmIZsy{XW4Zh=9^^?&)gKlsQgkaK|78GAB>~KL`g%x!&CRCa86es=2C9JL3k2yGf
zj4O6MpZ<9<bK_mKX#z(12)iSw>%a28;v-X-;4e2>oHMHErk@pj@_@OsU0?YUV3?>C
zVKkK_;h{HtNc<%oR-IV3PrSI}59S$SD@xM|gUiVEti<JS#Z=W*P##<IE_|4j(AqJc
z`z#bO{>Xv-eA{1!Ex4B^1n{2ku0euFCL+PN{{EJoD*M!rC!MfEeulHgGeKkjgq`9n
zTR|UmlMufWWAO2stf4`N@z38X{TOa=gAA=hnW@+YQQpXGtz}HXscBo)qY6*zzAwaM
z0n`I^gy?&G8d30<r=o4DixsmzhpE@Z)U>&LdZZ9%BY$Yds@Iw(%iVw7Fm+#lLAZvY
z^DXnZj&qax6O+E4&*e@XoLuwYXTL9zv!5=`3DB<n5(?So?5S}zwzMRk#L9_R0hN;I
z?<JT3kY-`%(vy?R^MV^wmRt6jJKpc#Pxd_QXJrA4i)yJaRQyqDTzRq@o1@bCsC$8K
zweHP6?N9|Sx%0^toCQH$(jG=r@^FAOf|w84=b<LGj5A(BM};@nv3fbuNrh;47wUgG
zRKPV{a4b2(uJ1lhKKjc-Bl-XaC-69cS*KEZaVks&oc+}CZzP#tsC)eSY!BlQ*<xao
zsFrG3b!v06O4;V((_3OK*gVY=p{37Bs>m@DXGvbpzP)4h<=6`%$GZ~d8eKq$KKlZJ
z&Zkxg;1|!_B}2c>NgB=g-jd`JkU0NSuyqNW=Y1mD`Sw!oN4b6y=y`UTa;<WMwcp0^
z@j7pE|42BBXi-8B%-h>D;JpKti1)2R7q@;N+T<?qj3;kB=&6SIWv;eh@^;k5nlKlp
z<!Bo~&azFh_^(}L&z{2W8Q_%BwNORA8;S!~t3EmGw?;BxUP#L;x8<4jKQ<E=mj^Pg
zks*H?w5g-s9N&6(U3(_u`p;E%b60E|pxc$}eA=qKI}FJqnsb70w=;d2>L2;n(OH>A
zz95}3KV8Eo?xXXay@-@{GsH7}wPW5ynTUJ@_J6-e7+l7S*8`vra0EC5_yKAF6d;gN
zUH~6}F9k6aPMgB=15_!!FNJrf%sB%5Dd+?61}IY$Bg&LJW$PaYETuQ2>^TG6D5}qY
z`JgE(3h<Dk7y`@@LjRs-m0<(J=air<wcr8Ze40FdQs50ox<RQ80)Y@fz@QLGMk){&
p1OSFFLf6+%N51spxdy9DzD9=>U$9LD(>%67@VO<STtPtKe*n-oCCdN+

literal 0
HcmV?d00001

diff --git a/deploy/PrivacyTechAppleCertInstallerId.p12 b/deploy/PrivacyTechAppleCertInstallerId.p12
new file mode 100755
index 0000000000000000000000000000000000000000..ee9a34e90fe147cc7dfcea3115d27ce767408306
GIT binary patch
literal 3332
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

literal 0
HcmV?d00001

diff --git a/deploy/WWDRCA.cer b/deploy/WWDRCA.cer
new file mode 100644
index 0000000000000000000000000000000000000000..d2bb1da64122c864c872d9b711b176d042462748
GIT binary patch
literal 1062
zcmXqLVo@?^V&+=F%*4pV#KCxP&k@Vq1p)@VY@Awc9&O)w85vnw84QvPxeYkkm_u3E
zgqcEv4TTK^K^!h&F2{m`oKywRyktE?H3JopAh)nAM9?|4s3bEjGdZy&Ge1wkv9u&3
zzbLb$(ooDm1f-5xm=~fhC_leM!P(J3PMp`!*ucoZ+{n<x!o)mEoYx4MYtT3iyCZmz
z9id~O1$G3FGQ{xk{Gyzc^30S}1((#a)SUc+)FOqT)EuyziVa;1oWM@uu_i*b0uB!u
zG%+e6hZiF&19KB2KLb#li>Zl`k>Qj@$g<O6t4^p`dc5p;_a=Tvz1qY*Cc#zbYLXig
z%TwZ(vMX=1{1>1r8WvHYTX!VypjWG%{)c-lQVYXRuCJE(pY=;r$WxR<a?PsST1IcD
zC1(VQ+V*t4*`F;j^#Su5#@gwu>F4-br<!NI<=nO|{cK>${9`c}_k`!An>Li0EopDe
zv*^E}E$UaTdLwGTU-QA<OOvlk6>d$KGuPNJ^ruh+PumVL-h)reU3&vOc4_NAnbP|3
z#gVzkGL~*w{3pGxU>8%Qce&F<%bj1(KJ<Biz}ll{*;B>Xzgbzkmy4MuTza<lvzzA0
z7l*rFRvySoOc&ks;qTLoJxTF-=V#u1FP;2vQtE0ZW=00a#f{4h8W$VL0>fLDk420{
zq(fbtbLBRPgzh)5cYSk@JQ@_Tc)I~VNLrYY@jnZz0W**?kOv7Uvq%_-HHc_m$aJ4l
z#`*6{cCVhpvhVJ`^&D{qdLRYzEb0cT2FeQ*7s$8CW|Wi^Sn2C07v<<Bf>Nhma(=FU
z5ipVI0fh|sK<fEHHn0Gbe4Bv)8y7gCC#SG6F|sfL(>iL>2Sz0$ga7&Wk^6MMZpzW`
ze<$2-^n%rNMP7I9$xNP|H^ujq>s(2H^mkUSRb<TlX2!jn)@dacZCro$u&Y7;;%44+
zvhG_xPVQP<GJDD48Aa{ZcI#caCxz@Z+C4!cIGf8)VB1aEfE>jJu1>%3p6qBF+hu?6
zedkq{<@Qo*x8F5!lFt%JA<5kEuT>H4)frt++IqZRKk^h=we)T%!^(BLy$#kqT(EJE
zX2Ubi@~8Vu7BQZxzw?Oene~p{Z+0b3{mh!|*mRcPTGnUklH03)o}Bv9|B3H&wV91C
z_x#+Vd5N(q?V(=JH^r`_KPnzJuG@ck!rYZ>Kd=95AvG=CKqhc$%$vflrY$-AJfiXd
D2`7-6

literal 0
HcmV?d00001

diff --git a/deploy/build_macos.sh b/deploy/build_macos.sh
old mode 100644
new mode 100755
index ecd31833..2671a517
--- a/deploy/build_macos.sh
+++ b/deploy/build_macos.sh
@@ -29,15 +29,9 @@ QMAKE_STASH_FILE=$PROJECT_DIR/.qmake_stash
 TARGET_FILENAME=$PROJECT_DIR/$APP_NAME.dmg
 
 # Seacrh Qt
-echo "Brew Qt version $(brew --prefix qt)"
-
-
-#if [ -f $(brew --prefix qt)/clang_64/bin/qmake ]; then QT_BIN_DIR=$(brew --prefix qt)/clang_64/bin;
-#else QT_BIN_DIR=$HOME/Qt/5.14.2/clang_64/bin; fi
+if [ -z "${QT_VERSION+x}" ]; then export QT_VERSION=5.14.2; fi
 
 QT_BIN_DIR=$HOME/Qt/$QT_VERSION/clang_64/bin
-
-#QIF_BIN_DIR=$HOME/Qt/Tools/QtInstallerFramework/4.0/bin
 QIF_BIN_DIR=$QT_BIN_DIR/../../../Tools/QtInstallerFramework/4.0/bin
 
 echo "Using Qt in $QT_BIN_DIR"
@@ -73,6 +67,30 @@ $QT_BIN_DIR/macdeployqt $OUT_APP_DIR/$APP_FILENAME -always-overwrite
 cp -av $RELEASE_DIR/service/server/$APP_NAME-service.app/Contents/macOS/$APP_NAME-service $BUNDLE_DIR/Contents/macOS
 cp -Rv $PROJECT_DIR/deploy/data/macos/* $BUNDLE_DIR/Contents/macOS
 
+if [ "${MAC_CERT_PW+x}" ]; then
+
+CERTIFICATE_P12=$SCRIPT_DIR/PrivacyTechAppleCertDeveloperId.p12
+WWDRCA=$SCRIPT_DIR/WWDRCA.cer
+KEYCHAIN=build.keychain
+TEMP_PASS=tmp_pass
+
+if [ -z "$(security list-keychains | grep $KEYCHAIN)" ]; then
+security create-keychain -p $TEMP_PASS $KEYCHAIN
+security list-keychains
+security default-keychain -s $KEYCHAIN
+security unlock-keychain -p $TEMP_PASS $KEYCHAIN
+security import $WWDRCA -k $KEYCHAIN -T /usr/bin/codesign
+security import $CERTIFICATE_P12 -k $KEYCHAIN -P $MAC_CERT_PW -T /usr/bin/codesign
+fi
+
+security find-identity -p codesigning
+
+codesign --deep --force --verbose -o runtime --sign "Developer ID Application: Privacy Technologies OU (X7UJ388FXK)" $BUNDLE_DIR
+codesign --verify -vvvv $BUNDLE_DIR
+spctl -a -vvvv $BUNDLE_DIR
+
+fi
+
 
 mkdir -p $INSTALLER_DATA_DIR
 cp -av $PROJECT_DIR/deploy/installer $RELEASE_DIR
@@ -90,5 +108,9 @@ cd $RELEASE_DIR/installer
 $QIF_BIN_DIR/binarycreator --offline-only -v -c config/macos.xml -p packages -f $APP_NAME
 hdiutil create -volname $APP_NAME -srcfolder $APP_NAME.app -ov -format UDZO $TARGET_FILENAME
 
+if [ "${MAC_CERT_PW+x}" ]; then
+codesign --deep --force --verbose --sign "Developer ID Application: Privacy Technologies OU (X7UJ388FXK)" $TARGET_FILENAME
+#xcrun altool --notarize-app -f $TARGET_FILENAME -t osx --primary-bundle-id $APP_DOMAIN
+fi
 
 echo "Finished, artifact is $PROJECT_DIR/$APP_NAME.dmg"

From 2aa9f9cca96f1329715085f232bedf226d305219 Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Mon, 8 Feb 2021 12:42:48 -0800
Subject: [PATCH 2/6] macos build fix

---
 .travis.yml           | 12 ++----------
 deploy/build_macos.sh | 29 ++++++++++++++++++-----------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 67618ffb..e25f6362 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,15 +14,7 @@ jobs:
       
       env:
         - QT_VERSION=5.15.1
-        
-      before_install:
-        - export CERTIFICATE_P12=deploy/PrivacyTechAppleCert.p12
-        - export KEYCHAIN=build.keychain
-        - security create-keychain -p $MAC_CERT_PW $KEYCHAIN
-        - security default-keychain -s $KEYCHAIN
-        - security unlock-keychain -p $MAC_CERT_PW $KEYCHAIN
-        - security import $CERTIFICATE_P12 -k $KEYCHAIN -P $MAC_CERT_PW -T /usr/bin/codesign
-  
+         
       script:
         - |
           if [ ! -f $HOME/Qt/$QT_VERSION/clang_64/bin/qmake ]; then \
@@ -93,4 +85,4 @@ cache:
   directories:
     - $HOME/Qt
     - /C/Qt
-    - $HOME/Library/Caches/Homebrew
\ No newline at end of file
+    - $HOME/Library/Caches/Homebrew
diff --git a/deploy/build_macos.sh b/deploy/build_macos.sh
index 2671a517..ad6a2053 100755
--- a/deploy/build_macos.sh
+++ b/deploy/build_macos.sh
@@ -71,23 +71,25 @@ if [ "${MAC_CERT_PW+x}" ]; then
 
 CERTIFICATE_P12=$SCRIPT_DIR/PrivacyTechAppleCertDeveloperId.p12
 WWDRCA=$SCRIPT_DIR/WWDRCA.cer
-KEYCHAIN=build.keychain
+KEYCHAIN=amnezia.build.keychain
 TEMP_PASS=tmp_pass
 
-if [ -z "$(security list-keychains | grep $KEYCHAIN)" ]; then
-security create-keychain -p $TEMP_PASS $KEYCHAIN
-security list-keychains
+security create-keychain -p $TEMP_PASS $KEYCHAIN || true
 security default-keychain -s $KEYCHAIN
 security unlock-keychain -p $TEMP_PASS $KEYCHAIN
-security import $WWDRCA -k $KEYCHAIN -T /usr/bin/codesign
-security import $CERTIFICATE_P12 -k $KEYCHAIN -P $MAC_CERT_PW -T /usr/bin/codesign
-fi
 
+security default-keychain
+security list-keychains
+
+security import $WWDRCA -k $KEYCHAIN -T /usr/bin/codesign || true
+security import $CERTIFICATE_P12 -k $KEYCHAIN -P $MAC_CERT_PW -T /usr/bin/codesign || true
+
+security set-key-partition-list -S apple-tool:,apple: -k $TEMP_PASS $KEYCHAIN
 security find-identity -p codesigning
 
-codesign --deep --force --verbose -o runtime --sign "Developer ID Application: Privacy Technologies OU (X7UJ388FXK)" $BUNDLE_DIR
-codesign --verify -vvvv $BUNDLE_DIR
-spctl -a -vvvv $BUNDLE_DIR
+/usr/bin/codesign --deep --force --verbose --timestamp -o runtime --sign "Developer ID Application: Privacy Technologies OU (X7UJ388FXK)" $BUNDLE_DIR
+/usr/bin/codesign --verify -vvvv $BUNDLE_DIR || true
+spctl -a -vvvv $BUNDLE_DIR || true
 
 fi
 
@@ -109,8 +111,13 @@ $QIF_BIN_DIR/binarycreator --offline-only -v -c config/macos.xml -p packages -f
 hdiutil create -volname $APP_NAME -srcfolder $APP_NAME.app -ov -format UDZO $TARGET_FILENAME
 
 if [ "${MAC_CERT_PW+x}" ]; then
-codesign --deep --force --verbose --sign "Developer ID Application: Privacy Technologies OU (X7UJ388FXK)" $TARGET_FILENAME
+/usr/bin/codesign --deep --force --verbose --timestamp -o runtime --sign "Developer ID Application: Privacy Technologies OU (X7UJ388FXK)" $TARGET_FILENAME
+/usr/bin/codesign --verify -vvvv $TARGET_FILENAME || true
+spctl -a -vvvv $TARGET_FILENAME || true
 #xcrun altool --notarize-app -f $TARGET_FILENAME -t osx --primary-bundle-id $APP_DOMAIN
 fi
 
 echo "Finished, artifact is $PROJECT_DIR/$APP_NAME.dmg"
+
+# restore keychain
+security default-keychain -s login.keychain

From 447410a27acab3e184f9a3b961231dc44652ca0a Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Mon, 8 Feb 2021 23:57:35 +0300
Subject: [PATCH 3/6] Macos build fix (#6)

macos deploy fixes
---
 .travis.yml                                |  12 +-----
 deploy/PrivacyTechAppleCert.p12            | Bin 3342 -> 0 bytes
 deploy/PrivacyTechAppleCertDeveloperId.p12 | Bin 0 -> 3336 bytes
 deploy/PrivacyTechAppleCertInstallerId.p12 | Bin 0 -> 3332 bytes
 deploy/WWDRCA.cer                          | Bin 0 -> 1062 bytes
 deploy/build_macos.sh                      |  43 +++++++++++++++++----
 6 files changed, 38 insertions(+), 17 deletions(-)
 delete mode 100644 deploy/PrivacyTechAppleCert.p12
 create mode 100755 deploy/PrivacyTechAppleCertDeveloperId.p12
 create mode 100755 deploy/PrivacyTechAppleCertInstallerId.p12
 create mode 100644 deploy/WWDRCA.cer
 mode change 100644 => 100755 deploy/build_macos.sh

diff --git a/.travis.yml b/.travis.yml
index 67618ffb..e25f6362 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,15 +14,7 @@ jobs:
       
       env:
         - QT_VERSION=5.15.1
-        
-      before_install:
-        - export CERTIFICATE_P12=deploy/PrivacyTechAppleCert.p12
-        - export KEYCHAIN=build.keychain
-        - security create-keychain -p $MAC_CERT_PW $KEYCHAIN
-        - security default-keychain -s $KEYCHAIN
-        - security unlock-keychain -p $MAC_CERT_PW $KEYCHAIN
-        - security import $CERTIFICATE_P12 -k $KEYCHAIN -P $MAC_CERT_PW -T /usr/bin/codesign
-  
+         
       script:
         - |
           if [ ! -f $HOME/Qt/$QT_VERSION/clang_64/bin/qmake ]; then \
@@ -93,4 +85,4 @@ cache:
   directories:
     - $HOME/Qt
     - /C/Qt
-    - $HOME/Library/Caches/Homebrew
\ No newline at end of file
+    - $HOME/Library/Caches/Homebrew
diff --git a/deploy/PrivacyTechAppleCert.p12 b/deploy/PrivacyTechAppleCert.p12
deleted file mode 100644
index f8b91957454e3a310079aa7adc24a7ae148d31be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3342
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

diff --git a/deploy/PrivacyTechAppleCertDeveloperId.p12 b/deploy/PrivacyTechAppleCertDeveloperId.p12
new file mode 100755
index 0000000000000000000000000000000000000000..a04ec85a02ac7e68cd42ccd951d286abb33fe7ae
GIT binary patch
literal 3336
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

literal 0
HcmV?d00001

diff --git a/deploy/PrivacyTechAppleCertInstallerId.p12 b/deploy/PrivacyTechAppleCertInstallerId.p12
new file mode 100755
index 0000000000000000000000000000000000000000..ee9a34e90fe147cc7dfcea3115d27ce767408306
GIT binary patch
literal 3332
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

literal 0
HcmV?d00001

diff --git a/deploy/WWDRCA.cer b/deploy/WWDRCA.cer
new file mode 100644
index 0000000000000000000000000000000000000000..d2bb1da64122c864c872d9b711b176d042462748
GIT binary patch
literal 1062
zcmXqLVo@?^V&+=F%*4pV#KCxP&k@Vq1p)@VY@Awc9&O)w85vnw84QvPxeYkkm_u3E
zgqcEv4TTK^K^!h&F2{m`oKywRyktE?H3JopAh)nAM9?|4s3bEjGdZy&Ge1wkv9u&3
zzbLb$(ooDm1f-5xm=~fhC_leM!P(J3PMp`!*ucoZ+{n<x!o)mEoYx4MYtT3iyCZmz
z9id~O1$G3FGQ{xk{Gyzc^30S}1((#a)SUc+)FOqT)EuyziVa;1oWM@uu_i*b0uB!u
zG%+e6hZiF&19KB2KLb#li>Zl`k>Qj@$g<O6t4^p`dc5p;_a=Tvz1qY*Cc#zbYLXig
z%TwZ(vMX=1{1>1r8WvHYTX!VypjWG%{)c-lQVYXRuCJE(pY=;r$WxR<a?PsST1IcD
zC1(VQ+V*t4*`F;j^#Su5#@gwu>F4-br<!NI<=nO|{cK>${9`c}_k`!An>Li0EopDe
zv*^E}E$UaTdLwGTU-QA<OOvlk6>d$KGuPNJ^ruh+PumVL-h)reU3&vOc4_NAnbP|3
z#gVzkGL~*w{3pGxU>8%Qce&F<%bj1(KJ<Biz}ll{*;B>Xzgbzkmy4MuTza<lvzzA0
z7l*rFRvySoOc&ks;qTLoJxTF-=V#u1FP;2vQtE0ZW=00a#f{4h8W$VL0>fLDk420{
zq(fbtbLBRPgzh)5cYSk@JQ@_Tc)I~VNLrYY@jnZz0W**?kOv7Uvq%_-HHc_m$aJ4l
z#`*6{cCVhpvhVJ`^&D{qdLRYzEb0cT2FeQ*7s$8CW|Wi^Sn2C07v<<Bf>Nhma(=FU
z5ipVI0fh|sK<fEHHn0Gbe4Bv)8y7gCC#SG6F|sfL(>iL>2Sz0$ga7&Wk^6MMZpzW`
ze<$2-^n%rNMP7I9$xNP|H^ujq>s(2H^mkUSRb<TlX2!jn)@dacZCro$u&Y7;;%44+
zvhG_xPVQP<GJDD48Aa{ZcI#caCxz@Z+C4!cIGf8)VB1aEfE>jJu1>%3p6qBF+hu?6
zedkq{<@Qo*x8F5!lFt%JA<5kEuT>H4)frt++IqZRKk^h=we)T%!^(BLy$#kqT(EJE
zX2Ubi@~8Vu7BQZxzw?Oene~p{Z+0b3{mh!|*mRcPTGnUklH03)o}Bv9|B3H&wV91C
z_x#+Vd5N(q?V(=JH^r`_KPnzJuG@ck!rYZ>Kd=95AvG=CKqhc$%$vflrY$-AJfiXd
D2`7-6

literal 0
HcmV?d00001

diff --git a/deploy/build_macos.sh b/deploy/build_macos.sh
old mode 100644
new mode 100755
index ecd31833..ad6a2053
--- a/deploy/build_macos.sh
+++ b/deploy/build_macos.sh
@@ -29,15 +29,9 @@ QMAKE_STASH_FILE=$PROJECT_DIR/.qmake_stash
 TARGET_FILENAME=$PROJECT_DIR/$APP_NAME.dmg
 
 # Seacrh Qt
-echo "Brew Qt version $(brew --prefix qt)"
-
-
-#if [ -f $(brew --prefix qt)/clang_64/bin/qmake ]; then QT_BIN_DIR=$(brew --prefix qt)/clang_64/bin;
-#else QT_BIN_DIR=$HOME/Qt/5.14.2/clang_64/bin; fi
+if [ -z "${QT_VERSION+x}" ]; then export QT_VERSION=5.14.2; fi
 
 QT_BIN_DIR=$HOME/Qt/$QT_VERSION/clang_64/bin
-
-#QIF_BIN_DIR=$HOME/Qt/Tools/QtInstallerFramework/4.0/bin
 QIF_BIN_DIR=$QT_BIN_DIR/../../../Tools/QtInstallerFramework/4.0/bin
 
 echo "Using Qt in $QT_BIN_DIR"
@@ -73,6 +67,32 @@ $QT_BIN_DIR/macdeployqt $OUT_APP_DIR/$APP_FILENAME -always-overwrite
 cp -av $RELEASE_DIR/service/server/$APP_NAME-service.app/Contents/macOS/$APP_NAME-service $BUNDLE_DIR/Contents/macOS
 cp -Rv $PROJECT_DIR/deploy/data/macos/* $BUNDLE_DIR/Contents/macOS
 
+if [ "${MAC_CERT_PW+x}" ]; then
+
+CERTIFICATE_P12=$SCRIPT_DIR/PrivacyTechAppleCertDeveloperId.p12
+WWDRCA=$SCRIPT_DIR/WWDRCA.cer
+KEYCHAIN=amnezia.build.keychain
+TEMP_PASS=tmp_pass
+
+security create-keychain -p $TEMP_PASS $KEYCHAIN || true
+security default-keychain -s $KEYCHAIN
+security unlock-keychain -p $TEMP_PASS $KEYCHAIN
+
+security default-keychain
+security list-keychains
+
+security import $WWDRCA -k $KEYCHAIN -T /usr/bin/codesign || true
+security import $CERTIFICATE_P12 -k $KEYCHAIN -P $MAC_CERT_PW -T /usr/bin/codesign || true
+
+security set-key-partition-list -S apple-tool:,apple: -k $TEMP_PASS $KEYCHAIN
+security find-identity -p codesigning
+
+/usr/bin/codesign --deep --force --verbose --timestamp -o runtime --sign "Developer ID Application: Privacy Technologies OU (X7UJ388FXK)" $BUNDLE_DIR
+/usr/bin/codesign --verify -vvvv $BUNDLE_DIR || true
+spctl -a -vvvv $BUNDLE_DIR || true
+
+fi
+
 
 mkdir -p $INSTALLER_DATA_DIR
 cp -av $PROJECT_DIR/deploy/installer $RELEASE_DIR
@@ -90,5 +110,14 @@ cd $RELEASE_DIR/installer
 $QIF_BIN_DIR/binarycreator --offline-only -v -c config/macos.xml -p packages -f $APP_NAME
 hdiutil create -volname $APP_NAME -srcfolder $APP_NAME.app -ov -format UDZO $TARGET_FILENAME
 
+if [ "${MAC_CERT_PW+x}" ]; then
+/usr/bin/codesign --deep --force --verbose --timestamp -o runtime --sign "Developer ID Application: Privacy Technologies OU (X7UJ388FXK)" $TARGET_FILENAME
+/usr/bin/codesign --verify -vvvv $TARGET_FILENAME || true
+spctl -a -vvvv $TARGET_FILENAME || true
+#xcrun altool --notarize-app -f $TARGET_FILENAME -t osx --primary-bundle-id $APP_DOMAIN
+fi
 
 echo "Finished, artifact is $PROJECT_DIR/$APP_NAME.dmg"
+
+# restore keychain
+security default-keychain -s login.keychain

From 5f7ef3134510a43b315ad0dd3b157205fb263d61 Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Tue, 9 Feb 2021 00:33:26 +0300
Subject: [PATCH 4/6] win cert updated

---
 deploy/PrivacyTechWindowsCert.pfx | Bin 7939 -> 7864 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/deploy/PrivacyTechWindowsCert.pfx b/deploy/PrivacyTechWindowsCert.pfx
index 60e139fc51afc208f30d5f1628af03e1dbab05b0..0eb043c475bfd7976d74f851add61de065a5944b 100644
GIT binary patch
delta 1440
zcmV;R1z-AuKDa%9FoGVm0s#Xsf*x=N2`Yw2hW8Bt2LYgh9$^H69$hek9$7Gg1_lNR
zDuzgg_YDCD0ic2f_XL6k^Du%1?=XS|>jn!dhDe6@4FL=a0Ro_c1okk31oAK(1_~;M
zNQU<f0So~HFb)I=;{r~9*I~)`0s;rn1cC(6i&3^B%hRua-+DP<39AZblKcr4<y!KU
z!|`k)h{fiV;=cJS=GwtY^$}V~IIjEh-OhY7n)!X0F|jl4SjnTypy)$<;+r=}qquw`
z7-Sng0Zrw&ve_mbQys_Kbb+xQ=*;LP#TWnky*Y^jXiYX>XpcZGJr?ePgB#DDHbL%Y
zc&N48H603nQJ=jGlJstBeZm9(Hw5!&vh*qwF3%aKwkEYT$6Y;|>U45oXb_gUuE<2l
zWo%KB1G1hUS)t$y>>qTVf`n7u1^UzeW;*nn7lbaS^U_{5RJ{?*m0JvfL<qK&eOBFL
zNIN)2F8YS-e$K(z`~!;rnGb~uY5m=EUy7aue)nB}OxU<!ktOUnao;IB3>m&1`_b>g
zR$9avTCH*6^{}{USWA<|&`|a&?tn*Ycv>+1-_@s*UMTiQ*X&o>c*76A|BD|73Me&l
z8R9p1c~gba0BoUTx(sAU4Tfbec{Bdo%ZpF}mSC%hKdas3-;`9Ld6nfX1e#wOEz{XX
zT18cV1eMyZA4Vt-mZCtF7s$AhiBdI?MUAd;Bziwr1%QRAvjy^G12jf=Xw{AifY>^7
zd5Q*aJH>2O&FVsr`9TrmN;*exEYulH%G5Opt|hZ{Y{U&Hv*8rdNUE9mD`md5b6L<e
zp3S1vzSVP?Rl&@ib)$j=)tP8T&V?czj;?NhZAE?#y8pn_d3;_-j6g%@eCndalnsK?
zoJlUB9mQ+_XbJ$RbX`B>jqFAyskpWy-bcq6OW3X^OvQG6@G+5vf^(5ghaaThM;`wy
zXFEe+y6)FdWq_Kuh^$!7$N)Qg<t-SFz1iExAC5Na_@;xqY~=CLe5>!Nh9;}zmyv*f
zt`MHYvBgtgV(Jh)ts9v?GG0bGv$8Z2*w}=rBK%@D)<ASJfe@57Ad9WX46MXH1o(9V
zcCAO&b^QVJpGDoTeGGF}#=7z>a!9=-3#qfj-^5f6hRN+P8uM6bm<5@AGdsgaHz)74
ztTXc*ovHY$3C}&0W~u)Xl($Xn0$A05hk#XkAKRE4nYWIA==Wf6A5FO`P-?(rKo8n5
zrwerG>;`7Y+*!p$mEpd<#%1mj2sp`JMa7vI(sYnwLgasM{kz+ghVHQYR!SKUvMm!J
z6E1VwfurXB+#5iY>{LLY2V)2&ja76JKya5jRDWtBIGe1^-y;$EcNT5rKE#-RG6~Pc
z8+%j$9=s7YFBQbYntQ?3rc_t#MAu6r_MP|`v%)LpCo$#uSb17Hj>KkoUm?f69v_X+
zYETJF?6Q|GIkQHn4dhjP<Ex7_G%PlQF6A|-EL{{Fil12?o37=`V+(cJl$#)VeOi=B
zx8kOlU#Kx0a+y<6S~QzAPv0(oH9%!O79-{IR^zPPfrrc}9*Q4xYSFD6c;X|{J=0|%
z^KEJNKNuRor`03FZh$R5K004+_MmpByUa0v$>LF-I@RR7K2sbFOks0y@^#FO8WUY=
zL^$8Z?Tdega+`mnN6x^nkJ6}s#0_y#WHa=46Yr6vlHggzLAnt1lB|?fPGU)UxOyn-
z(nGaX$_m&h1bh;B4RRS<cdmm#uC)&In1?r_Gfho#HzTK;qr$P_SQ3~LCRo>ko2ZB!
zgj6oXM^@sL?wYQmNKQTa5LQE+k5Dmz;gb*y7PFiM8yP%1Fdr}n1_dh)0|FWZ6oJ;U
ugOB>TrUsWR(bRN1nyh%EJOmU7A|kE%W4930#tZY9W;MF(Lf}LK0te8vjiS8(

delta 1509
zcmV<B1seLeJ%c`fFoGWc0s#Xsf*z{|2`Yw2hW8Bt2LYgh9-IV%9+)tK9+WVG20;c1
zDuzgg_YDCD0ic2gG6aGKE--=yDlmcuCI$;ChDe6@4FL=a0Ro_c1u-y!1uZaF1_>&L
zNQU<f0R;^(N-!w~2`Yw2hW8Bt1q?781PBh!q}ddI5cL9o0te7A3<d})hDe6@4FU-T
z05BZ}31Egu0c8UO0V)I#`Vv<vEx`RH_VlOg|9^kn1cC(6aU=9duE;FUqL0f@-)BRN
z(ISo&YR-IRw;k=5D9vY*#k{61*As8eyAF<^`M~<83Aj0?c$YMKLuxa<uPX+m!~Zop
z*=?lP;X{3YnHnbw5QpeZPz7<RtfR;OsSS$HCopbQ$a^^(3ym6jm!cIfn2;sgr0U>_
zyMvQuwA6>tM4gS0L$DLBN1bqRY8hx}ZtMy_KsZ6pe4-C<ow6CtY@yj5hb8nFx7iDe
z^4V<~JQr2E2&yhs5yar<RY@gmqxI7Mi>C>-0WK_mZ*pnzldlP`u^e}6rcr8gh3rL(
z`WHQWQTfeWSkX6kVof&PD`AnUMis7)UMvadlUtpL%xPyKE%+V-AHI`5@Vv%FJmmD@
z%aKvv#@g#II-KSh{of13?^l~Pq-uxZ%f|$l&x*JlISI7cXo-!Vol5?dp7|koc6E&Q
zzD#+43T|A~{N=A1`~S0pcvMm`G;SK;PkfD`VM5UKSmp0yE#psXD5M`~jGSWchYE>Z
z3n0-jQ985}27nqsmqoHy!Ff+6HR8aaFj~V-+t9jBghB@*X<|D2e)y53WD4%o3zcHF
z55;VZHFDsEQ4tw&JSdxW9;O%CWtDz7W-QZxDeRGm0ggI032|{c1dPWy@2{knH<f7&
zj#aRZX$omdhf~#@BYQi^JJm5Oq^6pDwF0*|+!LoOq{e$kVR;J-I}9ia-%rUop}egB
zl&Ianlhumd0m0SAY+yk{8}BWct+lt0FnqAG2nVEJ0Wxp83lyRz8y>VkQ`$&Z9g*vQ
zPxUC+qjP_MidbtOqI0m{Vj>t;eb%OD$)&C{mP#9Ad4)7nQr5h`Sr^RUKwsk(Rmh2r
zL)dhd<5T`r{S`LH4g&s=-=d<Sd=MOe<IZMdcV90gv<vJkv8e2*ptyez+#SEN&Pdc|
zU(~;-Bhg4lT!#=(K-Q}B^L8-Z#pyDCu-=J$to~M&JnDs%&i;=(759#JdiI~my?)Dl
z2xe%7x&KW)Dh%pW9jV*ex!rnpW0)8{b$&W|SoknFz2527aV0o+e<orC4O3Jg-5}PP
z0oXn{JsWvfA)pT_;=UO7x2+2%36mi4QB~LQT%uYOoaVIdglRO;ka1eJ$F8$~e+Yc_
z7r$^4WL&p%1yI{j`eRa5+)Mwl_qTB|cC$oSRm9(Q#}4H_{JSyn4`obAa7}&SND_Pn
zSVG<0Fv}3o(Ei#Crh~=vv&&6<CUx0a^mixiywAAl&PCr4zACU7&>uPZ)0D8?EWyWu
zO9MjQQFAw8niS!NMD~ompw|?C*%&TyLZ`JPwHCTqL_9nzcQ_cSO<%cs-M*O55hX-)
zJ-R!fs0Mc9jf))2fe$FuFqZqpZV4vt{!a#5znUM!(tnr_ZyXm1vK*)*v4)X(B(q-+
zhM=6Z*v@C2ODv2K4PC|PNQ2faBH5Pb<tHq0in=>c+l3ajQ^H#m9=vvcW?ukyQ9h?<
z-cjvj_C+FH#c$H^bO6}@yXw4|hxeH@fJX2k3u6Do69muHqtQ$GCryC%U+>B&I0rg4
z;ox@z=@A)RCc-dHA#WP;xzSV^5|RSrJKXO^!-h4_fDn<`AC#EeWdngG*anfTnzW*k
zyn67srbOKn`2VABTz|U`+!jz8i^VOjWl8Vqs`j%;1vD8<OE51m3kC^bhDZTr0|WvA
z1RzlIFBW1;I(9Mk>!g2~9H6(Do?_9Z_h;qp%@&imi|GUugTZv6KiL^$mM83Ka3{Lu
LIAhC>0s;rn@qM`1


From c15b57e690d9957ccbb0949d644a44b092ce9b24 Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Wed, 10 Feb 2021 00:07:12 +0300
Subject: [PATCH 5/6] windows travis fix

---
 deploy/build_windows.bat | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/deploy/build_windows.bat b/deploy/build_windows.bat
index 9d938f5e..8ee3e74f 100644
--- a/deploy/build_windows.bat
+++ b/deploy/build_windows.bat
@@ -44,6 +44,12 @@ echo "PRO_FILE_PATH: 		%PRO_FILE_PATH%"
 echo "QMAKE_STASH_FILE: 		%QMAKE_STASH_FILE%"
 echo "TARGET_FILENAME: 		%TARGET_FILENAME%"
 
+rem Signing staff
+powershell Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Scope LocalMachine
+powershell Get-ExecutionPolicy -List
+
+powershell Import-PfxCertificate -FilePath %SCRIPT_DIR:"=%\PrivacyTechWindowsCert.pfx -CertStoreLocation Cert:\LocalMachine\My -Password $(ConvertTo-SecureString -String $Env:WIN_CERT_PW -AsPlainText -Force)
+
 echo "Cleanup..."
 Rmdir /Q /S %RELEASE_DIR%
 Del %QMAKE_STASH_FILE%
@@ -59,7 +65,6 @@ cd %PROJECT_DIR%
 cd %WORK_DIR%
 set CL=/MP
 nmake /A /NOLOGO
-break
 nmake clean
 rem if not exist "%OUT_APP_DIR:"=%\%APP_FILENAME:"=%" break
 
@@ -70,11 +75,11 @@ copy "%WORK_DIR:"=%\platform\post-uninstall\release\post-uninstall.exe"	%OUT_APP
 
 echo "Signing exe"
 cd %OUT_APP_DIR%
-signtool sign /f "%SCRIPT_DIR:"=%\PrivacyTechWindowsCert.pfx" /p %WIN_CERT_PW% /fd sha256 /tr http://timestamp.comodoca.com/?td=sha256 /td sha256 *.exe
+signtool sign /v /sm /s My /n "Privacy Technologies OU" /fd sha256 /tr http://timestamp.comodoca.com/?td=sha256 /td sha256 *.exe
  
 "%QT_BIN_DIR:"=%\windeployqt" --release --force --no-translations "%OUT_APP_DIR:"=%\%APP_FILENAME:"=%"
-signtool sign /f "%SCRIPT_DIR:"=%\PrivacyTechWindowsCert.pfx" /p %WIN_CERT_PW% /fd sha256 /tr http://timestamp.comodoca.com/?td=sha256 /td sha256 *.dll
 
+signtool sign /v /sm /s My /n "Privacy Technologies OU" /fd sha256 /tr http://timestamp.comodoca.com/?td=sha256 /td sha256 *.dll
 
 echo "Copying deploy data..."
 xcopy %DEPLOY_DATA_DIR% 											%OUT_APP_DIR%  /s /e /y /i /f
@@ -96,7 +101,7 @@ echo "Creating installer..."
 "%QIF_BIN_DIR:"=%\binarycreator" --offline-only -v -c config\windows.xml -p packages -f %TARGET_FILENAME%
 
 cd %PROJECT_DIR%
-signtool sign /f "%SCRIPT_DIR:"=%\PrivacyTechWindowsCert.pfx" /p %WIN_CERT_PW% /fd sha256 /tr http://timestamp.comodoca.com/?td=sha256 /td sha256 %TARGET_FILENAME%
+signtool sign /v /sm /s My /n "Privacy Technologies OU" /fd sha256 /tr http://timestamp.comodoca.com/?td=sha256 /td sha256 %TARGET_FILENAME%
 
 echo "Finished, see %TARGET_FILENAME%"
 exit 0
\ No newline at end of file

From f50eea3eaf11f6d825d0c3a9b71a496ad40416a0 Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Wed, 10 Feb 2021 06:57:26 -0800
Subject: [PATCH 6/6] macos signing fixes

---
 .gitignore            |  1 +
 .travis.yml           |  2 +-
 deploy/build_macos.sh | 55 +++++++++++++++++++++++--------------------
 3 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/.gitignore b/.gitignore
index e48347c2..6e68831a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,7 @@ CMakeLists.txt.user*
 .DS_Store
 ._.DS_Store
 ._*
+*.dmg
 
 # tmp files
 *.*~
diff --git a/.travis.yml b/.travis.yml
index e25f6362..9088cde6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,7 @@ jobs:
         token: $GH_TOKEN
         skip_cleanup: true
         file:
-        - "AmneziaVPN.dmg"
+        - "AmneziaVPN_unsigned.dmg"
         on:
           tags: true
           branch: master
diff --git a/deploy/build_macos.sh b/deploy/build_macos.sh
index ad6a2053..2acbb2a3 100755
--- a/deploy/build_macos.sh
+++ b/deploy/build_macos.sh
@@ -5,31 +5,30 @@ set -o errexit -o nounset
 
 # Hold on to current directory
 PROJECT_DIR=$(pwd)
-SCRIPT_DIR=$PROJECT_DIR/deploy
+DEPLOY_DIR=$PROJECT_DIR/deploy
 
-mkdir -p $SCRIPT_DIR/build
-WORK_DIR=$SCRIPT_DIR/build
+mkdir -p $DEPLOY_DIR/build
+BUILD_DIR=$DEPLOY_DIR/build
 
 echo "Project dir: ${PROJECT_DIR}" 
-echo "Build dir: ${WORK_DIR}" 
+echo "Build dir: ${BUILD_DIR}"
 
 APP_NAME=AmneziaVPN
 APP_FILENAME=$APP_NAME.app
 APP_DOMAIN=org.amneziavpn.package
 PLIST_NAME=$APP_NAME.plist
 
-RELEASE_DIR=$WORK_DIR
-OUT_APP_DIR=$RELEASE_DIR/client
+OUT_APP_DIR=$BUILD_DIR/client
 BUNDLE_DIR=$OUT_APP_DIR/$APP_FILENAME
 DEPLOY_DATA_DIR=$PROJECT_DIR/deploy/data/macos
-INSTALLER_DATA_DIR=$RELEASE_DIR/installer/packages/$APP_DOMAIN/data
+INSTALLER_DATA_DIR=$BUILD_DIR/installer/packages/$APP_DOMAIN/data
 
 PRO_FILE_PATH=$PROJECT_DIR/$APP_NAME.pro
 QMAKE_STASH_FILE=$PROJECT_DIR/.qmake_stash
-TARGET_FILENAME=$PROJECT_DIR/$APP_NAME.dmg
+DMG_FILENAME=$PROJECT_DIR/${APP_NAME}_unsigned.dmg
 
 # Seacrh Qt
-if [ -z "${QT_VERSION+x}" ]; then export QT_VERSION=5.14.2; fi
+if [ -z "${QT_VERSION+x}" ]; then export QT_VERSION=5.15.2; fi
 
 QT_BIN_DIR=$HOME/Qt/$QT_VERSION/clang_64/bin
 QIF_BIN_DIR=$QT_BIN_DIR/../../../Tools/QtInstallerFramework/4.0/bin
@@ -37,8 +36,6 @@ QIF_BIN_DIR=$QT_BIN_DIR/../../../Tools/QtInstallerFramework/4.0/bin
 echo "Using Qt in $QT_BIN_DIR"
 echo "Using QIF in $QIF_BIN_DIR"
 
-ls -al $QT_BIN_DIR/../../..
-
 
 # Checking env
 $QT_BIN_DIR/qmake -v
@@ -47,7 +44,7 @@ clang -v
 
 # Build App
 echo "Building App..."
-cd $WORK_DIR
+cd $BUILD_DIR
 
 $QT_BIN_DIR/qmake $PROJECT_DIR/AmneziaVPN.pro 'CONFIG+=release CONFIG+=x86_64'
 make -j `sysctl -n hw.ncpu`
@@ -61,16 +58,16 @@ echo "____________________________________"
 # Package 
 echo "Packaging ..."
 
-#cd $SCRIPT_DIR
+#cd $DEPLOY_DIR
 
 $QT_BIN_DIR/macdeployqt $OUT_APP_DIR/$APP_FILENAME -always-overwrite
-cp -av $RELEASE_DIR/service/server/$APP_NAME-service.app/Contents/macOS/$APP_NAME-service $BUNDLE_DIR/Contents/macOS
+cp -av $BUILD_DIR/service/server/$APP_NAME-service.app/Contents/macOS/$APP_NAME-service $BUNDLE_DIR/Contents/macOS
 cp -Rv $PROJECT_DIR/deploy/data/macos/* $BUNDLE_DIR/Contents/macOS
 
 if [ "${MAC_CERT_PW+x}" ]; then
 
-CERTIFICATE_P12=$SCRIPT_DIR/PrivacyTechAppleCertDeveloperId.p12
-WWDRCA=$SCRIPT_DIR/WWDRCA.cer
+CERTIFICATE_P12=$DEPLOY_DIR/PrivacyTechAppleCertDeveloperId.p12
+WWDRCA=$DEPLOY_DIR/WWDRCA.cer
 KEYCHAIN=amnezia.build.keychain
 TEMP_PASS=tmp_pass
 
@@ -95,7 +92,7 @@ fi
 
 
 mkdir -p $INSTALLER_DATA_DIR
-cp -av $PROJECT_DIR/deploy/installer $RELEASE_DIR
+cp -av $PROJECT_DIR/deploy/installer $BUILD_DIR
 cp -av $DEPLOY_DATA_DIR/post_install.sh $INSTALLER_DATA_DIR/post_install.sh
 cp -av $DEPLOY_DATA_DIR/post_uninstall.sh $INSTALLER_DATA_DIR/post_uninstall.sh
 cp -av $DEPLOY_DATA_DIR/$PLIST_NAME $INSTALLER_DATA_DIR/$PLIST_NAME
@@ -106,18 +103,24 @@ chmod a+x $INSTALLER_DATA_DIR/post_install.sh $INSTALLER_DATA_DIR/post_uninstall
 cd $BUNDLE_DIR 
 tar czf $INSTALLER_DATA_DIR/$APP_NAME.tar.gz ./
 
-cd $RELEASE_DIR/installer
-$QIF_BIN_DIR/binarycreator --offline-only -v -c config/macos.xml -p packages -f $APP_NAME
-hdiutil create -volname $APP_NAME -srcfolder $APP_NAME.app -ov -format UDZO $TARGET_FILENAME
-
+cd $BUILD_DIR/installer
+$QIF_BIN_DIR/binarycreator --offline-only -v -c config/macos.xml -p packages -f $APP_FILENAME
 if [ "${MAC_CERT_PW+x}" ]; then
-/usr/bin/codesign --deep --force --verbose --timestamp -o runtime --sign "Developer ID Application: Privacy Technologies OU (X7UJ388FXK)" $TARGET_FILENAME
-/usr/bin/codesign --verify -vvvv $TARGET_FILENAME || true
-spctl -a -vvvv $TARGET_FILENAME || true
-#xcrun altool --notarize-app -f $TARGET_FILENAME -t osx --primary-bundle-id $APP_DOMAIN
+/usr/bin/codesign --deep --force --verbose --timestamp -o runtime --sign "Developer ID Application: Privacy Technologies OU (X7UJ388FXK)" $APP_FILENAME
 fi
 
-echo "Finished, artifact is $PROJECT_DIR/$APP_NAME.dmg"
+hdiutil create -volname $APP_NAME -srcfolder $APP_NAME.app -ov -format UDZO $DMG_FILENAME
+
+if [ "${MAC_CERT_PW+x}" ]; then
+/usr/bin/codesign --deep --force --verbose --timestamp -o runtime --sign "Developer ID Application: Privacy Technologies OU (X7UJ388FXK)" $DMG_FILENAME
+/usr/bin/codesign --verify -vvvv $DMG_FILENAME || true
+spctl -a -vvvv $DMG_FILENAME || true
+#xcrun altool --notarize-app -f $DMG_FILENAME -t osx --primary-bundle-id $APP_DOMAIN -u $APPLE_DEV_EMAIL
+#xcrun stapler staple $DMG_FILENAME
+#xcrun stapler validate $DMG_FILENAME
+fi
+
+echo "Finished, artifact is $DMG_FILENAME"
 
 # restore keychain
 security default-keychain -s login.keychain