privacyidea: update v3.2.2

privacyidea/Makefile

@@ -56,19 +56,18 @@ postinstall: timesyncd.conf firstboot.start
 	$(inroot) chown privacyidea:root /var/log/privacyidea/privacyidea.log
 
 	# FreeRADIUS-Konfiguration
-	sed -i 's:filename = .*:filename = /usr/lib/privacyidea/authmodules/FreeRADIUS/privacyidea_radius.pm:' $(CHROOT)/etc/raddb/mods-available/perl
+	mv $(CHROOT)/etc/raddb/dictionary $(CHROOT)/etc/raddb/dictionary.orig
-	ln -s ../mods-available/perl $(CHROOT)/etc/raddb/mods-enabled/perl
+	cp $(CHROOT)/etc/privacyidea/dictionary $(CHROOT)/etc/raddb/
-	cp freeradius/privacyidea $(CHROOT)/etc/raddb/sites-available/
-	$(inroot) chown root:radius /etc/raddb/sites-available/privacyidea
-	chmod 640 $(CHROOT)/etc/raddb/sites-available/privacyidea
-	cp freeradius/dictionary.netknights $(CHROOT)/etc/raddb/dictionary
 	$(inroot) chown root:radius /etc/raddb/dictionary
 	chmod 640 $(CHROOT)/etc/raddb/dictionary
