From f2f400649edabeafdef9e4782a4d327c3ec79a07 Mon Sep 17 00:00:00 2001 From: Valentin Vidic Date: Thu, 9 Feb 2012 14:07:11 +0100 Subject: [PATCH 01/16] Properly disable apt-listchanges. --- src/functions.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/functions.sh b/src/functions.sh index 83fc87d..f5a0859 100644 --- a/src/functions.sh +++ b/src/functions.sh @@ -787,14 +787,14 @@ apt_listchanges () { case $command in disable) if [ -f $file ]; then - dpkg-divert --local --rename --divert $file.$backup_ext \ + dpkg-divert --local --rename --divert $file.disabled \ --add $file || true fi ;; enable) - if [ -f $file.$backup_ext ]; then - dpkg-divert --remove $file || true + if [ -f $file.disabled ]; then + dpkg-divert --rename --remove $file || true fi ;; esac -- 1.7.10.4 From c114b9878b474e560c7b8bc0d4d91d68bf5e5fe1 Mon Sep 17 00:00:00 2001 From: Valentin Vidic Date: Thu, 9 Feb 2012 14:46:11 +0100 Subject: [PATCH 02/16] Remove desktop applications via xserver-xorg. --- src/actions/main.queue | 2 +- src/actions/post_upgrade.queue | 2 +- src/functions.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/actions/main.queue b/src/actions/main.queue index 12aea51..b4bd0e3 100644 --- a/src/actions/main.queue +++ b/src/actions/main.queue @@ -5,7 +5,7 @@ true hold_carnet_upgrade true install_keyrings # update current keys true check_upgrade true check_reboot -pkg x11-common remove_x +pkg xserver-xorg remove_x true remove_bloat true remove_cn_bloat true apt_listchanges disable diff --git a/src/actions/post_upgrade.queue b/src/actions/post_upgrade.queue index 1a0d520..0bda10b 100644 --- a/src/actions/post_upgrade.queue +++ b/src/actions/post_upgrade.queue @@ -6,7 +6,7 @@ # instalirao. To se mozda odnosi na ntp-cn, pa je za svaki slucaj dodan. true debconf_priority reset true add_group_proc # + restart oidentd ako treba -pkg x11-common remove_x +pkg xserver-xorg remove_x true install_new pkg kernel-2.6-cn dpkg-reconfigure kernel-2.6-cn # ovo bi trebalo biti predzadnje na popisu diff --git a/src/functions.sh b/src/functions.sh index f5a0859..deffe51 100644 --- a/src/functions.sh +++ b/src/functions.sh @@ -147,7 +147,7 @@ remove_x() { LC_MESSAGES=hr_HR dialog --backtitle "$title" --yesno "$msg_remove_x" 18 75 if [ $? -eq 0 ]; then log "Removing X Window System" - pkgrm x11-common + pkgrm xserver-xorg else log "Skipping X Window System removal" fi -- 1.7.10.4 From fb90ba1508784889f95c7795560c70d904bc60b9 Mon Sep 17 00:00:00 2001 From: Valentin Vidic Date: Mon, 13 Feb 2012 13:06:23 +0100 Subject: [PATCH 03/16] Always cleanup diversion. --- src/functions.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/functions.sh b/src/functions.sh index deffe51..f85117d 100644 --- a/src/functions.sh +++ b/src/functions.sh @@ -793,9 +793,8 @@ apt_listchanges () { ;; enable) - if [ -f $file.disabled ]; then - dpkg-divert --rename --remove $file || true - fi + # cleanup the diversion even if the file is already removed + dpkg-divert --rename --remove $file || true ;; esac done -- 1.7.10.4 From 225e91339e9f16cf7e96c3be59d41c3d2927d2f1 Mon Sep 17 00:00:00 2001 From: Valentin Vidic Date: Mon, 13 Feb 2012 13:07:13 +0100 Subject: [PATCH 04/16] Group removal of orphaned packages. --- src/functions.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/functions.sh b/src/functions.sh index f85117d..209d79a 100644 --- a/src/functions.sh +++ b/src/functions.sh @@ -828,15 +828,20 @@ is_orphaned () { # remove old and unused libraries remove_orphaned () { - local package + local package remove apt_autoremove + remove= for package in $orphaned_packages; do if is_orphaned $package; then - pkgrm $package + remove="$remove $package" fi done + + if [ "$remove" ]; then + pkgrm $remove + fi } # monit it causing problems for postinst scripts -- 1.7.10.4 From 64e85ad6e3b8caee10c29bd1de281e060513e165 Mon Sep 17 00:00:00 2001 From: Valentin Vidic Date: Mon, 13 Feb 2012 13:09:08 +0100 Subject: [PATCH 05/16] Handle upgrade for libpam-radius-auth. --- src/functions.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/functions.sh b/src/functions.sh index 209d79a..6beb99b 100644 --- a/src/functions.sh +++ b/src/functions.sh @@ -925,6 +925,8 @@ upgrade_amavis () { # handle freerdius upgrade upgrade_freeradius () { + local password + pkg freeradius-aai lt 2.1.10-1 || return 0 # aai team prevents a normal upgrade @@ -932,6 +934,20 @@ upgrade_freeradius () { pkgrm freeradius-aai freeradius-ldap freeradius rm -rf /etc/freeradius/certs pkgadd freeradius-aai + + # sync localhost passwords + if pkg libpam-radius-auth && [ -f "/etc/pam_radius_auth.conf" ]; then + pkgadd libpam-radius-auth + password=$( + sed -n '/^[[:space:]]*client[[:space:]]\+localhost/,/^[[:space:]]*}/ { /^[[:space:]]*secret[[:space:]]*=[[:space:]]*\([^[:space:]]*\)/s//\1/p }' /etc/freeradius/clients.conf + ) + if [ "$password" ] \ + && ! grep -q "^127.0.0.1[[:space:]]\+$password[[:space:]]\+" \ + /etc/pam_radius_auth.conf + then + sed -i.$backup_ext "s/^\(127.0.0.1[[:space:]]*\)[^[:space:]]*\(.*\)/\1$password\2/" /etc/pam_radius_auth.conf + fi + fi } # handle mysql 5.0 to 5.1 upgrade -- 1.7.10.4 From a15294f52fc01f32e55378ef8f3ef8973700e743 Mon Sep 17 00:00:00 2001 From: Valentin Vidic Date: Mon, 13 Feb 2012 13:10:42 +0100 Subject: [PATCH 06/16] Kernel and init script cleanup. --- src/actions/main.queue | 2 + src/functions.sh | 97 ++++++++++++++++++++++++++++++++++++++++++++++-- src/messages.sh | 21 +++++++++++ 3 files changed, 116 insertions(+), 4 deletions(-) diff --git a/src/actions/main.queue b/src/actions/main.queue index b4bd0e3..313bcf0 100644 --- a/src/actions/main.queue +++ b/src/actions/main.queue @@ -46,7 +46,9 @@ true remove_orphaned # ocisti stare libove nakon sto su cn paketi nadogradje # i ostatak true add_group_proc # za oidentd true enable_monit +true clean_old_kernels pkg kernel-2.6-cn dpkg-reconfigure kernel-2.6-cn +true clean_initd_packages true dpkg-reconfigure sysv-rc # ovo bi trebalo biti predzadnje na popisu # - izvrsi sve uvjetne post_upgrade akcije diff --git a/src/functions.sh b/src/functions.sh index 6beb99b..0fee7ca 100644 --- a/src/functions.sh +++ b/src/functions.sh @@ -1062,16 +1062,29 @@ check_archives_space() { fi } -check_kernel_space() { - local available_disk_space kernel_size linux_images metapkg pkg ret - available_disk_space=$(free_space /) +# calculate the list of linux-image packages from kernel-2.6-cn dependencies +get_cn_kernels() { + local cn_kernels linux_images metapkg pkg + + cn_kernels= linux_images=$(apt-cache show kernel-2.6-cn | grep ^Depends: \ | grep -o 'linux-image[^, ]*') for metapkg in $linux_images; do pkg=$(apt-cache show $metapkg | grep ^Depends: \ | grep -o 'linux-image[^, ]*' | head -1) - [ "$pkg" ] || continue + [ "$pkg" ] && cn_kernels="$cn_kernels $pkg" + done + + echo $cn_kernels +} +# check if there is enough space on / for the new kernel package +check_kernel_space() { + local available_disk_space kernel_size linux_images pkg ret + available_disk_space=$(free_space /) + + linux_images=$( get_cn_kernels ) + for pkg in $linux_images; do kernel_size=$(installed_size $pkg) ret=$? [ $ret -eq 0 ] && break @@ -1100,6 +1113,82 @@ check_kernel_space() { fi } +# free some space on / partition by cleaning old unused kernels +clean_old_kernels() { + local installed keep pkg keep remove delete name dialog_list selection + + # find all installed kernels + installed=$( + dpkg -l | egrep '^ii linux-image-[0-9]+[.][0-9]+[.][0-9]+-' \ + | awk '{print $2}' + ) + log "Found kernel packages: $installed" + + # leave current and new kernels + keep="linux-image-$(uname -r) $(get_cn_kernels)" + log "Keep kernel packages: $keep" + + # check what to remove + remove= + for pkg in $installed; do + delete=yes + for name in $keep; do + [ "$pkg" = "$name" ] && delete= + done + if [ "$delete" = yes ]; then + remove="$remove $pkg" + fi + done + log "Obsolete kernel packages: $remove" + + if [ "$remove" ]; then + for pkg in $remove; do + dialog_list="$dialog_list $pkg '' off" + done + + # user selects the packages to delete + selection=$( mktemp /var/lib/carnet-upgrade/selection.XXXXXX ) + eval LC_MESSAGES=hr_HR dialog --nocancel --backtitle \""$title"\" \ + --checklist \""$msg_remove_kernels"\" 20 75 6 $dialog_list 2>$selection + + selected=$( tr -d \" < $selection ) + rm -f $selection + + if [ "$selected" ]; then + log "Removing kernel packages: $selected" + pkgrm $selected + fi + fi +} + +# prevent sysv-rc migration problems +clean_initd_packages() { + local list removed pkg dialog_list selection selected + + list=$( dpkg -S /etc/init.d/\* | grep -v ^diversion | cut -d: -f1 | sort -u ) + removed=$( dpkg -l $list | sed -n 's/^r.[[:space:]]\+\([^[:space:]]\+\).*/\1/p' ) + log "Found removed packages: $removed" + + if [ "$removed" ]; then + for pkg in $removed; do + dialog_list="$dialog_list $pkg '' off" + done + + # user selects the packages to delete + selection=$( mktemp /var/lib/carnet-upgrade/selection.XXXXXX ) + eval LC_MESSAGES=hr_HR dialog --nocancel --backtitle \""$title"\" \ + --checklist \""$msg_remove_initd"\" 20 75 6 $dialog_list 2>$selection + + selected=$( tr -d \" < $selection ) + rm -f $selection + + if [ "$selected" ]; then + log "Purging packages: $selected" + dpkg -P $selected + fi + fi +} + free_space() { df --portability --block-size=1M "$1" | tail -1 | awk '{print $4}' } diff --git a/src/messages.sh b/src/messages.sh index 8e4bc8c..23ea728 100644 --- a/src/messages.sh +++ b/src/messages.sh @@ -45,6 +45,27 @@ neki od navedenih servisa ukljucite oznaku ispred imena odgovarajuceg paketa. Odaberite servise koje zelite UKLONITI: " +msg_remove_kernels="Da bi se izbjeglo zapunjenje / particije preporuca se brisanje starih \ +kernela. U ovom koraku nudi se mogucnost uklanjanja nekoristenih \ +kernel paketa sa vaseg posluzitelja. Ukoliko zelite ukloniti neki od \ +trenutno instaliranih kernela ukljucite oznaku ispred imena odgovarajuceg \ +paketa. + +Odaberite pakete koje zelite UKLONITI: +" + +msg_remove_initd="Nova inacica Debiana donosi mogucnost paralelnog pokretanja servisa \ +kod pokretanja posluzitelja. Da bi se proveo prijelaz na sustav paralelnog \ +pokretanja potrebno je obrisati nekoristene init skripte. Obicno \ +se radi o skriptama koje su ostale nakon nepotpunog brisanja paketa. \ +U ovom koraku nudi se mogucnost brisanja konfiguracija i init skripti \ +paketa koji su djelomicno obrisani. Ukoliko zelite ukloniti datoteke \ +preostale nakon brisanja paketa ukljucite oznaku ispred imena odgovarajuceg \ +paketa. + +Odaberite pakete cije konfiguracije i init skripte zelite UKLONITI: +" + msg_comment_force_overwrite="U vasem /etc/dpkg/dpkg.cfg je pronadjena opcija\ force-overwrite koja nije preporucljiva za uobicajen rad. Ukoliko\ zelite, odkomentirajte je nakon zavrsetka rada skripte." -- 1.7.10.4 From fcb98f921d1b1e4476aaa3d3c2699b95f7c4f231 Mon Sep 17 00:00:00 2001 From: Valentin Vidic Date: Mon, 13 Feb 2012 13:12:30 +0100 Subject: [PATCH 07/16] Release version 6.0.3. --- debian/changelog | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index 623237d..4504453 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +carnet-upgrade (6.0.3) stable; urgency=low + + * Cleanup dpkg available file. + * Properly disable apt-listchanges. + * Remove desktop applications via xserver-xorg. + * Always cleanup diversion. + * Group removal of orphaned packages. + * Handle upgrade for libpam-radius-auth. + * Kernel and init script cleanup. + + -- Valentin Vidic Mon, 13 Feb 2012 13:12:00 +0100 + carnet-upgrade (6.0.2) stable; urgency=low * Handle CN upgrade. -- 1.7.10.4 From 0ded29d74f100f20d8aab848d69eb17d9a68ee40 Mon Sep 17 00:00:00 2001 From: Valentin Vidic Date: Mon, 19 Mar 2012 15:51:39 +0100 Subject: [PATCH 08/16] Handle port number in pam_radius_auth.conf. --- src/functions.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/functions.sh b/src/functions.sh index 0fee7ca..ce861a3 100644 --- a/src/functions.sh +++ b/src/functions.sh @@ -942,10 +942,10 @@ upgrade_freeradius () { sed -n '/^[[:space:]]*client[[:space:]]\+localhost/,/^[[:space:]]*}/ { /^[[:space:]]*secret[[:space:]]*=[[:space:]]*\([^[:space:]]*\)/s//\1/p }' /etc/freeradius/clients.conf ) if [ "$password" ] \ - && ! grep -q "^127.0.0.1[[:space:]]\+$password[[:space:]]\+" \ + && ! grep -q "^127.0.0.1\(:[[:digit:]]\+\)\?[[:space:]]\+$password[[:space:]]\+" \ /etc/pam_radius_auth.conf then - sed -i.$backup_ext "s/^\(127.0.0.1[[:space:]]*\)[^[:space:]]*\(.*\)/\1$password\2/" /etc/pam_radius_auth.conf + sed -i.$backup_ext "s/^\(127.0.0.1\(:[[:digit:]]\+\)\?[[:space:]]\+\)[^[:space:]]\+\(.*\)/\1$password\3/" /etc/pam_radius_auth.conf fi fi } -- 1.7.10.4 From 9df90bfb908a573521cca5e3724d0bddaf651984 Mon Sep 17 00:00:00 2001 From: Valentin Vidic Date: Wed, 31 Oct 2012 12:42:40 +0100 Subject: [PATCH 09/16] Always restore IFS. --- src/functions.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/src/functions.sh b/src/functions.sh index ce861a3..6f98950 100644 --- a/src/functions.sh +++ b/src/functions.sh @@ -201,6 +201,7 @@ remove_bloat() { fi done done + IFS="$oldifs" [ "$DEBUG" ] && echo "DEBUG: pkgs_to_remove=$pkgs_to_remove" 1>&2 # Finally, remove those if [ -n "$update_selections" ]; then -- 1.7.10.4 From 7b55fd31a5533ef9d2ce167022cbb38e8009c768 Mon Sep 17 00:00:00 2001 From: Valentin Vidic Date: Wed, 31 Oct 2012 12:43:44 +0100 Subject: [PATCH 10/16] Release version 6.0.4. --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4504453..3b59fb9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +carnet-upgrade (6.0.4) stable; urgency=low + + * Handle port number in pam_radius_auth.conf. + * Always restore IFS. + + -- Valentin Vidic Wed, 31 Oct 2012 12:43:00 +0100 + carnet-upgrade (6.0.3) stable; urgency=low * Cleanup dpkg available file. -- 1.7.10.4 From 139cae67dbea7fbb15c8cda34930fae7af06137a Mon Sep 17 00:00:00 2001 From: Valentin Vidic Date: Fri, 11 Oct 2013 11:23:33 +0200 Subject: [PATCH 11/16] Rename squeeze -> wheezy. --- debian/po/templates.pot | 6 +++--- debian/templates | 6 +++--- doc/carnet-upgrade-src.sgml | 28 ++++++++++++++-------------- files/etc/apt/sources.list.template | 20 ++++++++++---------- src/actions/upgrade.queue | 2 +- src/data.sh | 2 +- src/messages.sh | 8 ++++---- 7 files changed, 36 insertions(+), 36 deletions(-) diff --git a/debian/po/templates.pot b/debian/po/templates.pot index df3da5e..5639ddb 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -20,15 +20,15 @@ msgstr "" #. Type: note #. Description #: ../templates:1001 -msgid "CARNet Debian 6.0 (squeeze) nadogradnja" +msgid "CARNet Debian 7 (wheezy) nadogradnja" msgstr "" #. Type: note #. Description #: ../templates:1001 msgid "" -"Instalirali ste paket carnet-upgrade za nadogradnju sa CARNet Debian 5.0 " -"(lenny) na CARNet Debian 6.0 (squeeze)." +"Instalirali ste paket carnet-upgrade za nadogradnju sa CARNet Debian 6 " +"(squeeze) na CARNet Debian 7 (wheezy)." msgstr "" #. Type: note diff --git a/debian/templates b/debian/templates index 7c0d6d4..e95e672 100644 --- a/debian/templates +++ b/debian/templates @@ -1,8 +1,8 @@ Template: carnet-upgrade/short-instructions Type: note -_Description: CARNet Debian 6.0 (squeeze) nadogradnja +_Description: CARNet Debian 7 (wheezy) nadogradnja Instalirali ste paket carnet-upgrade za nadogradnju sa CARNet Debian - 5.0 (lenny) na CARNet Debian 6.0 (squeeze). + 6 (squeeze) na CARNet Debian 7 (wheezy). . Prije pocetka nadogradnje napravite backup cijelog sustava i procitajte dokumentaciju u /usr/share/doc/carnet-upgrade/ ili na @@ -13,4 +13,4 @@ _Description: CARNet Debian 6.0 (squeeze) nadogradnja 100 MB slobodnog mjesta na / particiji procitajte upute na webu: http://sistemac.carnet.hr/node/795 . - Nadogradnju pokrenite kao root sa 'carnet-upgrade'. + Nadogradnju pokrenite kao root naredbom 'carnet-upgrade'. diff --git a/doc/carnet-upgrade-src.sgml b/doc/carnet-upgrade-src.sgml index ee5ceda..4f7aaaa 100644 --- a/doc/carnet-upgrade-src.sgml +++ b/doc/carnet-upgrade-src.sgml @@ -3,7 +3,7 @@ - CARNet Debian 6.0 (squeeze) nadogradnja + CARNet Debian 7 (wheezy) nadogradnja Grupa za izradu paketa paketi@carnet.hr @@ -11,16 +11,16 @@ Verzija %PKG_VERSION% - CARNet Debian squeeze je peta generacija CARNet Debian - distribucije i temelji se na Debian GNU/Linux squeeze. + CARNet Debian wheezy je šesta generacija CARNet Debian + distribucije i temelji se na Debian GNU/Linux wheezy. Ovaj priručnik opisuje postupak nadogradnje CARNet Debian - distribucije sa inačice 5.0 lenny na inačicu 6.0 - squeeze. Priručnik je zamišljen kao pomoć CARNetovim + distribucije sa inačice 6 squeeze na inačicu 7 + wheezy. Priručnik je zamišljen kao pomoć CARNetovim sistem inženjerima koji na svojim poslužiteljima imaju instaliran CARNet Debian i trebao bi obuhvatiti cjelokupan postupak nadogradnje, kao i tipične probleme na koje se može naići. Za tu svrhu pripremili smo paket carnet-upgrade inačice - 6.0, koji se nalazi na CARNetovom FTP poslužitelju u lenny + 7, koji se nalazi na CARNetovom FTP poslužitelju u lenny repozitoriju paketa. @@ -133,8 +133,8 @@ Prije početka

