* [PATCH 2/9] samba.cgi: remove unsupported DISPLAY CHARSET
2020-10-05 20:17 [PATCH 1/9] samba.cgi: remove unsupported security = share Arne Fitzenreiter
@ 2020-10-05 20:17 ` Arne Fitzenreiter
2020-10-05 20:17 ` [PATCH 3/9] samba: default.global: remove unsuppoted "map to guest = false" Arne Fitzenreiter
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Arne Fitzenreiter @ 2020-10-05 20:17 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2655 bytes --]
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
---
html/cgi-bin/samba.cgi | 4 ----
1 file changed, 4 deletions(-)
diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index 8f88bc728..151283e7f 100644
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -97,7 +97,6 @@ $sambasettings{'SYSLOGLEVEL'} = '1';
$sambasettings{'SYSLOGONLY'} = 'on';
$sambasettings{'DOSCHARSET'} = 'CP850';
$sambasettings{'UNIXCHARSET'} = 'UTF8';
-$sambasettings{'DISPLAYCHARSET'} = 'CP850';
$sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_RCVBUF=819200 SO_SNDBUF=819200 SO_KEEPALIVE';
$sambasettings{'WIDELINKS'} = 'on';
$sambasettings{'UNIXEXTENSION'} = 'off';
@@ -169,7 +168,6 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes')
$sambasettings{'SYSLOGONLY'} = 'on';
$sambasettings{'DOSCHARSET'} = 'CP850';
$sambasettings{'UNIXCHARSET'} = 'UTF8';
- $sambasettings{'DISPLAYCHARSET'} = 'CP850';
### Samba CUPS Variablen
$sambasettings{'LOADPRINTERS'} = 'Yes';
$sambasettings{'PRINTING'} = 'cups';
@@ -301,7 +299,6 @@ map to guest = $sambasettings{'MAPTOGUEST'}
smb ports = 445 139
dos charset = $sambasettings{'DOSCHARSET'}
unix charset = $sambasettings{'UNIXCHARSET'}
-display charset = $sambasettings{'DISPLAYCHARSET'}
security = $sambasettings{'SECURITY'}
encrypt passwords = yes
@@ -488,7 +485,6 @@ print <<END
<tr><td align='left' width='40%'>$Lang::tr{'netbios name'}</td><td align='left'><input type='text' name='NETBIOSNAME' value='$sambasettings{'NETBIOSNAME'}' size="30" /></td></tr>
<tr><td align='left' width='40%'>$Lang::tr{'dos charset'}</td><td align='left'><input type='text' name='DOSCHARSET' value='$sambasettings{'DOSCHARSET'}' size="30" /></td></tr>
<tr><td align='left' width='40%'>$Lang::tr{'unix charset'}</td><td align='left'><input type='text' name='UNIXCHARSET' value='$sambasettings{'UNIXCHARSET'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'display charset'}</td><td align='left'><input type='text' name='DISPLAYCHARSET' value='$sambasettings{'DISPLAYCHARSET'}' size="30" /></td></tr>
<tr><td align='left' width='40%'>$Lang::tr{'server string'}</td><td align='left'><input type='text' name='SRVSTRING' value='$sambasettings{'SRVSTRING'}' size="30" /></td></tr>
<tr><td align='left' width='40%'>$Lang::tr{'log level'}</td><td align='left'><input type='text' name='LOGLEVEL' value='$sambasettings{'LOGLEVEL'}' size="30" /></td></tr>
<tr><td align='left' width='40%'>Sys$Lang::tr{'log level'}</td><td align='left'><input type='text' name='SYSLOGLEVEL' value='$sambasettings{'SYSLOGLEVEL'}' size="30" /></td></tr>
--
2.17.1
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 3/9] samba: default.global: remove unsuppoted "map to guest = false"
2020-10-05 20:17 [PATCH 1/9] samba.cgi: remove unsupported security = share Arne Fitzenreiter
2020-10-05 20:17 ` [PATCH 2/9] samba.cgi: remove unsupported DISPLAY CHARSET Arne Fitzenreiter
@ 2020-10-05 20:17 ` Arne Fitzenreiter
2020-10-05 20:17 ` [PATCH 4/9] samba initskript: create needed subdirs for pipes in /var/run/samba Arne Fitzenreiter
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Arne Fitzenreiter @ 2020-10-05 20:17 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 493 bytes --]
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
---
config/samba/default.global | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config/samba/default.global b/config/samba/default.global
index 48f572afd..73a0ffa3c 100644
--- a/config/samba/default.global
+++ b/config/samba/default.global
@@ -11,7 +11,7 @@ os level = 33
fstype = NTFS
kernel oplocks = false
-map to guest = false
+map to guest = bad user
smb ports = 445 139
unix charset = CP850
--
2.17.1
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 4/9] samba initskript: create needed subdirs for pipes in /var/run/samba
2020-10-05 20:17 [PATCH 1/9] samba.cgi: remove unsupported security = share Arne Fitzenreiter
2020-10-05 20:17 ` [PATCH 2/9] samba.cgi: remove unsupported DISPLAY CHARSET Arne Fitzenreiter
2020-10-05 20:17 ` [PATCH 3/9] samba: default.global: remove unsuppoted "map to guest = false" Arne Fitzenreiter
@ 2020-10-05 20:17 ` Arne Fitzenreiter
2020-10-05 20:17 ` [PATCH 5/9] perl-Parse-Yapp: add package Arne Fitzenreiter
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Arne Fitzenreiter @ 2020-10-05 20:17 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 573 bytes --]
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
---
src/initscripts/packages/samba | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/initscripts/packages/samba b/src/initscripts/packages/samba
index 614c9b834..2aab39977 100644
--- a/src/initscripts/packages/samba
+++ b/src/initscripts/packages/samba
@@ -9,9 +9,10 @@
function fix_permissions() {
local lockdir="/var/lib/samba/winbindd_privileged"
-
chmod 750 "${lockdir}"
chgrp wbpriv "${lockdir}"
+
+ mkdir -p /var/run/samba/{nmbd,ncalrpc,winbindd}
}
case "$1" in
--
2.17.1
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 5/9] perl-Parse-Yapp: add package
2020-10-05 20:17 [PATCH 1/9] samba.cgi: remove unsupported security = share Arne Fitzenreiter
` (2 preceding siblings ...)
2020-10-05 20:17 ` [PATCH 4/9] samba initskript: create needed subdirs for pipes in /var/run/samba Arne Fitzenreiter
@ 2020-10-05 20:17 ` Arne Fitzenreiter
2020-10-05 20:17 ` [PATCH 6/9] rpcsvc-proto: build before samba Arne Fitzenreiter
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Arne Fitzenreiter @ 2020-10-05 20:17 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 5322 bytes --]
samba4 depends on this perl module
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
---
config/rootfiles/packages/perl-Parse-Yapp | 15 ++++
lfs/perl-Parse-Yapp | 83 +++++++++++++++++++++++
make.sh | 1 +
3 files changed, 99 insertions(+)
create mode 100644 config/rootfiles/packages/perl-Parse-Yapp
create mode 100644 lfs/perl-Parse-Yapp
diff --git a/config/rootfiles/packages/perl-Parse-Yapp b/config/rootfiles/packages/perl-Parse-Yapp
new file mode 100644
index 000000000..853f5a33f
--- /dev/null
+++ b/config/rootfiles/packages/perl-Parse-Yapp
@@ -0,0 +1,15 @@
+usr/bin/yapp
+#usr/lib/perl5/site_perl/5.30.0/Parse
+#usr/lib/perl5/site_perl/5.30.0/Parse/Yapp
+usr/lib/perl5/site_perl/5.30.0/Parse/Yapp.pm
+usr/lib/perl5/site_perl/5.30.0/Parse/Yapp/Driver.pm
+usr/lib/perl5/site_perl/5.30.0/Parse/Yapp/Grammar.pm
+usr/lib/perl5/site_perl/5.30.0/Parse/Yapp/Lalr.pm
+usr/lib/perl5/site_perl/5.30.0/Parse/Yapp/Options.pm
+usr/lib/perl5/site_perl/5.30.0/Parse/Yapp/Output.pm
+usr/lib/perl5/site_perl/5.30.0/Parse/Yapp/Parse.pm
+#usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/auto/Parse
+#usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/auto/Parse/Yapp
+#usr/lib/perl5/site_perl/5.30.0/xxxMACHINExxx-linux-thread-multi/auto/Parse/Yapp/.packlist
+#usr/share/man/man1/yapp.1
+#usr/share/man/man3/Parse::Yapp.3
diff --git a/lfs/perl-Parse-Yapp b/lfs/perl-Parse-Yapp
new file mode 100644
index 000000000..e061b96a1
--- /dev/null
+++ b/lfs/perl-Parse-Yapp
@@ -0,0 +1,83 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+VER = 1.21
+
+THISAPP = Parse-Yapp-$(VER)
+DL_FILE = ${THISAPP}.tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = perl-Parse-Yapp
+DEPS =
+PAK_VER = 1
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 69584d5b0f0304bb2a23cffcd982c5de
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && perl Makefile.PL
+ cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 33c5de5cd..3d181a745 100755
--- a/make.sh
+++ b/make.sh
@@ -1295,6 +1295,7 @@ buildipfire() {
lfsmake2 perl-Device-SerialPort
lfsmake2 perl-Device-Modem
lfsmake2 perl-Apache-Htpasswd
+ lfsmake2 perl-Parse-Yapp
lfsmake2 gnupg
lfsmake2 hdparm
lfsmake2 sdparm
--
2.17.1
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 6/9] rpcsvc-proto: build before samba
2020-10-05 20:17 [PATCH 1/9] samba.cgi: remove unsupported security = share Arne Fitzenreiter
` (3 preceding siblings ...)
2020-10-05 20:17 ` [PATCH 5/9] perl-Parse-Yapp: add package Arne Fitzenreiter
@ 2020-10-05 20:17 ` Arne Fitzenreiter
2020-10-05 20:17 ` [PATCH 7/9] samba: remove SO_xxxBUF size definitions from default config Arne Fitzenreiter
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Arne Fitzenreiter @ 2020-10-05 20:17 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 622 bytes --]
samba4 depends on this package
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
---
make.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/make.sh b/make.sh
index 3d181a745..2dd92c4d7 100755
--- a/make.sh
+++ b/make.sh
@@ -1402,6 +1402,7 @@ buildipfire() {
lfsmake2 hplip
lfsmake2 cifs-utils
lfsmake2 krb5
+ lfsmake2 rpcsvc-proto
lfsmake2 samba
lfsmake2 netatalk
lfsmake2 sudo
@@ -1438,7 +1439,6 @@ buildipfire() {
lfsmake2 rsync
lfsmake2 rpcbind
lfsmake2 keyutils
- lfsmake2 rpcsvc-proto
lfsmake2 libnfsidmap
lfsmake2 nfs
lfsmake2 gnu-netcat
--
2.17.1
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 7/9] samba: remove SO_xxxBUF size definitions from default config
2020-10-05 20:17 [PATCH 1/9] samba.cgi: remove unsupported security = share Arne Fitzenreiter
` (4 preceding siblings ...)
2020-10-05 20:17 ` [PATCH 6/9] rpcsvc-proto: build before samba Arne Fitzenreiter
@ 2020-10-05 20:17 ` Arne Fitzenreiter
2020-10-05 20:17 ` [PATCH 9/9] libtalloc: add new package because samba4 not provide this anymore Arne Fitzenreiter
2020-10-06 12:24 ` [PATCH 1/9] samba.cgi: remove unsupported security = share Michael Tremer
7 siblings, 0 replies; 9+ messages in thread
From: Arne Fitzenreiter @ 2020-10-05 20:17 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 1792 bytes --]
this option is not recommended for samba4
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
---
config/samba/default.global | 2 +-
html/cgi-bin/samba.cgi | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/config/samba/default.global b/config/samba/default.global
index 73a0ffa3c..5a6a81729 100644
--- a/config/samba/default.global
+++ b/config/samba/default.global
@@ -23,7 +23,7 @@ null passwords = yes
bind interfaces only = true
interfaces = green0 127.0.0.1
-socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 SO_KEEPALIVE
+socket options = TCP_NODELAY SO_KEEPALIVE
username level = 1
wins support = true
diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index 151283e7f..d88a2ee47 100644
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -97,7 +97,7 @@ $sambasettings{'SYSLOGLEVEL'} = '1';
$sambasettings{'SYSLOGONLY'} = 'on';
$sambasettings{'DOSCHARSET'} = 'CP850';
$sambasettings{'UNIXCHARSET'} = 'UTF8';
-$sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_RCVBUF=819200 SO_SNDBUF=819200 SO_KEEPALIVE';
+$sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_KEEPALIVE';
$sambasettings{'WIDELINKS'} = 'on';
$sambasettings{'UNIXEXTENSION'} = 'off';
$sambasettings{'SMB2'} = 'on';
@@ -180,7 +180,7 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes')
$sambasettings{'LOCALMASTER'} = 'off';
$sambasettings{'DOMAINMASTER'} = 'off';
$sambasettings{'PREFERREDMASTER'} = 'off';
- $sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_RCVBUF=819200 SO_SNDBUF=819200 SO_KEEPALIVE';
+ $sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_KEEPALIVE';
$sambasettings{'WIDELINKS'} = 'on';
$sambasettings{'UNIXEXTENSION'} = 'off';
$sambasettings{'SMB2'} = 'on';
--
2.17.1
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 9/9] libtalloc: add new package because samba4 not provide this anymore
2020-10-05 20:17 [PATCH 1/9] samba.cgi: remove unsupported security = share Arne Fitzenreiter
` (5 preceding siblings ...)
2020-10-05 20:17 ` [PATCH 7/9] samba: remove SO_xxxBUF size definitions from default config Arne Fitzenreiter
@ 2020-10-05 20:17 ` Arne Fitzenreiter
2020-10-06 12:24 ` [PATCH 1/9] samba.cgi: remove unsupported security = share Michael Tremer
7 siblings, 0 replies; 9+ messages in thread
From: Arne Fitzenreiter @ 2020-10-05 20:17 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 8552 bytes --]
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
---
config/rootfiles/packages/aarch64/libtalloc | 14 ++++
config/rootfiles/packages/armv5tel/libtalloc | 14 ++++
config/rootfiles/packages/i586/libtalloc | 14 ++++
config/rootfiles/packages/x86_64/libtalloc | 14 ++++
lfs/freeradius | 4 +-
lfs/libtalloc | 84 ++++++++++++++++++++
make.sh | 1 +
7 files changed, 143 insertions(+), 2 deletions(-)
create mode 100644 config/rootfiles/packages/aarch64/libtalloc
create mode 100644 config/rootfiles/packages/armv5tel/libtalloc
create mode 100644 config/rootfiles/packages/i586/libtalloc
create mode 100644 config/rootfiles/packages/x86_64/libtalloc
create mode 100644 lfs/libtalloc
diff --git a/config/rootfiles/packages/aarch64/libtalloc b/config/rootfiles/packages/aarch64/libtalloc
new file mode 100644
index 000000000..2e8a0e654
--- /dev/null
+++ b/config/rootfiles/packages/aarch64/libtalloc
@@ -0,0 +1,14 @@
+#usr/local/include/pytalloc.h
+#usr/local/include/talloc.h
+#usr/local/lib/libpytalloc-util.cpython-38-aarch64-linux-gnu.so
+#usr/local/lib/libpytalloc-util.cpython-38-aarch64-linux-gnu.so.2
+#usr/local/lib/libpytalloc-util.cpython-38-aarch64-linux-gnu.so.2.3.1
+usr/local/lib/libtalloc.so
+usr/local/lib/libtalloc.so.2
+usr/local/lib/libtalloc.so.2.3.1
+#usr/local/lib/pkgconfig
+#usr/local/lib/pkgconfig/pytalloc-util.cpython-38-aarch64-linux-gnu.pc
+#usr/local/lib/pkgconfig/talloc.pc
+#usr/local/lib/python3.8
+#usr/local/lib/python3.8/site-packages
+#usr/local/lib/python3.8/site-packages/talloc.cpython-38-aarch64-linux-gnu.so
diff --git a/config/rootfiles/packages/armv5tel/libtalloc b/config/rootfiles/packages/armv5tel/libtalloc
new file mode 100644
index 000000000..0b7e96b54
--- /dev/null
+++ b/config/rootfiles/packages/armv5tel/libtalloc
@@ -0,0 +1,14 @@
+#usr/local/include/pytalloc.h
+#usr/local/include/talloc.h
+#usr/local/lib/libpytalloc-util.cpython-38-arm-linux-gnu.so
+#usr/local/lib/libpytalloc-util.cpython-38-arm-linux-gnu.so.2
+#usr/local/lib/libpytalloc-util.cpython-38-arm-linux-gnu.so.2.3.1
+usr/local/lib/libtalloc.so
+usr/local/lib/libtalloc.so.2
+usr/local/lib/libtalloc.so.2.3.1
+#usr/local/lib/pkgconfig
+#usr/local/lib/pkgconfig/pytalloc-util.cpython-38-arm-linux-gnu.pc
+#usr/local/lib/pkgconfig/talloc.pc
+#usr/local/lib/python3.8
+#usr/local/lib/python3.8/site-packages
+#usr/local/lib/python3.8/site-packages/talloc.cpython-38-arm-linux-gnu.so
diff --git a/config/rootfiles/packages/i586/libtalloc b/config/rootfiles/packages/i586/libtalloc
new file mode 100644
index 000000000..145a3b7f1
--- /dev/null
+++ b/config/rootfiles/packages/i586/libtalloc
@@ -0,0 +1,14 @@
+#usr/local/include/pytalloc.h
+#usr/local/include/talloc.h
+#usr/local/lib/libpytalloc-util.cpython-38-i386-linux-gnu.so
+#usr/local/lib/libpytalloc-util.cpython-38-i386-linux-gnu.so.2
+#usr/local/lib/libpytalloc-util.cpython-38-i386-linux-gnu.so.2.3.1
+usr/local/lib/libtalloc.so
+usr/local/lib/libtalloc.so.2
+usr/local/lib/libtalloc.so.2.3.1
+#usr/local/lib/pkgconfig
+#usr/local/lib/pkgconfig/pytalloc-util.cpython-38-i386-linux-gnu.pc
+#usr/local/lib/pkgconfig/talloc.pc
+#usr/local/lib/python3.8
+#usr/local/lib/python3.8/site-packages
+#usr/local/lib/python3.8/site-packages/talloc.cpython-38-i386-linux-gnu.so
diff --git a/config/rootfiles/packages/x86_64/libtalloc b/config/rootfiles/packages/x86_64/libtalloc
new file mode 100644
index 000000000..3a03933c9
--- /dev/null
+++ b/config/rootfiles/packages/x86_64/libtalloc
@@ -0,0 +1,14 @@
+#usr/local/include/pytalloc.h
+#usr/local/include/talloc.h
+#usr/local/lib/libpytalloc-util.cpython-38-x86_64-linux-gnu.so
+#usr/local/lib/libpytalloc-util.cpython-38-x86_64-linux-gnu.so.2
+#usr/local/lib/libpytalloc-util.cpython-38-x86_64-linux-gnu.so.2.3.1
+usr/local/lib/libtalloc.so
+usr/local/lib/libtalloc.so.2
+usr/local/lib/libtalloc.so.2.3.1
+#usr/local/lib/pkgconfig
+#usr/local/lib/pkgconfig/pytalloc-util.cpython-38-x86_64-linux-gnu.pc
+#usr/local/lib/pkgconfig/talloc.pc
+#usr/local/lib/python3.8
+#usr/local/lib/python3.8/site-packages
+#usr/local/lib/python3.8/site-packages/talloc.cpython-38-x86_64-linux-gnu.so
diff --git a/lfs/freeradius b/lfs/freeradius
index 3453d8e4d..08cf946c6 100644
--- a/lfs/freeradius
+++ b/lfs/freeradius
@@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = freeradius
-PAK_VER = 10
+PAK_VER = 11
-DEPS = samba
+DEPS = libtalloc
ifeq "$(BUILD_ARCH)" "armv5tel"
LDFLAGS += -latomic
diff --git a/lfs/libtalloc b/lfs/libtalloc
new file mode 100644
index 000000000..098290d7f
--- /dev/null
+++ b/lfs/libtalloc
@@ -0,0 +1,84 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 2.3.1
+
+THISAPP = talloc-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = libtalloc
+PAK_VER = 1
+
+DEPS =
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = ce40593428c0de6b85946189dcc37b5e
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ $(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 2dd92c4d7..83cf974d9 100755
--- a/make.sh
+++ b/make.sh
@@ -1621,6 +1621,7 @@ buildipfire() {
lfsmake2 libpciaccess
lfsmake2 libyajl
lfsmake2 libvirt
+ lfsmake2 libtalloc
lfsmake2 freeradius
lfsmake2 perl-common-sense
lfsmake2 perl-inotify2
--
2.17.1
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH 1/9] samba.cgi: remove unsupported security = share
2020-10-05 20:17 [PATCH 1/9] samba.cgi: remove unsupported security = share Arne Fitzenreiter
` (6 preceding siblings ...)
2020-10-05 20:17 ` [PATCH 9/9] libtalloc: add new package because samba4 not provide this anymore Arne Fitzenreiter
@ 2020-10-06 12:24 ` Michael Tremer
7 siblings, 0 replies; 9+ messages in thread
From: Michael Tremer @ 2020-10-06 12:24 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2053 bytes --]
Hi,
I merged the whole patchset, but I would like to know how we are going to migrate any existing installations?
-Michael
> On 5 Oct 2020, at 21:17, Arne Fitzenreiter <arne_f(a)ipfire.org> wrote:
>
> Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
> ---
> html/cgi-bin/samba.cgi | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
> index 696cb1b70..8f88bc728 100644
> --- a/html/cgi-bin/samba.cgi
> +++ b/html/cgi-bin/samba.cgi
> @@ -78,7 +78,7 @@ $sambasettings{'WORKGRP'} = 'homeip.net';
> $sambasettings{'NETBIOSNAME'} = 'IPFire';
> $sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.x';
> $sambasettings{'INTERFACES'} = '';
> -$sambasettings{'SECURITY'} = 'share';
> +$sambasettings{'SECURITY'} = 'user';
> $sambasettings{'OSLEVEL'} = '33';
> $sambasettings{'GREEN'} = 'on';
> $sambasettings{'BLUE'} = 'off';
> @@ -150,7 +150,7 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes')
> $sambasettings{'NETBIOSNAME'} = 'IPFire';
> $sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.x';
> $sambasettings{'INTERFACES'} = '';
> - $sambasettings{'SECURITY'} = 'share';
> + $sambasettings{'SECURITY'} = 'user';
> $sambasettings{'OSLEVEL'} = '65';
> $sambasettings{'GREEN'} = 'on';
> $sambasettings{'BLUE'} = 'off';
> @@ -535,7 +535,6 @@ print <<END
> <tr><td align='left'><br /></td><td></td></tr>
> <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'security options'}</b></td></tr>
> <tr><td align='left' width='40%'>$Lang::tr{'security'}</td><td align='left'><select name='SECURITY' style="width: 165px">
> - <option value='share' $selected{'SECURITY'}{'share'}>Share</option>
> <option value='user' $selected{'SECURITY'}{'user'}>User</option>
> <option value='domain' $selected{'SECURITY'}{'domain'}>Domain</option>
> <option value='ADS' $selected{'SECURITY'}{'ADS'}>ADS</option>
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 9+ messages in thread