Subversion Repositories ALCASAR

Compare Revisions

No changes between revisions

Ignore whitespace Rev 3085 → Rev 3088

/rpms/CoovaChilli/coova-chilli-1.6.spec
9,7 → 9,7
Packager: Richard REY (Rexy)
Group: System/Servers
URL: https://coova.github.io/CoovaChilli
Source: %{name}-master.tar.gz
Source: %{name}-%{version}.tar.gz
Patch0: chilli.h.patch
Patch1: chilli_limits.h.patch
Patch2: redir.c.patch
30,7 → 30,7
your favorite radius server. Read more at http://coova.github.io/.
 
%prep
%setup -q -n %{name}-master
%setup -q -n %{name}-%{version}
 
%patch0 -p3
%patch1 -p0
/rpms/ipt-netflow-2.6.spec
1,4 → 1,4
%define kversion 5.15.65-server-1.mga8
%define kversion 5.15.74-server-1.mga8
%define debug_package %{nil}
Name: ipt-netflow
Version: 2.6
44,8 → 44,8
/lib/modules/%kversion/extra/ipt_NETFLOW.ko
 
%changelog
* Thu Oct 13 2022 Richard REY <Rexy>
- Version 2.6 for the kernel 5.15.65 (ALCASAR 3.6.0)
* Thu Nov 06 2022 Richard REY <Rexy>
- Version 2.6 for the kernel 5.15.74 (ALCASAR 3.6.0)
* Tue Jul 08 2021 Richard REY <Rexy>
- Version 2.6 for the kernel 5.10.46 (ALCASAR 3.5.4)
* Wed Feb 24 2021 Richard REY <Rexy>
/rpms/rpm-build-howto
19,19 → 19,20
 