- Prije nadogradnje na squeeze distribuciju, potrebno je - izvršiti nadogradnju lenny distribucije na najsvježije + Prije nadogradnje na wheezy distribuciju, potrebno je + izvršiti nadogradnju squeeze distribucije na najsvježije pakete. To se najjednostavnije izvodi naredbom apt-get: @@ -420,7 +420,7 @@ CN: run_actions (main) started...

Slijedi instalacija /etc/apt/sources.list datoteke - podešene za CARNet Debian squeeze i osvježavanje baze paketa. + podešene za CARNet Debian wheezy i osvježavanje baze paketa. Eventualne dodatne repozitorije nakon nadogradnje možete kopirati iz stare sources.list datoteke, koja će biti spremljena kao /etc/apt/sources.list.cn6-upgrade. @@ -432,15 +432,15 @@ CN: run_actions (main) started... | Novi sadrzaj datoteke /etc/apt/sources.list: | | | | # See sources.list(5) for more information | -| deb http://ftp.hr.debian.org/debian/ squeeze main contrib non-fr| -| deb http://ftp.hr.debian.org/debian/ squeeze-updates main contri| -| deb http://security.debian.org/ squeeze/updates main contrib non| +| deb http://ftp.hr.debian.org/debian/ wheezy main contrib non-fr| +| deb http://ftp.hr.debian.org/debian/ wheezy-updates main contri| +| deb http://security.debian.org/ wheezy/updates main contrib non| | | | # CARNet Debian Linux | -| deb http://ftp.carnet.hr/carnet-debian/ carnet-squeeze main non-| +| deb http://ftp.carnet.hr/carnet-debian/ carnet-wheezy main non-| | | | # SRCE AAI@EduHr | -| deb http://ftp.srce.hr/srce-debian/ srce-squeeze main | +| deb http://ftp.srce.hr/srce-debian/ srce-wheezy main | | | +-----------------------------------------------------------------+ | < U redu > | diff --git a/files/etc/apt/sources.list.template b/files/etc/apt/sources.list.template index 4950d82..63a5454 100644 --- a/files/etc/apt/sources.list.template +++ b/files/etc/apt/sources.list.template @@ -1,17 +1,17 @@ # See sources.list(5) for more information -deb http://ftp.hr.debian.org/debian/ squeeze main contrib non-free -deb http://ftp.hr.debian.org/debian/ squeeze-updates main contrib non-free -deb http://security.debian.org/ squeeze/updates main contrib non-free +deb http://ftp.hr.debian.org/debian/ wheezy main contrib non-free +deb http://ftp.hr.debian.org/debian/ wheezy-updates main contrib non-free +deb http://security.debian.org/ wheezy/updates main contrib non-free # CARNet Debian Linux -deb http://ftp.carnet.hr/carnet-debian/ carnet-squeeze main non-free +deb http://ftp.carnet.hr/carnet-debian/ carnet-wheezy main non-free # SRCE AAI@EduHr -deb http://ftp.srce.hr/srce-debian/ srce-squeeze main +deb http://ftp.srce.hr/srce-debian/ srce-wheezy main # Uncomment if you want the apt-get source function to work -#deb-src http://ftp.hr.debian.org/debian/ squeeze main contrib non-free -#deb-src http://ftp.hr.debian.org/debian/ squeeze-updates main contrib non-free -#deb-src http://security.debian.org/ squeeze/updates main contrib non-free -#deb-src http://ftp.carnet.hr/carnet-debian/ carnet-squeeze main non-free -#deb-src http://ftp.srce.hr/srce-debian/ srce-squeeze main +#deb-src http://ftp.hr.debian.org/debian/ wheezy main contrib non-free +#deb-src http://ftp.hr.debian.org/debian/ wheezy-updates main contrib non-free +#deb-src http://security.debian.org/ wheezy/updates main contrib non-free +#deb-src http://ftp.carnet.hr/carnet-debian/ carnet-wheezy main non-free +#deb-src http://ftp.srce.hr/srce-debian/ srce-wheezy main diff --git a/src/actions/upgrade.queue b/src/actions/upgrade.queue index 5215f5e..96a9062 100644 --- a/src/actions/upgrade.queue +++ b/src/actions/upgrade.queue @@ -1,4 +1,4 @@ -# akcije za update squeeze instalacije, slicno post_upgrade +# akcije za update instalacije, slicno post_upgrade # veci broj paketa koji se ne daju upgradeati s obicnim # apt-get upgrade se forsirano upgradea true check_services preupgrade # spremi stanje diff --git a/src/data.sh b/src/data.sh index ae05bbd..5ad74e4 100644 --- a/src/data.sh +++ b/src/data.sh @@ -37,7 +37,7 @@ webalizer-cn 2.01.10-32.4lenny1 ' # URL to use for checking the latest version of carnet-upgrade itself -packages_uri='http://ftp.carnet.hr/carnet-debian/dists/carnet-squeeze/main/binary-i386/Packages' +packages_uri='http://ftp.carnet.hr/carnet-debian/dists/carnet-wheezy/main/binary-i386/Packages' # Packages to forcibly install before installing the rest with dist-upgrade, # because dist-upgrade would rather remove or keep them back them. diff --git a/src/messages.sh b/src/messages.sh index 23ea728..0e389f6 100644 --- a/src/messages.sh +++ b/src/messages.sh @@ -91,16 +91,16 @@ Koristenje: $(basename $0) [] | -h | --help moze biti: - main - izvrsava potpunu proceduru za nadogradnju sa CARNet Debian 5.x (lenny) - na CARNet Debian 6.x (squeeze) distribuciju. Ovo je pretpostavljena + izvrsava potpunu proceduru za nadogradnju sa CARNet Debian 6 (squeeze) + na CARNet Debian 7 (wheezy) distribuciju. Ovo je pretpostavljena vrijednost. - post_upgrade izvrsava samo one akcije iz procedure za nadogradnju koje dolaze nakon apt-get dist-upgrade. - - squeeze - izvrsava akcije podobne za CARNet Debian 6.x (squeeze) instalaciju. + - wheezy + izvrsava akcije podobne za CARNet Debian 7 (wheezy) instalaciju. - new izvrsava samo akcije koje su dodane u ovoj inacici. -- 1.7.10.4 From 61c702aeb281fcc52bc9060e34b6896ca0c0a1e1 Mon Sep 17 00:00:00 2001 From: Valentin Vidic Date: Fri, 11 Oct 2013 12:23:37 +0200 Subject: [PATCH 12/16] Update squeeze package versions. --- src/data.sh | 59 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/src/data.sh b/src/data.sh index 5ad74e4..5d2a15e 100644 --- a/src/data.sh +++ b/src/data.sh @@ -4,36 +4,35 @@ backup_ext=cn6-upgrade # carnet-upgrade aborts if these packages are not up to date # name wanted version needed_versions=' -amavis-stats-cn 0.1.12-3lenny1 -amavisd-cn 3:2.6.1-1 -aosi-aai 3.0.7 -aosi-www-aai 1:1.7.2 -apache2-cn 2.2-5lenny1 -bind9-cn 2:9.5.1-3 -carnet-tools-cn 2.8.3 -clamav-cn 3:0.95.3-1lenny1 -debian-archive-keyring 2010.08.28~lenny1 -dovecot-cn 1:1.0.15-2lenny2 -fail2ban-cn 0.8.3-2lenny1 -freeradius-aai 2.1.3-4 -iptables-cn 2:1.4.2-1 -kernel-2.6-cn 3:2.6.26.6 -mailman-cn 2:2.1.11-1 -monit-cn 1:4.10.1.4 -munin-cn 1.2.6-1 -mysql-cn 2:5.0.51-2lenny1 -ntp-cn 2:4.2.4p4-1 -openldap-aai 2.4.11-4 -openssh-cn 2:5.1p1-1lenny1 -php-suhosin-cn 0.9.27-1 -php5-cn 5.2.6-1 -postfix-cn 2.5.5-3lenny2 -samba-cn 3.2.5-1 -spamassassin-cn 2:3.2.5-7lenny1 -squirrelmail-change-pass-cn 3.0.2 -squirrelmail-cn 2:1.4.15-2lenny1 -vsftpd-cn 2.0.7-1 -webalizer-cn 2.01.10-32.4lenny1 +amavisd-cn 3:2.6.5 +aosi-aai 3.1.5 +aosi-www-aai 1:1.8.3 +apache2-cn 2.2+3 +bind9-cn 2:9.7.3 +carnet-tools-cn 3.0.3 +clamav-cn 3:0.97.8-1 +debian-archive-keyring 2010.08.28+squeeze1 +dovecot-cn 1:1.2.15.3 +fail2ban-cn 0.8.5 +freeradius-aai 2.1.10-2 +iptables-cn 2:1.4.8 +kernel-2.6-cn 3:2.6.32.1 +mailman-cn 2:2.1.13-1 +monit-cn 1:5.1.3 +munin-cn 1.4.5 +mysql-cn 2:5.1.49.2 +ntp-cn 2:4.2.6.p2.2 +openldap-aai 2.4.23-2 +openssh-cn 2:5.5p1.3 +php-suhosin-cn 0.9.32.2 +php5-cn 5.3.3+3 +postfix-cn 2.7.1.5 +samba-cn 3.5.6-1 +spamassassin-cn 2:3.3.3 +squirrelmail-change-pass-cn 3.1.2 +squirrelmail-cn 2:1.4.21+2 +vsftpd-cn 2.3.2.2 +webalizer-cn 2.01.10+2 ' # URL to use for checking the latest version of carnet-upgrade itself -- 1.7.10.4 From 16db4b7768ea6594c7e13c4231a1a62a5b627ee1 Mon Sep 17 00:00:00 2001 From: Valentin Vidic Date: Fri, 11 Oct 2013 12:52:32 +0200 Subject: [PATCH 13/16] Upgrade for mysql-server-5.1. --- src/functions.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/functions.sh b/src/functions.sh index 6f98950..06cbbc2 100644 --- a/src/functions.sh +++ b/src/functions.sh @@ -953,9 +953,9 @@ upgrade_freeradius () { # handle mysql 5.0 to 5.1 upgrade upgrade_mysql () { - if pkg mysql-server || pkg mysql-server-5.0; then + if pkg mysql-server || pkg mysql-server-5.1; then pkgadd mysql-server - dpkg -P mysql-server-5.0 + dpkg -P mysql-server-5.1 /etc/init.d/mysql restart fi } -- 1.7.10.4 From bad9c16de7e4b3dd5833aab89c682bfddc730bdc Mon Sep 17 00:00:00 2001 From: Valentin Vidic Date: Mon, 14 Oct 2013 14:48:59 +0200 Subject: [PATCH 14/16] Update freeradius version. --- src/functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/functions.sh b/src/functions.sh index 06cbbc2..a0431a4 100644 --- a/src/functions.sh +++ b/src/functions.sh @@ -928,7 +928,7 @@ upgrade_amavis () { upgrade_freeradius () { local password - pkg freeradius-aai lt 2.1.10-1 || return 0 + pkg freeradius-aai lt 2.1.12~srce1 || return 0 # aai team prevents a normal upgrade cp -av /etc/freeradius /etc/freeradius.$backup_ext -- 1.7.10.4 From bde8d2cd81bb9a247b00bde135a86cbf2b214f05 Mon Sep 17 00:00:00 2001 From: Valentin Vidic Date: Mon, 14 Oct 2013 16:43:22 +0200 Subject: [PATCH 15/16] Release version 7.0.0. --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3b59fb9..024448b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +carnet-upgrade (7.0.0) stable; urgency=low + + * Rename squeeze -> wheezy. + * Update squeeze package versions. + * Upgrade for mysql-server-5.1. + * Update freeradius version. + + -- Valentin Vidic Mon, 14 Oct 2013 16:42:06 +0200 + carnet-upgrade (6.0.4) stable; urgency=low * Handle port number in pam_radius_auth.conf. -- 1.7.10.4 From 3d1f4ebbbd06937d10750c92cda4b2a6a8a2b7bc Mon Sep 17 00:00:00 2001 From: Valentin Vidic Date: Tue, 15 Oct 2013 08:46:45 +0200 Subject: [PATCH 16/16] Update backup extension. --- src/data.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data.sh b/src/data.sh index 5d2a15e..1b421cf 100644 --- a/src/data.sh +++ b/src/data.sh @@ -1,5 +1,5 @@ # Backup extension -backup_ext=cn6-upgrade +backup_ext=cn7-upgrade # carnet-upgrade aborts if these packages are not up to date # name wanted version -- 1.7.10.4