From: Mazet Laurent <mazet@debian-12.softndesign.org>
Date: Mon, 11 Mar 2024 06:51:06 +0000 (+0100)
Subject: update to Debian 12
X-Git-Tag: debian_12.5.0~3
X-Git-Url: https://secure.softndesign.org/git/?a=commitdiff_plain;h=f5f2b8a06300ad05c882d2db9fbcfab2dad7fa06;hp=845c7f292dc13e71f706f47e318a49ced0ec293b;p=debian6500.git

update to Debian 12
---

diff --git a/Makefile b/Makefile
index 60d2747..21ea5a5 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ VERSION = $(shell awk '/^$(MASTERFILE)/ {gsub(/[()]/, ""); print $$2; exit}' $(M
 
 ISOVER = $(shell echo $(VERSION) | sed 's/-.*$$//')
 
-ISO = simple-cdd/images/debian-7.8-amd64-CD-1.iso
+ISO = simple-cdd/images/debian-12-amd64-CD-1.iso
 
 TARGET_ISO = debian-trc6500-$(ISOVER).iso
 
@@ -20,7 +20,7 @@ $(TARGET_ISO): $(ISO)
 	mv $< $@
 
 $(ISO): $(TARGET_DEB)
-	cd simple-cdd && build-simple-cdd --dist wheezy --conf ./simple-cdd.conf
+	cd simple-cdd && build-simple-cdd --keyring ~/.gnupg/pubring.gpg --dist bookworm --conf ./simple-cdd.conf
 
 masterfile: $(TARGET_DEB)
 
diff --git a/debian-rep/install/firmware-bnx2_0.14+lenny2_all.deb b/debian-rep/install/firmware-bnx2_0.14+lenny2_all.deb
deleted file mode 100755
index 3744197..0000000
Binary files a/debian-rep/install/firmware-bnx2_0.14+lenny2_all.deb and /dev/null differ
diff --git a/debian-rep/install/firmware-bnx2_20230210-5_all.deb b/debian-rep/install/firmware-bnx2_20230210-5_all.deb
new file mode 100644
index 0000000..7948109
Binary files /dev/null and b/debian-rep/install/firmware-bnx2_20230210-5_all.deb differ
diff --git a/debian-rep/install/igb-3.0.22.tar.gz b/debian-rep/install/igb-3.0.22.tar.gz
deleted file mode 100755
index e45e5a1..0000000
Binary files a/debian-rep/install/igb-3.0.22.tar.gz and /dev/null differ
diff --git a/debian-rep/install/igb-5.7.2.tar.gz b/debian-rep/install/igb-5.7.2.tar.gz
new file mode 100644
index 0000000..43d1245
Binary files /dev/null and b/debian-rep/install/igb-5.7.2.tar.gz differ
diff --git a/master/etc/apt/sources.list b/master/etc/apt/sources.list
index 899d187..0c41232 100644
--- a/master/etc/apt/sources.list
+++ b/master/etc/apt/sources.list
@@ -1,16 +1,10 @@
-# Debian GNU/Linux 7.5.0
+#deb http://ftp.fr.debian.org/debian/ bookworm main non-free-firmware
+#deb-src http://ftp.fr.debian.org/debian/ bookworm main non-free-firmware
 
-#deb cdrom:[Debian GNU/Linux 7.5.0 _Wheezy_ - Official amd64 DVD Binary-3 20140426-13:37]/ wheezy contrib main
-#deb cdrom:[Debian GNU/Linux 7.5.0 _Wheezy_ - Official amd64 DVD Binary-2 20140426-13:37]/ wheezy contrib main
-#deb cdrom:[Debian GNU/Linux 7.5.0 _Wheezy_ - Official amd64 DVD Binary-1 20140426-13:37]/ wheezy contrib main
+#deb http://security.debian.org/debian-security bookworm-security main non-free-firmware
+#deb-src http://security.debian.org/debian-security bookworm-security main non-free-firmware
 
-#deb http://security.debian.org/ wheezy/updates main contrib non-free
-#deb-src http://security.debian.org/ wheezy/updates main contrib non-free
-
-# wheezy-updates, previously known as 'volatile'
-# A network mirror was not selected during install.  The following entries
-# are provided as examples, but you should amend them as appropriate
-# for your mirror of choice.
-#
-# deb http://ftp.debian.org/debian/ wheezy-updates main contrib non-free
-# deb-src http://ftp.debian.org/debian/ wheezy-updates main contrib non-free
+# bookworm-updates, to get updates before a point release is made;
+# see https://www.debian.org/doc/manuals/debian-reference/ch02.en.html#_updates_and_backports
+#deb http://ftp.fr.debian.org/debian/ bookworm-updates main non-free-firmware
+#deb-src http://ftp.fr.debian.org/debian/ bookworm-updates main non-free-firmware
diff --git a/master/etc/apt/sources.list.d/reseau_integration.list~ b/master/etc/apt/sources.list.d/reseau_integration.list~
index d8fae89..175f6b4 100644
--- a/master/etc/apt/sources.list.d/reseau_integration.list~
+++ b/master/etc/apt/sources.list.d/reseau_integration.list~
@@ -1,2 +1,2 @@
-deb [arch=amd64,all] http://192.168.0.53/debian-amd64 wheezy contrib main non-free
+deb [arch=amd64,all] http://192.168.0.53/debian-amd64 bookworm contrib main non-free-firmware
 deb [arch=amd64,all] http://192.168.0.53/cots softndesign main debug
diff --git a/simple-cdd/local_packages/firmware-bnx2_0.36+wheezy.1_all.deb b/simple-cdd/local_packages/firmware-bnx2_0.36+wheezy.1_all.deb
deleted file mode 100644
index 6dcbe72..0000000
Binary files a/simple-cdd/local_packages/firmware-bnx2_0.36+wheezy.1_all.deb and /dev/null differ
diff --git a/simple-cdd/local_packages/firmware-bnx2_20230210-5_all.deb b/simple-cdd/local_packages/firmware-bnx2_20230210-5_all.deb
new file mode 100644
index 0000000..7948109
Binary files /dev/null and b/simple-cdd/local_packages/firmware-bnx2_20230210-5_all.deb differ
diff --git a/simple-cdd/local_packages/pdmenu_1.3.6-1_amd64.deb b/simple-cdd/local_packages/pdmenu_1.3.6-1_amd64.deb
new file mode 100644
index 0000000..eea39d7
Binary files /dev/null and b/simple-cdd/local_packages/pdmenu_1.3.6-1_amd64.deb differ
diff --git a/simple-cdd/local_packages/raf_1.0.0-2_all.deb b/simple-cdd/local_packages/raf_1.0.0-2_all.deb
new file mode 100644
index 0000000..e8618de
Binary files /dev/null and b/simple-cdd/local_packages/raf_1.0.0-2_all.deb differ
diff --git a/simple-cdd/local_packages/raf_1.0.1-1_all.deb b/simple-cdd/local_packages/raf_1.0.1-1_all.deb
deleted file mode 100644
index 17bc553..0000000
Binary files a/simple-cdd/local_packages/raf_1.0.1-1_all.deb and /dev/null differ
diff --git a/simple-cdd/local_packages/webconfig_1.16.1-1_all.deb b/simple-cdd/local_packages/webconfig_1.16.1-1_all.deb
deleted file mode 100644
index 042f60d..0000000
Binary files a/simple-cdd/local_packages/webconfig_1.16.1-1_all.deb and /dev/null differ
diff --git a/simple-cdd/local_packages/webconfig_1.17.0-1_all.deb b/simple-cdd/local_packages/webconfig_1.17.0-1_all.deb
new file mode 100644
index 0000000..54de3bb
Binary files /dev/null and b/simple-cdd/local_packages/webconfig_1.17.0-1_all.deb differ
diff --git a/simple-cdd/profiles/trc6500.packages b/simple-cdd/profiles/trc6500.packages
index ba1cff2..a5e608c 100644
--- a/simple-cdd/profiles/trc6500.packages
+++ b/simple-cdd/profiles/trc6500.packages
@@ -18,6 +18,7 @@ bash
 bash-completion
 bc
 bind9-host
+binutils-multiarch
 bsd-mailx
 bsdmainutils
 bsdutils
@@ -34,7 +35,7 @@ cron
 curl
 daemon
 dash
-db5.1-util
+db5.3-util
 dc
 dce
 debconf
@@ -48,7 +49,7 @@ dmidecode
 dnsutils
 dosfstools
 dpkg
-e2fslibs
+#e2fslibs
 e2fsprogs
 eject
 etherwake
@@ -58,13 +59,14 @@ fakeroot
 file
 findutils
 #firmware-bnx2 refuses to be added to local packages, we'll install it in postinst manually
-#firmware-bnx2
+firmware-bnx2
 firmware-linux-free
+#firmware-misc-nonfree
 fonts-liberation
 freeipmi-tools
 ftp
 gawk
-gcc-4.7-base
+#gcc-4.7-base
 gdb
 #gdisk
 gettext-base
@@ -79,9 +81,8 @@ groff-base
 grub-common
 grub-pc
 gzip
-hddtemp
+#hddtemp
 hdparm
-host
 hostname
 ifupdown
 info
@@ -92,10 +93,10 @@ install-info
 installation-report
 iperf
 ipmitool
-iproute
+iproute2
 iptables
 iptables-persistent
-iptraf
+iptraf-ng
 iputils-ping
 isc-dhcp-client
 isc-dhcp-common
@@ -105,14 +106,14 @@ kmod
 laptop-detect
 less
 libacl1
-libapt-inst1.5
-libapt-pkg4.12
+#libapt-inst1.5
+libapt-pkg6.0
 libattr1
 libavahi-client3
 libavahi-common-data
 libavahi-common3
 libblkid1
-libboost-iostreams1.49.0
+libboost-iostreams1.74.0
 libbz2-1.0
 libc-bin
 libc6
@@ -120,37 +121,37 @@ libc6-i386
 libcalloc1
 libcap2-bin
 libclass-accessor-perl
-libcomerr2
-libcroco3
+libcom-err2
+#libcroco3
 libcups2
-libcwidget3
+libcwidget4
 libcycle1
-libdb5.1
+libdb5.3
 libdbus-1-3
 libdebug1
-libelfg0
-libept1.4.12
+libelf-dev
+libept1.6.0
 libfile-copy-recursive-perl
-libgcc1
-libgcrypt11
-libgdbm3
-libgnutls26
+#libgcc1
+libgcrypt20
+libgdbm6
+libgnutls30
 libgpg-error0
-libidn11
+libidn12
 libjbig0
 libkmod2
 liblist-moreutils-perl
 liblocale-gettext-perl
 liblockfile-bin
-liblog4cxx10
+liblog4cxx15
 liblzma5
 libmcore1
 libmount1
-libncurses5
-libncursesw5
+libncurses6
+libncursesw6
 libnewt0.52
 libnfnetlink0
-libopenthreads14
+libopenthreads21
 libp11-kit0
 libpam-modules
 libpam-modules-bin
@@ -158,22 +159,22 @@ libpam-runtime
 libpam0g
 libpipeline1
 libpopt0
-libprocps0
-libreadline6
-librtmp0
+#libprocps0
+libreadline8
+librtmp1
 libselinux1
 libsemanage-common
-libsemanage1
-libsepol1
-libsigc++-2.0-0c2a
+libsemanage2
+libsepol2
+libsigc++-2.0-0v5
 libslang2
 libsqlite3-0
 libss2
 libssh2-1
-libssl1.0.0
-libstdc++6
+libssl3
+#libstdc++6
 libsub-name-perl
-libtasn1-3
+libtasn1-6
 libtdb1
 libtext-charwidth-perl
 libtext-iconv-perl
@@ -183,7 +184,7 @@ libudev0
 libusb-0.1-4
 libustr-1.0-1
 libuuid1
-libxapian22
+libxapian30
 libxml-simple-perl
 linux-image-amd64
 lm-sensors
@@ -200,7 +201,6 @@ mawk
 memstat
 mlocate
 mount
-multiarch-support
 mutt
 nano
 ncurses-base
@@ -220,10 +220,11 @@ perl-base
 procmail
 procps
 psmisc
-python-apt
-python-reportbug
-python-support
-python-twisted-web
+#python-apt
+#python-reportbug
+#python-support
+#python-twisted-web
+python3
 raf
 readline-common
 reportbug
@@ -233,7 +234,7 @@ samba-common-bin
 screen
 sed
 sensible-utils
-sensord
+#sensord
 smbclient
 snmp
 snmpd
@@ -244,11 +245,11 @@ sudo
 swb
 syslinux
 sysv-rc
-sysvinit
+sysvinit-core
 sysvinit-utils
 tar
 task-english
-task-file-server
+#task-file-server
 task-ssh-server
 tasksel
 tasksel-data
diff --git a/simple-cdd/profiles/trc6500.postinst b/simple-cdd/profiles/trc6500.postinst
index 9493769..a6b1e32 100755
--- a/simple-cdd/profiles/trc6500.postinst
+++ b/simple-cdd/profiles/trc6500.postinst
@@ -10,7 +10,7 @@ mount /dev/cdrom /media/cdrom
 
 # first we install the packages we couldn't install automatically
 echo 'Installing additional package : firmware-bnx2...'
-dpkg -i /media/cdrom/simple-cdd/firmware-bnx2_0.36+wheezy.1_all.deb
+dpkg -i /media/cdrom/simple-cdd/firmware-bnx2_20230210-5_all.deb
 echo 'Additional packages installed'
 
 #debugging
diff --git a/simple-cdd/readme.txt b/simple-cdd/readme.txt
index 5456125..223c616 100644
--- a/simple-cdd/readme.txt
+++ b/simple-cdd/readme.txt
@@ -24,10 +24,25 @@ This CD does NOT create an usable operating system. All included systems should
 - splash-thales.png is a 640*480 image used for the splashscreen
 
 
+** Setup build environment
+
+- some packages need to be installed:
+  apt  build-essential debhelper simple-cdd
+- user must have a GPG private key to sign trc6500master package (check name in changelog)
+- unfortunatly some GPG public keys are missing for bookworm distribution (A7236886F3CCCAAD148A27F80E98404D386FA1D9 4D64FEC119C2029067D6E791F8D2585B8783D481 4CB50190207B4758A3F73A796ED0E7B82643E131 ED541312A33F1128F10B1C6C54404762BBB6E853 B0CAB9266E8C3929798B3EEEBDE6D2B9216EC7A8), they can be retrieved and install into user trusted key ring.
+  for key in $list; do gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys $key; done
+- to use the user trusted key ring, add the option --keyring ~/.gnupg/pubring.gpg
+- last thing, there's a bug and dep11 repository is not retrieved:
+  source debian6500/simple-cdd/simple-cdd.conf
+  wget ftp://ftp.fr.debian.org/debian/dists/bookworm/main/dep11/Components-amd64.yml.gz
+  mkdir -p $working_dir/simple-cdd/tmp/mirror/dists/bookworm/main/dep11/
+  mv Components-amd64.yml.gz $working_dir/simple-cdd/tmp/mirror/dists/bookworm/main/dep11/
+
+
 ** How build-simple-cdd works
 
 The build-simple-cdd program is to be called like this :
-build-simple-cdd --dist wheezy --conf ./simple-cdd.conf
+build-simple-cdd --dist bookworm --conf ./simple-cdd.conf
 
 Most options described in the documentation are included in the simple-cdd.conf file. The program will use those (in addition to the default settings) to build a list of what is to be included on the CD. Primarily, it includes itself, profile(s) scripts, and pulls packages (from the <profile>.packages list) from whatever repositories are in /etc/apt/sources.list, or from the ./tmp folder if the packages have already been fetched. 
 
diff --git a/simple-cdd/simple-cdd.conf b/simple-cdd/simple-cdd.conf
index 5432ae9..733613b 100644
--- a/simple-cdd/simple-cdd.conf
+++ b/simple-cdd/simple-cdd.conf
@@ -2,7 +2,7 @@
 
 # normally we should use the built-in simple_cdd_dir but I have doubts.. Let's use this.
 # you'll probably want to change that
-working_dir="/home/trc6500/cdd-attempt"
+#working_dir="/home/trc6500/cdd-attempt"
 working_dir=$(pwd)
 
 # Profiles to include on the CD
@@ -11,10 +11,11 @@ build_profiles="trc6500"
 auto_profiles="trc6500"
 
 do_mirror="true"
-debian_mirror="ftp://integration2/debian"
-profiles_udeb_dist="wheezy"
-mirror_component="main"
-mirror_tools="wget"
+#debian_mirror="ftp://integration2/debian"
+debian_mirror="ftp://ftp.fr.debian.org/debian/"
+profiles_udeb_dist="bookworm"
+mirror_component="main non-free-firmware"
+#mirror_tools="wget"
 # default for mirror_tools is "wget reprepro". However, if we use reprepro, build-simple-cdd doesn't read the local_packages option, because it assumes reprepro has already built those into the mirror. But we're not building the mirror here, so we never actually get them. If we disable reprepro, it will actually look into local_packages.
 # Note that all this was because we were using the previously-built mirror in ./tmp instead of being connected to a repository like we'd normally do. If you don't do that just delete those things.
 
@@ -24,8 +25,8 @@ local_packages="${working_dir}/local_packages"
 # we'll unpack that during install
 # for now, this includes : myrc.local, TRC6500.pub, local_packages/firmware-bnx2, and the deb package with all the master files
 # additionally, the bnx2 firmware is there because it resists being added to local_packages for some odd reason. So we'll install it by hand.
-#all_extras="${working_dir}/master.tar.gz,${working_dir}/myrc.local,${working_dir}/TRC6500.pub,${working_dir}/local_packages/firmware-bnx2_0.36+wheezy.1_all.deb"
-all_extras="${working_dir}/myrc.local,${working_dir}/TRC6500.pub,${working_dir}/local_packages/firmware-bnx2_0.36+wheezy.1_all.deb, $(find ${working_dir}/.. -maxdepth 1 -name trc6500-master-file\*.deb|sort|tail -1)"
+#all_extras="${working_dir}/master.tar.gz,${working_dir}/myrc.local,${working_dir}/TRC6500.pub,${working_dir}/local_packages/firmware-bnx2_20230210-5_all.deb"
+all_extras="${working_dir}/myrc.local,${working_dir}/TRC6500.pub,${working_dir}/local_packages/firmware-bnx2_20230210-5_all.deb, $(find ${working_dir}/.. -maxdepth 1 -name trc6500-master-file\*.deb|sort|tail -1)"
 
 # added value
 export SPLASHPNG="${working_dir}/splash-thales.png"
diff --git a/trc6500-master-file/changelog b/trc6500-master-file/changelog
index e93aa11..3f1c934 100644
--- a/trc6500-master-file/changelog
+++ b/trc6500-master-file/changelog
@@ -1,3 +1,9 @@
+trc6500-master-file (12.5.0-1) unstable; urgency=low
+
+  * Adapt to Debian 12
+
+ -- Laurent Mazet <mazet@softndesign.org>  Thu, 29 Feb 2024 10:33:15 +0200
+
 trc6500-master-file (7.8.11-1) unstable; urgency=low
 
   * Correct error in swm configuration (vlan 11)