**** For Coova-chilli *****
- install the following RPMs "lib64openssl-devel", "lib64json-c-devel"
- retrieve the last tarball of coova-chilli (or the svn archive).
- Untar it and test the compilation process ("sh ./bootstrap", "./configure --disable-static --enable-shared --enable-largelimits --enable-chilliredir --enable-chilliscript --with-poll --enable-dhcpopt --enable-libjson --enable-json --enable-mdns --with-openssl", "make", "make install").
- retrieve the last git archive of coova-chilli (https://github.com/coova/coova-chilli).
- Unzip it and test the compilation process ("sh ./bootstrap", "./configure --disable-static --enable-shared --enable-largelimits --enable-chilliredir --enable-chilliscript --with-poll --enable-dhcpopt --enable-libjson --enable-json --enable-mdns --with-openssl", "make", "make install").
- all is in the /usr/local". Remove the instaled files ("make uninstall") and the binaries ("make clean").
- rename the directory and compress it (ie : tar -cvzf coova-chilli-1.x.tgz coova-chilli-1.x). Copy this tarball in the directory ~/rpmbuild/SOURCES/.
- rename the directory (coovachilli-1.x) and compress it (ie : tar -cvzf coova-chilli-1.x.tar.gz coova-chilli-1.x). Copy this tarball in the directory ~/rpmbuild/SOURCES/.
- copy the SPEC file from the ALCASAR archive to the directory ~/rpmbuild/SPEC
- Add the option -Wno-format-truncation à la ligne "%Werror_cflags" du fichier /etc/rpm/macro.d/20build.macros (avoid the following warning : https://github.com/coova/coova-chilli/issues/509)
- copy the .patch and SHA256* files in the directory ~/rpmbuild/SOURCES
//- Add the option -Wno-format-truncation à la ligne "%Werror_cflags" du fichier /etc/rpm/macro.d/20build.macros (avoid the following warning : https://github.com/coova/coova-chilli/issues/509)
- change to the directory ~/pmbuild/SPEC and run the RPM build process : "rpmbuild -bb coova-chilli.spec" (or rpmbuild -ba to create also the SRPMS)
 
INFO : .spec tunning :
- add this 1st line : "%define _disable_ld_no_undefined 1" to avoid errors for unused references (ld)
- add the line "automake --add-missing" before "make"
- for 64b version, add 2 lines with "lib64" directory on the section removing statics binaries (rm -rf $RPM_BUILD_ROOT/usr/lib/*.la)
- remove from the archive the unused files for ALCASAR (wpad.dat, wwwdir, etc. via la directive '%exclude')
- for 64b version, add 2 lines with "lib64" directory in the section "removing statics binaries" (rm -rf $RPM_BUILD_ROOT/usr/lib/*.la)
- remove from the archive the unused files for ALCASAR (wpad.dat, wwwdir, etc.) via la directive '%exclude'
- change %make (deprecated) with %make_build and change %makeinstall (deprecated) with %make_install
 
**** For HAVP ****
/rpms/x86_64/coova-chilli-1.6-1.mga8.x86_64.rpm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Deleted: svn:mime-type
-application/octet-stream
\ No newline at end of property
/rpms/x86_64/coova-chilli-1.6-2.mga8.x86_64.rpm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
+application/octet-stream
\ No newline at end of property
/rpms/x86_64/ipt-netflow-2.6-0.mga8.x86_64.rpm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/scripts/alcasar-dns-local.sh
43,7 → 43,7
function hosts_to_unbound(){ # configure the unbound conf file with local host names resolution
cat << EOF > $LOCAL_DNS_FILE
server:
local-data: "$INT_DNS_HOST.$INT_DNS_DOMAIN A $INT_DNS_IP"
local-data: "$INT_DNS_HOST.$INT_DNS_DOMAIN IN A $INT_DNS_IP"
local-data-ptr: "$INT_DNS_IP $INT_DNS_HOST.$INT_DNS_DOMAIN"
EOF
while read -r line
52,10 → 52,14
domain=$(echo $line | awk '{ print $2 }')
if ! echo $line | grep -E -q "^([0-9\.\t ]+alcasar( |$)|127\.0\.0)"
then
echo -e "\tlocal-data: \"$domain.$INT_DNS_DOMAIN A $ip_address\"" >> $LOCAL_DNS_FILE
echo -e "\tlocal-data: \"$domain.$INT_DNS_DOMAIN IN A $ip_address\"" >> $LOCAL_DNS_FILE
echo -e "\tlocal-data-ptr: \"$ip_address $domain.$INT_DNS_DOMAIN\"" >> $LOCAL_DNS_FILE
fi
done < $LOCAL_HOSTNAME_FILE
if [ $INT_DNS_DOMAIN == "localdomain" ]
then
echo -e "\tlocal-zone: \"$INT_DNS_DOMAIN\" static" >> $LOCAL_DNS_FILE # Don't forward this local zone
fi
}
 
case $args in
/scripts/alcasar-rpm-download.sh
8,10 → 8,10
# récupération des RPM nécessaires dans un fichier tarball
# retrieve needed RPM in a tarball file
 
VERSION="7"
VERSION="8"
ARCH="x86_64"
# The kernel version we compile netflow for
KERNEL="kernel-server-5.10.46-1.mga7-1-1.mga7"
KERNEL="kernel-server-5.15.74-1.mga8-1-1.mga8"
# ****** Alcasar needed RPMS - paquetages nécessaires au fonctionnement d'Alcasar ******
# (old) perl-Socket6 : needed by nfsen
# "fonts-dejavu-common" & "fonts-ttf-dejavu" : fonts needed by wkhtmltopdf
/scripts/alcasar-rpm.sh
12,7 → 12,7
VERSION="8"
ARCH="x86_64"
# The kernel version we compile netflow for
KERNEL="kernel-server-5.15.65-1.mga8-1-1.mga8"
KERNEL="kernel-server-5.15.74-1.mga8-1-1.mga8"
# ****** Alcasar needed RPMS - paquetages nécessaires au fonctionnement d'Alcasar ******
# (old) perl-Socket6 : needed by nfsen
# "fonts-dejavu-common" & "fonts-ttf-dejavu" : fonts needed by wkhtmltopdf
/web/intercept.php
444,16 → 444,13
//thanks to http://www.stochasticgeometry.ie/2009/09/09/maximum-password-length-in-coova-chilli/
$hexchal = pack('H*', $challenge);
$newchal = pack('H*', hash('sha256',$hexchal . $uamsecret));
 
// If challenge isn't long enough, repeat it until it is
while (strlen($newchal) < strlen($password)) {
$newchal .= $newchal;
}
 
$newpwd = pack('a*', $password);
// Encode plain text password with challenge
$pappassword = implode('', unpack('H*', ($newpwd ^ $newchal)));
 
header("Location: $uamproto://$uamip:$uamport/logon?username=$username&password=$pappassword&userurl=$userurl");
exit();
}