From 621b5011939a6c00dc1cfbaa4f773baf17b2db15 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Wed, 18 Sep 2013 14:16:47 +0200 Subject: [PATCH] Bump to esr verison 24.0 and add addons --- CLIENT_DATA/setup32.ins | 2 + Firefox-Setup-17.0.8esr.exe.sha1sum | 1 - Firefox-Setup-24.0esr.exe.sha1sum | 1 + builder-product.cfg | 56 ++++++++++++++++++- builder-targets-cb.sh | 31 ++++++++++ fastdial@telega.phpnet.us.xpi.sha1sum | 1 + firefox@ghostery.com.xpi.sha1sum | 1 + vlc-plugin@videolan.org.xpi.sha1sum | 1 + ...6-728f-4b20-ad56-37578a4de76b}.xpi.sha1sum | 1 + ...4-1EED-42ca-A505-6D2F1A935BBB}.xpi.sha1sum | 1 + ...A-01E4-46a7-B6B1-EDAB7D6AD389}.xpi.sha1sum | 1 + ...f-112c-4500-a7ea-39801a327e5f}.xpi.sha1sum | 1 + ...8-f5b5-c8b4-a8b2-2b9879e08c5d}.xpi.sha1sum | 1 + ...b-f2ed-450b-b12d-ee082ba24781}.xpi.sha1sum | 1 + 14 files changed, 98 insertions(+), 2 deletions(-) delete mode 100644 Firefox-Setup-17.0.8esr.exe.sha1sum create mode 100644 Firefox-Setup-24.0esr.exe.sha1sum create mode 100644 fastdial@telega.phpnet.us.xpi.sha1sum create mode 100644 firefox@ghostery.com.xpi.sha1sum create mode 100644 vlc-plugin@videolan.org.xpi.sha1sum create mode 100644 {1018e4d6-728f-4b20-ad56-37578a4de76b}.xpi.sha1sum create mode 100644 {1BC9BA34-1EED-42ca-A505-6D2F1A935BBB}.xpi.sha1sum create mode 100644 {D4DD63FA-01E4-46a7-B6B1-EDAB7D6AD389}.xpi.sha1sum create mode 100644 {a7c6cf7f-112c-4500-a7ea-39801a327e5f}.xpi.sha1sum create mode 100644 {d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d}.xpi.sha1sum create mode 100644 {e4a8a97b-f2ed-450b-b12d-ee082ba24781}.xpi.sha1sum diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins index d07fb81..b71d175 100644 --- a/CLIENT_DATA/setup32.ins +++ b/CLIENT_DATA/setup32.ins @@ -129,6 +129,8 @@ REG ADD HKLM\SOFTWARE\Mozilla\MaintenanceService /v Attempted /t REG_DWORD /d 1 copy "$IniCfgFile$" "$InstallDir$" copy "%ScriptPath%\*.cfg" "$InstallDir$" copy "%ScriptPath%\local-settings.js" "$InstallDir$\defaults\pref" +copy -s "%ScriptPath%\X86\Addons\bundles\*.*" "$InstallDir$\distribution\bundles" +copy -s "%ScriptPath%\X86\Addons\extensions\*.*" "$InstallDir$\extensions" [Registry_install] ; Example of setting some values of an registry key: diff --git a/Firefox-Setup-17.0.8esr.exe.sha1sum b/Firefox-Setup-17.0.8esr.exe.sha1sum deleted file mode 100644 index 8d05167..0000000 --- a/Firefox-Setup-17.0.8esr.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -4a08874eaed087ba3ae8b7031aac28f5f27e1714 /home/mario/.opsi-dist-cache/mozilla.firefox-17.0.8/X86/Firefox-Setup-17.0.8esr.exe diff --git a/Firefox-Setup-24.0esr.exe.sha1sum b/Firefox-Setup-24.0esr.exe.sha1sum new file mode 100644 index 0000000..9007065 --- /dev/null +++ b/Firefox-Setup-24.0esr.exe.sha1sum @@ -0,0 +1 @@ +53e90a52d46194316f6dd424b602dd39e878d50b /home/mario/.opsi-dist-cache/mozilla.firefox-24.0/X86/Firefox-Setup-24.0esr.exe diff --git a/builder-product.cfg b/builder-product.cfg index f51095f..2064b72 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -5,7 +5,7 @@ VENDOR="mozilla.org" PN="mozilla.firefox" NAME="Mozilla Firefox" DESCRIPTION="Mozilla Firefox ist ein freier Webbrowser des Mozilla-Projekts. " -VERSION="17.0.8" +VERSION="24.0" RELEASE="1" PRIORITY="0" ADVICE="" @@ -23,6 +23,60 @@ DL_SOURCE[1]="ftp://ftp.mozilla.org/pub/firefox/releases/${VERSION}esr/win32/de/ DL_ARCH[1]="X86" DL_WINST_NAME[1]=InstallExe +DL_FILE[2]="vlc-plugin@videolan.org.xpi" +DL_SOURCE[2]="http://download.videolan.org/pub/videolan/vlc/last/win32/vlc-2.0.8.xpi" +DL_ARCH[2]="X86" +DL_EXTRACT_TO[2]="Addons/bundles" +DL_WINST_NAME[2]=VideolanClientXpi + +DL_FILE[3]="{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d}.xpi" +DL_SOURCE[3]="https://addons.mozilla.org/firefox/downloads/latest/1865/addon-1865-latest.xpi" +DL_ARCH[3]="X86" +DL_EXTRACT_TO[3]="Addons/bundles" +DL_WINST_NAME[3]=AdblockPlusXpi + +DL_FILE[4]="firefox@ghostery.com.xpi" +DL_SOURCE[4]="https://addons.mozilla.org/firefox/downloads/latest/9609/addon-9609-latest.xpi" +DL_ARCH[4]="X86" +DL_EXTRACT_TO[4]="Addons/bundles" +DL_WINST_NAME[4]=GhosteryXpi + +DL_FILE[5]="fastdial@telega.phpnet.us.xpi" +DL_SOURCE[5]="http://www.userlogos.org/files/fastdial-4.12-fx.xpi" +DL_ARCH[5]="X86" +DL_EXTRACT_TO[5]="Addons/bundles" +DL_WINST_NAME[5]=FastDialXpi + +DL_FILE[6]="{a7c6cf7f-112c-4500-a7ea-39801a327e5f}.xpi" +DL_SOURCE[6]="https://addons.mozilla.org/firefox/downloads/latest/684/addon-684-latest.xpi" +DL_ARCH[6]="X86" +DL_EXTRACT_TO[6]="Addons/bundles" +DL_WINST_NAME[6]=FireFtpXpi + +DL_FILE[7]="{1018e4d6-728f-4b20-ad56-37578a4de76b}.xpi" +DL_SOURCE[7]="https://addons.mozilla.org/firefox/downloads/latest/5791/addon-5791-latest.xpi" +DL_ARCH[7]="X86" +DL_EXTRACT_TO[7]="Addons/bundles" +DL_WINST_NAME[7]=FlagFoxXpi + +DL_FILE[8]="{1BC9BA34-1EED-42ca-A505-6D2F1A935BBB}.xpi" +DL_SOURCE[8]="https://addons.mozilla.org/firefox/downloads/latest/92382/platform:5/addon-92382-latest.xpi" +DL_ARCH[8]="X86" +DL_EXTRACT_TO[8]="Addons/bundles" +DL_WINST_NAME[8]=IeTabV2Xpi + +DL_FILE[9]="{D4DD63FA-01E4-46a7-B6B1-EDAB7D6AD389}.xpi" +DL_SOURCE[9]="https://addons.mozilla.org/firefox/downloads/latest/26/addon-26-latest.xpi" +DL_ARCH[9]="X86" +DL_EXTRACT_TO[9]="Addons/extensions" +DL_WINST_NAME[9]=DownloadStatusBarXpi + +DL_FILE[10]="{e4a8a97b-f2ed-450b-b12d-ee082ba24781}.xpi" +DL_SOURCE[10]="https://addons.mozilla.org/firefox/downloads/latest/748/addon-748-latest.xpi" +DL_ARCH[10]="X86" +DL_EXTRACT_TO[10]="Addons/extensions" +DL_WINST_NAME[10]=GreasmonkeyXpi + # File array index for the image showing while installing the program ICON_DL_INDEX=0 diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh index 9a3d4a8..0b2d32b 100644 --- a/builder-targets-cb.sh +++ b/builder-targets-cb.sh @@ -23,3 +23,34 @@ function cleanup() { echo "Cleanup" builder_cleanup } + +function create() { + echo "Create" + builder_create + + mkdir -p $INST_DIR/CLIENT_DATA/X86/Addons/bundles +# mv $INST_DIR/CLIENT_DATA/X86/Addons/bundles/*.xpi $INST_DIR/CLIENT_DATA/X86/Addons/bundles + + pushd $INST_DIR/CLIENT_DATA/X86/Addons/bundles + for file in `ls *.xpi` + do + dirname=`echo $file|sed 's/\.xpi$//g'` + mkdir $dirname + 7z x -o$INST_DIR/CLIENT_DATA/X86/Addons/bundles/$dirname $INST_DIR/CLIENT_DATA/X86/Addons/bundles/$file + done + popd + rm $INST_DIR/CLIENT_DATA/X86/Addons/bundles/*.xpi + + mkdir -p $INST_DIR/CLIENT_DATA/X86/Addons/extensions +# mv $INST_DIR/CLIENT_DATA/X86/Addons/extensions/*.xpi $INST_DIR/CLIENT_DATA/X86/Addons/extensions + + pushd $INST_DIR/CLIENT_DATA/X86/Addons/extensions + for file in `ls *.xpi` + do + dirname=`echo $file|sed 's/\.xpi$//g'` + mkdir $dirname + 7z x -o$INST_DIR/CLIENT_DATA/X86/Addons/extensions/$dirname $INST_DIR/CLIENT_DATA/X86/Addons/extensions/$file + done + popd + rm $INST_DIR/CLIENT_DATA/X86/Addons/extensions/*.xpi +} diff --git a/fastdial@telega.phpnet.us.xpi.sha1sum b/fastdial@telega.phpnet.us.xpi.sha1sum new file mode 100644 index 0000000..b858002 --- /dev/null +++ b/fastdial@telega.phpnet.us.xpi.sha1sum @@ -0,0 +1 @@ +c5a7a4cd6d71253840997d51f003693198490741 /home/mario/.opsi-dist-cache/mozilla.firefox-24.0/X86/fastdial@telega.phpnet.us.xpi diff --git a/firefox@ghostery.com.xpi.sha1sum b/firefox@ghostery.com.xpi.sha1sum new file mode 100644 index 0000000..102ae40 --- /dev/null +++ b/firefox@ghostery.com.xpi.sha1sum @@ -0,0 +1 @@ +b614520a76d1bf5e94fe589e230cb50e8471c48c /home/mario/.opsi-dist-cache/mozilla.firefox-24.0/X86/firefox@ghostery.com.xpi diff --git a/vlc-plugin@videolan.org.xpi.sha1sum b/vlc-plugin@videolan.org.xpi.sha1sum new file mode 100644 index 0000000..dcc29c5 --- /dev/null +++ b/vlc-plugin@videolan.org.xpi.sha1sum @@ -0,0 +1 @@ +8257423c43447e084247b29812482a444281a381 /home/mario/.opsi-dist-cache/mozilla.firefox-24.0/X86/vlc-plugin@videolan.org.xpi diff --git a/{1018e4d6-728f-4b20-ad56-37578a4de76b}.xpi.sha1sum b/{1018e4d6-728f-4b20-ad56-37578a4de76b}.xpi.sha1sum new file mode 100644 index 0000000..e76a18c --- /dev/null +++ b/{1018e4d6-728f-4b20-ad56-37578a4de76b}.xpi.sha1sum @@ -0,0 +1 @@ +a72c25985d926efef8a9e08cffd9bbe7cfbb8ec8 /home/mario/.opsi-dist-cache/mozilla.firefox-24.0/X86/{1018e4d6-728f-4b20-ad56-37578a4de76b}.xpi diff --git a/{1BC9BA34-1EED-42ca-A505-6D2F1A935BBB}.xpi.sha1sum b/{1BC9BA34-1EED-42ca-A505-6D2F1A935BBB}.xpi.sha1sum new file mode 100644 index 0000000..ac64b10 --- /dev/null +++ b/{1BC9BA34-1EED-42ca-A505-6D2F1A935BBB}.xpi.sha1sum @@ -0,0 +1 @@ +258c1b8acf7732b1c81784c0dd8bbe8c056e802e /home/mario/.opsi-dist-cache/mozilla.firefox-24.0/X86/{1BC9BA34-1EED-42ca-A505-6D2F1A935BBB}.xpi diff --git a/{D4DD63FA-01E4-46a7-B6B1-EDAB7D6AD389}.xpi.sha1sum b/{D4DD63FA-01E4-46a7-B6B1-EDAB7D6AD389}.xpi.sha1sum new file mode 100644 index 0000000..3a21b99 --- /dev/null +++ b/{D4DD63FA-01E4-46a7-B6B1-EDAB7D6AD389}.xpi.sha1sum @@ -0,0 +1 @@ +d1b2882ee51708e4c6fe9e28052baae9f7fc6a49 /home/mario/.opsi-dist-cache/mozilla.firefox-24.0/X86/{D4DD63FA-01E4-46a7-B6B1-EDAB7D6AD389}.xpi diff --git a/{a7c6cf7f-112c-4500-a7ea-39801a327e5f}.xpi.sha1sum b/{a7c6cf7f-112c-4500-a7ea-39801a327e5f}.xpi.sha1sum new file mode 100644 index 0000000..3929c7e --- /dev/null +++ b/{a7c6cf7f-112c-4500-a7ea-39801a327e5f}.xpi.sha1sum @@ -0,0 +1 @@ +7876e24511c23f371446cb83dd6aa336b8904bf5 /home/mario/.opsi-dist-cache/mozilla.firefox-24.0/X86/{a7c6cf7f-112c-4500-a7ea-39801a327e5f}.xpi diff --git a/{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d}.xpi.sha1sum b/{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d}.xpi.sha1sum new file mode 100644 index 0000000..173c7f1 --- /dev/null +++ b/{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d}.xpi.sha1sum @@ -0,0 +1 @@ +fcd8a52cc6111086d2f3d5ed5121fc7e3c60b63a /home/mario/.opsi-dist-cache/mozilla.firefox-24.0/X86/{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d}.xpi diff --git a/{e4a8a97b-f2ed-450b-b12d-ee082ba24781}.xpi.sha1sum b/{e4a8a97b-f2ed-450b-b12d-ee082ba24781}.xpi.sha1sum new file mode 100644 index 0000000..fc799bb --- /dev/null +++ b/{e4a8a97b-f2ed-450b-b12d-ee082ba24781}.xpi.sha1sum @@ -0,0 +1 @@ +b1e0adb94df5696eeb6170ef95ee3af1eba0260c /home/mario/.opsi-dist-cache/mozilla.firefox-24.0/X86/{e4a8a97b-f2ed-450b-b12d-ee082ba24781}.xpi