+	cp $(CHROOT)/etc/privacyidea/freeradius3/mods-perl-privacyidea $(CHROOT)/etc/raddb/mods-available/perl-privacyidea
+	ln -s ../mods-available/perl-privacyidea $(CHROOT)/etc/raddb/mods-enabled/perl-privacyidea
+	cp $(CHROOT)/etc/privacyidea/freeradius3/privacyidea $(CHROOT)/etc/raddb/sites-available/
+	$(inroot) chown root:radius /etc/raddb/sites-available/privacyidea
+	chmod 640 $(CHROOT)/etc/raddb/sites-available/privacyidea
 	rm $(CHROOT)/etc/raddb/mods-enabled/eap
 	rm $(CHROOT)/etc/raddb/sites-enabled/*
 	ln -s ../sites-available/privacyidea $(CHROOT)/etc/raddb/sites-enabled/privacyidea
-	mv $(CHROOT)/etc/raddb/dictionary $(CHROOT)/etc/raddb/dictionary.orig
-	cp $(CHROOT)/etc/privacyidea/dictionary $(CHROOT)/etc/raddb/
 	$(inroot) systemctl enable freeradius
 
 clean:

privacyidea/firstboot.start

@@ -40,7 +40,7 @@ if [ ! -d "/$LABEL/var/lib/mysql/pi" ]; then
     mkdir -p /$LABEL/var/lib/mysql
     rm -rf /$LABEL/var/lib/mysql/*
     cp -a /var/lib/mysql/. /$LABEL/var/lib/mysql
-    sed -i "s:^datadir.*:datadir                                    = /$LABEL/var/lib/mysql:" /etc/mysql/my.cnf
+    sed -i "s:^datadir.*:datadir                                    = /$LABEL/var/lib/mysql:" /etc/mysql/mariadb.d/50-distro-server.cnf
     systemctl start mariadb
 
     echo 'Create privacyIDEA database...'
@@ -73,7 +73,7 @@ if [ ! -d "/$LABEL/var/lib/mysql/pi" ]; then
     fi
 else
     echo 'Start MariaDB...'
-    sed -i "s:^datadir.*:datadir                                    = /$LABEL/var/lib/mysql:" /etc/mysql/my.cnf
+    sed -i "s:^datadir.*:datadir                                    = /$LABEL/var/lib/mysql:" /etc/mysql/mariadb.d/50-distro-server.cnf
     systemctl start mariadb
 fi
 echo 'Enable database...'

privacyidea/freeradius/dictionary.netknights

@@ -1,13 +0,0 @@
-# -*- text -*-
-#
-# 	privacyIDEA dictionary
-#
-
-VENDOR		NetKnights			44929
-
-#  Backwards compatibility.
-BEGIN-VENDOR	NetKnights
-
-ATTRIBUTE	privacyIDEA-Serial					1	string
-
-END-VENDOR	NetKnights

privacyidea/freeradius/privacyidea

@@ -1,64 +0,0 @@
-server default {
-
-	listen {
-		type = auth
-		ipaddr = *
-		port = 0
-		limit {
-			max_connections = 16
-			lifetime = 0
-			idle_timeout = 30
-		}
-	}
-
-	listen {
-		ipaddr = *
-		port = 0
-		type = acct
-		limit {
-		}
-	}
-
-	authorize {
-		preprocess
-		digest
-		suffix
-		ntdomain
-		files
-		expiration
-		logintime
-		pap
-		update control {
-			Auth-Type := Perl
-		}
-	}
-
-	authenticate {
-		Auth-Type Perl {
-			perl
-		}
-		digest
-	}
-
-	preacct {
-		suffix
-		files
-	}
-
-	accounting {
-		detail
-	}
-
-	session {
-	}
-
-	post-auth {
-	}
-
-	pre-proxy {
-	}
-
-	post-proxy {
-	}
-
-}

privacyidea/kernel.config

@@ -1,14 +1,15 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.19.44-gentoo Kernel Configuration
+# Linux/x86 4.19.97-gentoo Kernel Configuration
 #
 
 #
-# Compiler: gcc (Gentoo Hardened 8.3.0-r1 p1.1) 8.3.0
+# Compiler: gcc (Gentoo Hardened 9.2.0-r2 p3) 9.2.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=80300
+CONFIG_GCC_VERSION=90200
 CONFIG_CLANG_VERSION=0
+CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@@ -337,6 +338,9 @@ CONFIG_X86_SMAP=y
 CONFIG_X86_INTEL_UMIP=y
 # CONFIG_X86_INTEL_MPX is not set
 CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
+CONFIG_X86_INTEL_TSX_MODE_OFF=y
+# CONFIG_X86_INTEL_TSX_MODE_ON is not set
+# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
 # CONFIG_EFI is not set
 CONFIG_SECCOMP=y
 # CONFIG_HZ_100 is not set
@@ -557,7 +561,7 @@ CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_DMIID=y
 # CONFIG_DMI_SYSFS is not set
 CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
-# CONFIG_ISCSI_IBFT_FIND is not set
+# CONFIG_ISCSI_IBFT is not set
 CONFIG_FW_CFG_SYSFS=y
 # CONFIG_FW_CFG_SYSFS_CMDLINE is not set
 # CONFIG_GOOGLE_FIRMWARE is not set
@@ -1477,6 +1481,7 @@ CONFIG_NET_CORE=y
 # CONFIG_MACVLAN is not set
 # CONFIG_IPVLAN is not set
 # CONFIG_VXLAN is not set
+# CONFIG_GENEVE is not set
 # CONFIG_GTP is not set
 # CONFIG_MACSEC is not set
 # CONFIG_NETCONSOLE is not set
@@ -1600,7 +1605,7 @@ CONFIG_PHYLIB=y
 #
 # CONFIG_AMD_PHY is not set
 # CONFIG_AQUANTIA_PHY is not set
-# CONFIG_ASIX_PHY is not set
+# CONFIG_AX88796B_PHY is not set
 # CONFIG_AT803X_PHY is not set
 # CONFIG_BCM7XXX_PHY is not set
 # CONFIG_BCM87XX_PHY is not set
@@ -1966,7 +1971,6 @@ CONFIG_BCMA_POSSIBLE=y
 # CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
 # CONFIG_LPC_ICH is not set
 # CONFIG_LPC_SCH is not set
-# CONFIG_INTEL_SOC_PMIC_CHTWC is not set
 # CONFIG_MFD_INTEL_LPSS_ACPI is not set
 # CONFIG_MFD_INTEL_LPSS_PCI is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
@@ -2004,7 +2008,6 @@ CONFIG_BCMA_POSSIBLE=y
 # CONFIG_TPS6507X is not set
 # CONFIG_MFD_TPS65086 is not set
 # CONFIG_MFD_TPS65090 is not set
-# CONFIG_MFD_TPS68470 is not set
 # CONFIG_MFD_TI_LP873X is not set
 # CONFIG_MFD_TPS6586X is not set
 # CONFIG_MFD_TPS65912_I2C is not set

privacyidea/make.conf

@@ -2,6 +2,6 @@ CFLAGS="-O2 -pipe"
 CXXFLAGS="-O2 -pipe"
 USE="hardened justify pie ssp urandom xattr -fortran -jit -orc -pch -pic -prelink -profile -tcc"
 MAKEOPTS="-j5"
-PYTHON_TARGETS="python2_7 python3_6"
+PYTHON_TARGETS="python3_6"
 PYTHON_SINGLE_TARGET="python3_6"
 VIDEO_CARDS="vmware"

privacyidea/package.keywords

@@ -26,4 +26,8 @@ dev-python/smpplib
 dev-nodejs/*
 
 # stable kann kein python3
+net-fs/samba
+sys-libs/ldb
 sys-libs/talloc
+sys-libs/tdb
+sys-libs/tevent