Development May 2021

development@lists.ipfire.org

18 participants
107 discussions

Is squidclamav planned to be removed as an addon?
by Adolf Belka 19 May '21

19 May '21

Hi All, I found that the squidclamav addon is version 5.11 from 2012. The latest version available is 7.1 from 2019. However I just want to check if squidclamav is one of the addons that is planned to be removed. If it is then I will not do an update. If it will be staying then I will do an update build and submit the patch. Regards, Adolf.

2 1

[PATCH 1/4] Drop libupnp
by Peter Müller 18 May '21

18 May '21

This library has received no attention within the last three years. By design, UPnP is a security risk on any firewall, and and outdated version of a UPnP library definitely is. This patch therefore drops libupnp completely. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- config/rootfiles/common/libupnp | 37 --------------- config/upnp/gatedesc.xml | 81 --------------------------------- lfs/configroot | 4 +- lfs/libupnp | 78 ------------------------------- make.sh | 1 - 5 files changed, 2 insertions(+), 199 deletions(-) delete mode 100644 config/rootfiles/common/libupnp delete mode 100755 config/upnp/gatedesc.xml delete mode 100644 lfs/libupnp diff --git a/config/rootfiles/common/libupnp b/config/rootfiles/common/libupnp deleted file mode 100644 index 6b3f3e310..000000000 --- a/config/rootfiles/common/libupnp +++ /dev/null @@ -1,37 +0,0 @@ -#usr/include/upnp -#usr/include/upnp/Callback.h -#usr/include/upnp/UpnpActionComplete.h -#usr/include/upnp/UpnpActionRequest.h -#usr/include/upnp/UpnpDiscovery.h -#usr/include/upnp/UpnpEvent.h -#usr/include/upnp/UpnpEventSubscribe.h -#usr/include/upnp/UpnpExtraHeaders.h -#usr/include/upnp/UpnpFileInfo.h -#usr/include/upnp/UpnpGlobal.h -#usr/include/upnp/UpnpInet.h -#usr/include/upnp/UpnpIntTypes.h -#usr/include/upnp/UpnpStateVarComplete.h -#usr/include/upnp/UpnpStateVarRequest.h -#usr/include/upnp/UpnpStdInt.h -#usr/include/upnp/UpnpString.h -#usr/include/upnp/UpnpSubscriptionRequest.h -#usr/include/upnp/UpnpUniStd.h -#usr/include/upnp/ithread.h -#usr/include/upnp/ixml.h -#usr/include/upnp/ixmldebug.h -#usr/include/upnp/list.h -#usr/include/upnp/upnp.h -#usr/include/upnp/upnpconfig.h -#usr/include/upnp/upnpdebug.h -#usr/include/upnp/upnptools.h -#usr/lib/libixml.a -#usr/lib/libixml.la -#usr/lib/libixml.so -usr/lib/libixml.so.11 -usr/lib/libixml.so.11.0.1 -#usr/lib/libupnp.a -#usr/lib/libupnp.la -#usr/lib/libupnp.so -usr/lib/libupnp.so.17 -usr/lib/libupnp.so.17.0.6 -#usr/lib/pkgconfig/libupnp.pc diff --git a/config/upnp/gatedesc.xml b/config/upnp/gatedesc.xml deleted file mode 100755 index a0608bb53..000000000 --- a/config/upnp/gatedesc.xml +++ /dev/null @@ -1,81 +0,0 @@ -<?xml version="1.0"?> -<root xmlns="urn:schemas-upnp-org:device-1-0"> - <specVersion> - <major>1</major> - <minor>0</minor> - </specVersion> - <device> - <deviceType>urn:schemas-upnp-org:device:InternetGatewayDevice:1</deviceType> - <friendlyName>IPFire UPnP Device</friendlyName> - <manufacturer>IPFire Project</manufacturer> - <manufacturerURL>http://www.ipfire.org</manufacturerURL> - <modelName>IPFire 2.3</modelName> - <UDN>uuid:75802409-bccb-40e7-8e6c-fa095ecce13e</UDN> - <iconList> - <icon> - <mimetype>image/gif</mimetype> - <width>118</width> - <height>119</height> - <depth>8</depth> - <url>/ligd.gif</url> - </icon> - </iconList> - <serviceList> - <service> - <serviceType>urn:schemas-dummy-com:service:Dummy:1</serviceType> - <serviceId>urn:dummy-com:serviceId:dummy1</serviceId> - <controlURL>/dummy</controlURL> - <eventSubURL>/dummy</eventSubURL> - <SCPDURL>/dummy.xml</SCPDURL> - </service> - </serviceList> - <deviceList> - <device> - <deviceType>urn:schemas-upnp-org:device:WANDevice:1</deviceType> - <friendlyName>WANDevice</friendlyName> - <manufacturer>IPFire Project</manufacturer> - <manufacturerURL>http://www.ipfire.org</manufacturerURL> - <modelDescription>WAN Device on Linux IGD</modelDescription> - <modelName>IPFire</modelName> - <modelNumber>2.3</modelNumber> - <modelURL>http://linux-igd.sourceforge.net</modelURL> - <serialNumber>2.3</serialNumber> - <UDN>uuid:75802409-bccb-40e7-8e6c-fa095ecce13e</UDN> - <UPC>Linux IGD</UPC> - <serviceList> - <service> - <serviceType>urn:schemas-upnp-org:service:WANCommonInterfaceConfig:1</serviceType> - <serviceId>urn:upnp-org:serviceId:WANCommonIFC1</serviceId> - <controlURL>/upnp/control/WANCommonIFC1</controlURL> - <eventSubURL>/upnp/control/WANCommonIFC1</eventSubURL> - <SCPDURL>/gateicfgSCPD.xml</SCPDURL> - </service> - </serviceList> - <deviceList> - <device> - <deviceType>urn:schemas-upnp-org:device:WANConnectionDevice:1</deviceType> - <friendlyName>Internet Connection</friendlyName> - <manufacturer>IPFire Project</manufacturer> - <manufacturerURL>http://www.ipfire.org</manufacturerURL> - <modelDescription>Internet connection on Linux IPFire Firewall</modelDescription> - <modelName>IPFire</modelName> - <modelNumber>2.3</modelNumber> - <modelURL>http://www.ipfire.org</modelURL> - <serialNumber>2.3</serialNumber> - <UDN>uuid:75802409-bccb-40e7-8e6c-fa095ecce13e</UDN> - <UPC>Linux IGD</UPC> - <serviceList> - <service> - <serviceType>urn:schemas-upnp-org:service:WANIPConnection:1</serviceType> - <serviceId>urn:upnp-org:serviceId:WANIPConn1</serviceId> - <controlURL>/upnp/control/WANIPConn1</controlURL> - <eventSubURL>/upnp/control/WANIPConn1</eventSubURL> - <SCPDURL>/gateconnSCPD.xml</SCPDURL> - </service> - </serviceList> - </device> - </deviceList> - </device> - </deviceList> - </device> -</root> diff --git a/lfs/configroot b/lfs/configroot index a3e474d70..2ab9cc29b 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -55,7 +55,7 @@ $(TARGET) : menu.d modem optionsfw \ ovpn patches pakfire portfw ppp private proxy/advanced/cre \ proxy/calamaris/bin qos/bin red remote sensors suricata time \ - updatexlrator/bin updatexlrator/autocheck urlfilter/autoupdate urlfilter/bin upnp vpn \ + updatexlrator/bin updatexlrator/autocheck urlfilter/autoupdate urlfilter/bin vpn \ wakeonlan wireless ; do \ mkdir -p $(CONFIG_ROOT)/$$i; \ done @@ -69,7 +69,7 @@ $(TARGET) : isdn/settings mac/settings main/hosts main/routing main/security main/settings optionsfw/settings \ ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \ ppp/settings-5 ppp/settings proxy/settings proxy/squid.conf proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \ - qos/tosconfig suricata/settings upnp/settings vpn/config vpn/settings vpn/ipsec.conf \ + qos/tosconfig suricata/settings vpn/config vpn/settings vpn/ipsec.conf \ vpn/ipsec.secrets vpn/caconfig wakeonlan/clients.conf wireless/config wireless/settings; do \ touch $(CONFIG_ROOT)/$$i; \ done diff --git a/lfs/libupnp b/lfs/libupnp deleted file mode 100644 index 61856ff7b..000000000 --- a/lfs/libupnp +++ /dev/null @@ -1,78 +0,0 @@ -############################################################################### -# # -# 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 = 1.14.6 - -THISAPP = libupnp-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 05c2393eee4fbf81c9e1b116b9554039 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# 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 jxf $(DIR_DL)/$(DL_FILE) - $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && ./configure --prefix=/usr - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 4af0081e9..9fba3977d 100755 --- a/make.sh +++ b/make.sh @@ -1306,7 +1306,6 @@ buildipfire() { lfsmake2 whatmask lfsmake2 libtirpc lfsmake2 conntrack-tools - lfsmake2 libupnp lfsmake2 ipaddr lfsmake2 iputils lfsmake2 l7-protocols -- 2.26.2

1 3

[PATCH] config/elinks/elinks.conf does not have to be executable
by Peter Müller 18 May '21

18 May '21

Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- config/elinks/elinks.conf | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 config/elinks/elinks.conf diff --git a/config/elinks/elinks.conf b/config/elinks/elinks.conf old mode 100755 new mode 100644 -- 2.26.2

1 0

[PATCH v2] sarg: Update to 2.4.0
by Adolf Belka 18 May '21

18 May '21

- Update from 2.3.11 to 2.4.0 - Update of rootfile not required - Update of patches as the source code is different enough that the patches failed to work. - Changelog has information on changes for version 2.4.0. Prior version information is for 2.3.3 from 2012. All intervening versions have no changelog information available. Version 2.4.0 - Update translations. - Useragent report is produced if information is available. - Don't abort if DNS resolution is failing to resolve a host IP address. - xz compressed log files are supported. - Compressed redirector logs are now supported. - Filter converted and split logs using -t command line option. - Add many new buffer overflow checks. - Use random temporary directory name by default. - Many bug fixed. - Many new features added. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- lfs/sarg | 13 +++--- src/patches/sarg/sarg-2.3.11-format.patch | 45 ------------------- ...igure.patch => sarg-2.4.0-configure.patch} | 26 +++++------ src/patches/sarg/sarg-2.4.0-format.patch | 33 ++++++++++++++ 4 files changed, 49 insertions(+), 68 deletions(-) delete mode 100644 src/patches/sarg/sarg-2.3.11-format.patch rename src/patches/sarg/{sarg-2.3.11-configure.patch => sarg-2.4.0-configure.patch} (66%) create mode 100644 src/patches/sarg/sarg-2.4.0-format.patch diff --git a/lfs/sarg b/lfs/sarg index 697ce7513..6a8b52e6c 100644 --- a/lfs/sarg +++ b/lfs/sarg @@ -24,7 +24,7 @@ include Config -VER = 2.3.11 +VER = 2.4.0 THISAPP = sarg-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = sarg -PAK_VER = 4 +PAK_VER = 5 DEPS = @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8e30d86b16597aec89ad401c72c761bc +$(DL_FILE)_MD5 = 1b84509c1a0d55d46148bd957744870f install : $(TARGET) @@ -81,14 +81,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/sarg/sarg-2.3.11-format.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/sarg/sarg-2.3.11-configure.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/sarg/sarg-2.4.0-format.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/sarg/sarg-2.4.0-configure.patch cd $(DIR_APP) && autoreconf -vfi - # Update gettext Makefile - cd $(DIR_APP) && cp -vf /usr/share/gettext/po/Makefile.in.in po/Makefile.in.in - cd $(DIR_APP) && ./configure \ --prefix=/usr \ --sysconfdir=/etc/sarg diff --git a/src/patches/sarg/sarg-2.3.11-format.patch b/src/patches/sarg/sarg-2.3.11-format.patch deleted file mode 100644 index d8ed22028..000000000 --- a/src/patches/sarg/sarg-2.3.11-format.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -wbBur sarg-2.3.11/index.c sarg-2.3.11.my/index.c ---- sarg-2.3.11/index.c 2018-01-14 21:00:22.000000000 +0300 -+++ sarg-2.3.11.my/index.c 2018-02-19 12:20:15.896203347 +0300 -@@ -208,7 +208,7 @@ - m1=month / 16; - if(month % 16 != 0) { - m2=month % 16; -- sprintf(monthnum,"%02d-%02d",m1,m2); -+ sprintf(monthnum,"%02u-%02u",(unsigned int)m1,(unsigned int)m2); - sprintf(monthname1,"%02d",m1); - sprintf(monthname2,"%02d",m2); - name_month(monthname1,sizeof(monthname1)); -@@ -269,7 +269,7 @@ - d1=day / 32; - if(day % 32 != 0) { - d2=day % 32; -- sprintf(daynum,"%02d-%02d",d1,d2); -+ sprintf(daynum,"%02u-%02u",(unsigned int)d1,(unsigned int)d2); - } else { - sprintf(daynum,"%02d",d1); - } -diff -wbBur sarg-2.3.11/report.c sarg-2.3.11.my/report.c ---- sarg-2.3.11/report.c 2018-01-14 21:00:23.000000000 +0300 -+++ sarg-2.3.11.my/report.c 2018-02-19 12:18:45.151207192 +0300 -@@ -54,7 +54,7 @@ - char accsmart[MAXLEN]; - char crc2[MAXLEN/2 -1]; - char siteind[MAX_TRUNCATED_URL]; -- char arqtt[256]; -+ char arqtt[267]; - char *oldurltt=NULL; - char oldaccdiatt[11],oldacchoratt[9]; - char tmp3[MAXLEN]; -diff -wbBur sarg-2.3.11/userinfo.c sarg-2.3.11.my/userinfo.c ---- sarg-2.3.11/userinfo.c 2013-06-01 22:02:04.000000000 +0400 -+++ sarg-2.3.11.my/userinfo.c 2018-02-19 12:21:16.103200796 +0300 -@@ -67,7 +67,7 @@ - int skip; - int flen; - int count, clen; -- char cstr[9]; -+ char cstr[11]; - - last=NULL; - for (group=first_user_group ; group ; group=group->next) { diff --git a/src/patches/sarg/sarg-2.3.11-configure.patch b/src/patches/sarg/sarg-2.4.0-configure.patch similarity index 66% rename from src/patches/sarg/sarg-2.3.11-configure.patch rename to src/patches/sarg/sarg-2.4.0-configure.patch index ca9695595..ff40d81f1 100644 --- a/src/patches/sarg/sarg-2.3.11-configure.patch +++ b/src/patches/sarg/sarg-2.4.0-configure.patch @@ -1,8 +1,8 @@ ---- sarg-2.3.11/configure.ac~ 2019-04-26 22:34:33.499022406 +0000 -+++ sarg-2.3.11/configure.ac 2019-04-26 22:35:11.886556020 +0000 -@@ -29,35 +29,6 @@ +--- sarg-2.4.0/configure.ac.orig 2020-01-16 12:24:11.000000000 +0100 ++++ sarg-2.4.0/configure.ac 2021-04-24 14:16:03.677756214 +0200 +@@ -38,31 +38,6 @@ # Report more warnings to improve code quality. - CFLAGS="${CFLAGS} -Wall -Wno-sign-compare" + CFLAGS="${CFLAGS} -Wall" -dnl Check for supported compiler options - @@ -11,28 +11,24 @@ -CFLAGS="${CFLAGS} -Wextra -Wno-unused-parameter" -AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_extra_warnings="yes"],[have_extra_warnings="no"]) -AC_MSG_RESULT($have_extra_warnings) --if test "$have_extra_warnings" = "no" ; then -- CFLAGS="${saved_CFLAGS}" --fi +-AS_IF([test "$have_extra_warnings" = "no"],[CFLAGS="${saved_CFLAGS}"]) +- +-# Don't compare signs as it is a mess +-CFLAGS="${CFLAGS} -Wno-sign-compare" - -AC_MSG_CHECKING([for implicit-function-declaration error flag in $CC]) -saved_CFLAGS="${CFLAGS}" -CFLAGS="${CFLAGS} -Werror=implicit-function-declaration" -AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_implicit_function_declaration="yes"],[have_implicit_function_declaration="no"]) -AC_MSG_RESULT($have_implicit_function_declaration) --if test "$have_implicit_function_declaration" = "no" ; then -- CFLAGS="${saved_CFLAGS}" --fi +-AS_IF([test "$have_implicit_function_declaration" = "no"],[CFLAGS="${saved_CFLAGS}"]) - -AC_MSG_CHECKING([for format error flag in $CC]) -saved_CFLAGS="${CFLAGS}" -CFLAGS="${CFLAGS} -Werror=format" -AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_error_format="yes"],[have_error_format="no"]) -AC_MSG_RESULT($have_error_format) --if test "$have_error_format" = "no" ; then -- CFLAGS="${saved_CFLAGS}" --fi -- +-AS_IF([test "$have_error_format" = "no"],[CFLAGS="${saved_CFLAGS}"]) + case "$host" in *-solaris*) - LDFLAGS="${LDFLAGS} -lsocket -lnsl" diff --git a/src/patches/sarg/sarg-2.4.0-format.patch b/src/patches/sarg/sarg-2.4.0-format.patch new file mode 100644 index 000000000..1d1ac1e4c --- /dev/null +++ b/src/patches/sarg/sarg-2.4.0-format.patch @@ -0,0 +1,33 @@ +diff -Naur sarg-2.4.0.orig/index.c sarg-2.4.0/index.c +--- sarg-2.4.0.orig/index.c 2019-12-24 12:04:00.000000000 +0100 ++++ sarg-2.4.0/index.c 2021-04-24 14:09:57.779097194 +0200 +@@ -325,7 +325,7 @@ + d1=(day >> 5) & 0x1F; + if ((day & 0x1F) != 0) { + d2=day & 0x1F; +- snprintf(daynum,sizeof(daynum),"%02d-%02d",d1,d2); ++ snprintf(daynum,sizeof(daynum),"%02u-%02u",(unsigned int)d1,(unsigned int)d2); + } else { + snprintf(daynum,sizeof(daynum),"%02d",d1); + } +@@ -485,7 +485,7 @@ + m1=(month >> 4) & 0x0F; + if ((month & 0x0F) != 0) { + m2=month & 0x0F; +- snprintf(monthnum,sizeof(monthnum),"%02d-%02d",m1,m2); ++ snprintf(monthnum,sizeof(monthnum),"%02u-%02u",(unsigned int)m1,(unsigned int)m2); + name_month(m1,monthname1,sizeof(monthname1)); + name_month(m2,monthname2,sizeof(monthname2)); + snprintf(nmonth,sizeof(nmonth),"%s-%s",monthname1,monthname2); +diff -Naur sarg-2.4.0.orig/userinfo.c sarg-2.4.0/userinfo.c +--- sarg-2.4.0.orig/userinfo.c 2019-12-24 12:04:00.000000000 +0100 ++++ sarg-2.4.0/userinfo.c 2021-04-24 14:11:31.965734470 +0200 +@@ -78,7 +78,7 @@ + int skip; + int flen; + int count, clen; +- char cstr[9]; ++ char cstr[11]; + char filename[MAX_USER_FNAME_LEN]; + + if (!UserStrings) { -- 2.31.1

1 0

[PATCH] sarg: Update to 2.4.0
by Adolf Belka 18 May '21

18 May '21

- Update from 2.3.11 to 2.4.0 - Update of rootfile not required - Thanks to Marcel Lorenz for advice on changes to lfs needed to enable successful build of sarg-2.4.0 - Removal of old patches that are no longer needed Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- lfs/sarg | 32 ++++++-------- src/patches/sarg/sarg-2.3.11-configure.patch | 38 ----------------- src/patches/sarg/sarg-2.3.11-format.patch | 45 -------------------- 3 files changed, 13 insertions(+), 102 deletions(-) delete mode 100644 src/patches/sarg/sarg-2.3.11-configure.patch delete mode 100644 src/patches/sarg/sarg-2.3.11-format.patch diff --git a/lfs/sarg b/lfs/sarg index 697ce7513..9b8a2b763 100644 --- a/lfs/sarg +++ b/lfs/sarg @@ -24,7 +24,7 @@ include Config -VER = 2.3.11 +VER = 2.4.0 THISAPP = sarg-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,11 +32,11 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = sarg -PAK_VER = 4 +PAK_VER = 5 DEPS = -CFLAGS += -fcommon +CFLAGS += -Wno-format-truncation -Wformat-overflow=1 -fcommon ############################################################################### # Top-level Rules @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8e30d86b16597aec89ad401c72c761bc +$(DL_FILE)_MD5 = 1b84509c1a0d55d46148bd957744870f install : $(TARGET) @@ -79,23 +79,17 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - $(UPDATE_AUTOMAKE) - - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/sarg/sarg-2.3.11-format.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/sarg/sarg-2.3.11-configure.patch - - cd $(DIR_APP) && autoreconf -vfi - - # Update gettext Makefile - cd $(DIR_APP) && cp -vf /usr/share/gettext/po/Makefile.in.in po/Makefile.in.in - - cd $(DIR_APP) && ./configure \ - --prefix=/usr \ - --sysconfdir=/etc/sarg - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && make $(EXTRA_INSTALL) install + cd $(DIR_APP) && autoreconf -vi + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --sysconfdir=/etc/sarg \ + --enable-sargphp=/var/www/html/sarg-php \ + --bindir=/usr/bin + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install # Install configuration file. + mkdir -p /etc/sarg cp -v $(DIR_SRC)/config/sarg/sarg.conf /etc/sarg/sarg.conf # Install helper script. diff --git a/src/patches/sarg/sarg-2.3.11-configure.patch b/src/patches/sarg/sarg-2.3.11-configure.patch deleted file mode 100644 index ca9695595..000000000 --- a/src/patches/sarg/sarg-2.3.11-configure.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- sarg-2.3.11/configure.ac~ 2019-04-26 22:34:33.499022406 +0000 -+++ sarg-2.3.11/configure.ac 2019-04-26 22:35:11.886556020 +0000 -@@ -29,35 +29,6 @@ - # Report more warnings to improve code quality. - CFLAGS="${CFLAGS} -Wall -Wno-sign-compare" - --dnl Check for supported compiler options -- --AC_MSG_CHECKING([for extra warnings flag in $CC]) --saved_CFLAGS="${CFLAGS}" --CFLAGS="${CFLAGS} -Wextra -Wno-unused-parameter" --AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_extra_warnings="yes"],[have_extra_warnings="no"]) --AC_MSG_RESULT($have_extra_warnings) --if test "$have_extra_warnings" = "no" ; then -- CFLAGS="${saved_CFLAGS}" --fi -- --AC_MSG_CHECKING([for implicit-function-declaration error flag in $CC]) --saved_CFLAGS="${CFLAGS}" --CFLAGS="${CFLAGS} -Werror=implicit-function-declaration" --AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_implicit_function_declaration="yes"],[have_implicit_function_declaration="no"]) --AC_MSG_RESULT($have_implicit_function_declaration) --if test "$have_implicit_function_declaration" = "no" ; then -- CFLAGS="${saved_CFLAGS}" --fi -- --AC_MSG_CHECKING([for format error flag in $CC]) --saved_CFLAGS="${CFLAGS}" --CFLAGS="${CFLAGS} -Werror=format" --AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_error_format="yes"],[have_error_format="no"]) --AC_MSG_RESULT($have_error_format) --if test "$have_error_format" = "no" ; then -- CFLAGS="${saved_CFLAGS}" --fi -- - case "$host" in - *-solaris*) - LDFLAGS="${LDFLAGS} -lsocket -lnsl" diff --git a/src/patches/sarg/sarg-2.3.11-format.patch b/src/patches/sarg/sarg-2.3.11-format.patch deleted file mode 100644 index d8ed22028..000000000 --- a/src/patches/sarg/sarg-2.3.11-format.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -wbBur sarg-2.3.11/index.c sarg-2.3.11.my/index.c ---- sarg-2.3.11/index.c 2018-01-14 21:00:22.000000000 +0300 -+++ sarg-2.3.11.my/index.c 2018-02-19 12:20:15.896203347 +0300 -@@ -208,7 +208,7 @@ - m1=month / 16; - if(month % 16 != 0) { - m2=month % 16; -- sprintf(monthnum,"%02d-%02d",m1,m2); -+ sprintf(monthnum,"%02u-%02u",(unsigned int)m1,(unsigned int)m2); - sprintf(monthname1,"%02d",m1); - sprintf(monthname2,"%02d",m2); - name_month(monthname1,sizeof(monthname1)); -@@ -269,7 +269,7 @@ - d1=day / 32; - if(day % 32 != 0) { - d2=day % 32; -- sprintf(daynum,"%02d-%02d",d1,d2); -+ sprintf(daynum,"%02u-%02u",(unsigned int)d1,(unsigned int)d2); - } else { - sprintf(daynum,"%02d",d1); - } -diff -wbBur sarg-2.3.11/report.c sarg-2.3.11.my/report.c ---- sarg-2.3.11/report.c 2018-01-14 21:00:23.000000000 +0300 -+++ sarg-2.3.11.my/report.c 2018-02-19 12:18:45.151207192 +0300 -@@ -54,7 +54,7 @@ - char accsmart[MAXLEN]; - char crc2[MAXLEN/2 -1]; - char siteind[MAX_TRUNCATED_URL]; -- char arqtt[256]; -+ char arqtt[267]; - char *oldurltt=NULL; - char oldaccdiatt[11],oldacchoratt[9]; - char tmp3[MAXLEN]; -diff -wbBur sarg-2.3.11/userinfo.c sarg-2.3.11.my/userinfo.c ---- sarg-2.3.11/userinfo.c 2013-06-01 22:02:04.000000000 +0400 -+++ sarg-2.3.11.my/userinfo.c 2018-02-19 12:21:16.103200796 +0300 -@@ -67,7 +67,7 @@ - int skip; - int flen; - int count, clen; -- char cstr[9]; -+ char cstr[11]; - - last=NULL; - for (group=first_user_group ; group ; group=group->next) { -- 2.31.1

2 12

make and pakfire3 in the addon list?
by Adolf Belka 18 May '21

18 May '21

Hi All, I have noticed that make and pakfire3 are in the addon list. make does not seem a correct package to have as an addon in the same way as we don't have compilers but maybe (likely) my understanding is flawed. pakfire3 I thought was from IPFire3 so I wouldn't have expected to be in the addon list. Regards, Adolf.

2 1

[PATCH] python-docutils: Convert to python3
by Adolf Belka 18 May '21

18 May '21

- make.sh remove python-docutils move python3-docutils before python3-daemon - With python3-docutils in place before python3-daemon, python3-daemon now builds without any problems on a clean build. - Convert python3-docutils lfs from addon to core program - Remove python-docutils rootfile - Move python3-docutils rootfile from packages to common folder - awscli, distutils and setuptools are using docutils. awscli and setuptools are only using python3 version. distutils is using both python2 and python3 but as distutils has been replaced by setuptools then I will be sending in a patch to remove distutils and distutils-extra. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/common/python-docutils | 320 ------------------ .../{packages => common}/python3-docutils | 10 + lfs/python-docutils | 75 ---- lfs/python3-docutils | 10 +- make.sh | 3 +- 5 files changed, 12 insertions(+), 406 deletions(-) delete mode 100644 config/rootfiles/common/python-docutils rename config/rootfiles/{packages => common}/python3-docutils (98%) delete mode 100644 lfs/python-docutils diff --git a/config/rootfiles/common/python-docutils b/config/rootfiles/common/python-docutils deleted file mode 100644 index 45038dde2..000000000 --- a/config/rootfiles/common/python-docutils +++ /dev/null @@ -1,320 +0,0 @@ -#usr/bin/rst2html.py -#usr/bin/rst2latex.py -#usr/bin/rst2man.py -#usr/bin/rst2odt.py -#usr/bin/rst2odt_prepstyles.py -#usr/bin/rst2pseudoxml.py -#usr/bin/rst2s5.py -#usr/bin/rst2xetex.py -#usr/bin/rst2xml.py -#usr/bin/rstpep2html.py -#usr/lib/python2.7/site-packages/docutils -#usr/lib/python2.7/site-packages/docutils-0.12-py2.7.egg-info -#usr/lib/python2.7/site-packages/docutils/__init__.py -#usr/lib/python2.7/site-packages/docutils/__init__.pyc -#usr/lib/python2.7/site-packages/docutils/_compat.py -#usr/lib/python2.7/site-packages/docutils/_compat.pyc -#usr/lib/python2.7/site-packages/docutils/core.py -#usr/lib/python2.7/site-packages/docutils/core.pyc -#usr/lib/python2.7/site-packages/docutils/examples.py -#usr/lib/python2.7/site-packages/docutils/examples.pyc -#usr/lib/python2.7/site-packages/docutils/frontend.py -#usr/lib/python2.7/site-packages/docutils/frontend.pyc -#usr/lib/python2.7/site-packages/docutils/io.py -#usr/lib/python2.7/site-packages/docutils/io.pyc -#usr/lib/python2.7/site-packages/docutils/languages -#usr/lib/python2.7/site-packages/docutils/languages/__init__.py -#usr/lib/python2.7/site-packages/docutils/languages/__init__.pyc -#usr/lib/python2.7/site-packages/docutils/languages/af.py -#usr/lib/python2.7/site-packages/docutils/languages/af.pyc -#usr/lib/python2.7/site-packages/docutils/languages/ca.py -#usr/lib/python2.7/site-packages/docutils/languages/ca.pyc -#usr/lib/python2.7/site-packages/docutils/languages/cs.py -#usr/lib/python2.7/site-packages/docutils/languages/cs.pyc -#usr/lib/python2.7/site-packages/docutils/languages/da.py -#usr/lib/python2.7/site-packages/docutils/languages/da.pyc -#usr/lib/python2.7/site-packages/docutils/languages/de.py -#usr/lib/python2.7/site-packages/docutils/languages/de.pyc -#usr/lib/python2.7/site-packages/docutils/languages/en.py -#usr/lib/python2.7/site-packages/docutils/languages/en.pyc -#usr/lib/python2.7/site-packages/docutils/languages/eo.py -#usr/lib/python2.7/site-packages/docutils/languages/eo.pyc -#usr/lib/python2.7/site-packages/docutils/languages/es.py -#usr/lib/python2.7/site-packages/docutils/languages/es.pyc -#usr/lib/python2.7/site-packages/docutils/languages/fi.py -#usr/lib/python2.7/site-packages/docutils/languages/fi.pyc -#usr/lib/python2.7/site-packages/docutils/languages/fr.py -#usr/lib/python2.7/site-packages/docutils/languages/fr.pyc -#usr/lib/python2.7/site-packages/docutils/languages/gl.py -#usr/lib/python2.7/site-packages/docutils/languages/gl.pyc -#usr/lib/python2.7/site-packages/docutils/languages/he.py -#usr/lib/python2.7/site-packages/docutils/languages/he.pyc -#usr/lib/python2.7/site-packages/docutils/languages/it.py -#usr/lib/python2.7/site-packages/docutils/languages/it.pyc -#usr/lib/python2.7/site-packages/docutils/languages/ja.py -#usr/lib/python2.7/site-packages/docutils/languages/ja.pyc -#usr/lib/python2.7/site-packages/docutils/languages/lt.py -#usr/lib/python2.7/site-packages/docutils/languages/lt.pyc -#usr/lib/python2.7/site-packages/docutils/languages/nl.py -#usr/lib/python2.7/site-packages/docutils/languages/nl.pyc -#usr/lib/python2.7/site-packages/docutils/languages/pl.py -#usr/lib/python2.7/site-packages/docutils/languages/pl.pyc -#usr/lib/python2.7/site-packages/docutils/languages/pt_br.py -#usr/lib/python2.7/site-packages/docutils/languages/pt_br.pyc -#usr/lib/python2.7/site-packages/docutils/languages/ru.py -#usr/lib/python2.7/site-packages/docutils/languages/ru.pyc -#usr/lib/python2.7/site-packages/docutils/languages/sk.py -#usr/lib/python2.7/site-packages/docutils/languages/sk.pyc -#usr/lib/python2.7/site-packages/docutils/languages/sv.py -#usr/lib/python2.7/site-packages/docutils/languages/sv.pyc -#usr/lib/python2.7/site-packages/docutils/languages/zh_cn.py -#usr/lib/python2.7/site-packages/docutils/languages/zh_cn.pyc -#usr/lib/python2.7/site-packages/docutils/languages/zh_tw.py -#usr/lib/python2.7/site-packages/docutils/languages/zh_tw.pyc -#usr/lib/python2.7/site-packages/docutils/nodes.py -#usr/lib/python2.7/site-packages/docutils/nodes.pyc -#usr/lib/python2.7/site-packages/docutils/parsers -#usr/lib/python2.7/site-packages/docutils/parsers/__init__.py -#usr/lib/python2.7/site-packages/docutils/parsers/__init__.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/null.py -#usr/lib/python2.7/site-packages/docutils/parsers/null.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst -#usr/lib/python2.7/site-packages/docutils/parsers/rst/__init__.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/__init__.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives -#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives/__init__.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives/__init__.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives/admonitions.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives/admonitions.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives/body.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives/body.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives/html.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives/html.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives/images.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives/images.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives/misc.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives/misc.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives/parts.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives/parts.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives/references.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives/references.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives/tables.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/directives/tables.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst/include -#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/README.txt -#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isoamsa.txt -#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isoamsb.txt -#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isoamsc.txt -#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isoamsn.txt -#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isoamso.txt -#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isoamsr.txt -#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isobox.txt -#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isocyr1.txt -#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isocyr2.txt -#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isodia.txt -#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isogrk1.txt -#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isogrk2.txt -#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isogrk3.txt -#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isogrk4-wide.txt -#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isogrk4.txt -#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isolat1.txt -#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isolat2.txt -#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isomfrk-wide.txt -#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isomfrk.txt -#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isomopf-wide.txt -#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isomopf.txt -#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isomscr-wide.txt -#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isomscr.txt -#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isonum.txt -#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isopub.txt -#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/isotech.txt -#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/mmlalias.txt -#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/mmlextra-wide.txt -#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/mmlextra.txt -#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/s5defs.txt -#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/xhtml1-lat1.txt -#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/xhtml1-special.txt -#usr/lib/python2.7/site-packages/docutils/parsers/rst/include/xhtml1-symbol.txt -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/__init__.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/__init__.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/af.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/af.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/ca.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/ca.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/cs.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/cs.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/da.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/da.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/de.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/de.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/en.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/en.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/eo.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/eo.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/es.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/es.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/fi.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/fi.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/fr.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/fr.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/gl.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/gl.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/he.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/he.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/it.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/it.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/ja.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/ja.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/lt.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/lt.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/nl.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/nl.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/pl.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/pl.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/pt_br.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/pt_br.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/ru.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/ru.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/sk.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/sk.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/sv.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/sv.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/zh_cn.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/zh_cn.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/zh_tw.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/languages/zh_tw.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst/roles.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/roles.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst/states.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/states.pyc -#usr/lib/python2.7/site-packages/docutils/parsers/rst/tableparser.py -#usr/lib/python2.7/site-packages/docutils/parsers/rst/tableparser.pyc -#usr/lib/python2.7/site-packages/docutils/readers -#usr/lib/python2.7/site-packages/docutils/readers/__init__.py -#usr/lib/python2.7/site-packages/docutils/readers/__init__.pyc -#usr/lib/python2.7/site-packages/docutils/readers/doctree.py -#usr/lib/python2.7/site-packages/docutils/readers/doctree.pyc -#usr/lib/python2.7/site-packages/docutils/readers/pep.py -#usr/lib/python2.7/site-packages/docutils/readers/pep.pyc -#usr/lib/python2.7/site-packages/docutils/readers/standalone.py -#usr/lib/python2.7/site-packages/docutils/readers/standalone.pyc -#usr/lib/python2.7/site-packages/docutils/statemachine.py -#usr/lib/python2.7/site-packages/docutils/statemachine.pyc -#usr/lib/python2.7/site-packages/docutils/transforms -#usr/lib/python2.7/site-packages/docutils/transforms/__init__.py -#usr/lib/python2.7/site-packages/docutils/transforms/__init__.pyc -#usr/lib/python2.7/site-packages/docutils/transforms/components.py -#usr/lib/python2.7/site-packages/docutils/transforms/components.pyc -#usr/lib/python2.7/site-packages/docutils/transforms/frontmatter.py -#usr/lib/python2.7/site-packages/docutils/transforms/frontmatter.pyc -#usr/lib/python2.7/site-packages/docutils/transforms/misc.py -#usr/lib/python2.7/site-packages/docutils/transforms/misc.pyc -#usr/lib/python2.7/site-packages/docutils/transforms/parts.py -#usr/lib/python2.7/site-packages/docutils/transforms/parts.pyc -#usr/lib/python2.7/site-packages/docutils/transforms/peps.py -#usr/lib/python2.7/site-packages/docutils/transforms/peps.pyc -#usr/lib/python2.7/site-packages/docutils/transforms/references.py -#usr/lib/python2.7/site-packages/docutils/transforms/references.pyc -#usr/lib/python2.7/site-packages/docutils/transforms/universal.py -#usr/lib/python2.7/site-packages/docutils/transforms/universal.pyc -#usr/lib/python2.7/site-packages/docutils/transforms/writer_aux.py -#usr/lib/python2.7/site-packages/docutils/transforms/writer_aux.pyc -#usr/lib/python2.7/site-packages/docutils/utils -#usr/lib/python2.7/site-packages/docutils/utils/__init__.py -#usr/lib/python2.7/site-packages/docutils/utils/__init__.pyc -#usr/lib/python2.7/site-packages/docutils/utils/code_analyzer.py -#usr/lib/python2.7/site-packages/docutils/utils/code_analyzer.pyc -#usr/lib/python2.7/site-packages/docutils/utils/error_reporting.py -#usr/lib/python2.7/site-packages/docutils/utils/error_reporting.pyc -#usr/lib/python2.7/site-packages/docutils/utils/math -#usr/lib/python2.7/site-packages/docutils/utils/math/__init__.py -#usr/lib/python2.7/site-packages/docutils/utils/math/__init__.pyc -#usr/lib/python2.7/site-packages/docutils/utils/math/latex2mathml.py -#usr/lib/python2.7/site-packages/docutils/utils/math/latex2mathml.pyc -#usr/lib/python2.7/site-packages/docutils/utils/math/math2html.py -#usr/lib/python2.7/site-packages/docutils/utils/math/math2html.pyc -#usr/lib/python2.7/site-packages/docutils/utils/math/tex2unichar.py -#usr/lib/python2.7/site-packages/docutils/utils/math/tex2unichar.pyc -#usr/lib/python2.7/site-packages/docutils/utils/math/unichar2tex.py -#usr/lib/python2.7/site-packages/docutils/utils/math/unichar2tex.pyc -#usr/lib/python2.7/site-packages/docutils/utils/punctuation_chars.py -#usr/lib/python2.7/site-packages/docutils/utils/punctuation_chars.pyc -#usr/lib/python2.7/site-packages/docutils/utils/roman.py -#usr/lib/python2.7/site-packages/docutils/utils/roman.pyc -#usr/lib/python2.7/site-packages/docutils/utils/smartquotes.py -#usr/lib/python2.7/site-packages/docutils/utils/smartquotes.pyc -#usr/lib/python2.7/site-packages/docutils/utils/urischemes.py -#usr/lib/python2.7/site-packages/docutils/utils/urischemes.pyc -#usr/lib/python2.7/site-packages/docutils/writers -#usr/lib/python2.7/site-packages/docutils/writers/__init__.py -#usr/lib/python2.7/site-packages/docutils/writers/__init__.pyc -#usr/lib/python2.7/site-packages/docutils/writers/docutils_xml.py -#usr/lib/python2.7/site-packages/docutils/writers/docutils_xml.pyc -#usr/lib/python2.7/site-packages/docutils/writers/html4css1 -#usr/lib/python2.7/site-packages/docutils/writers/html4css1/__init__.py -#usr/lib/python2.7/site-packages/docutils/writers/html4css1/__init__.pyc -#usr/lib/python2.7/site-packages/docutils/writers/html4css1/html4css1.css -#usr/lib/python2.7/site-packages/docutils/writers/html4css1/math.css -#usr/lib/python2.7/site-packages/docutils/writers/html4css1/template.txt -#usr/lib/python2.7/site-packages/docutils/writers/latex2e -#usr/lib/python2.7/site-packages/docutils/writers/latex2e/__init__.py -#usr/lib/python2.7/site-packages/docutils/writers/latex2e/__init__.pyc -#usr/lib/python2.7/site-packages/docutils/writers/latex2e/default.tex -#usr/lib/python2.7/site-packages/docutils/writers/latex2e/titlepage.tex -#usr/lib/python2.7/site-packages/docutils/writers/latex2e/xelatex.tex -#usr/lib/python2.7/site-packages/docutils/writers/manpage.py -#usr/lib/python2.7/site-packages/docutils/writers/manpage.pyc -#usr/lib/python2.7/site-packages/docutils/writers/null.py -#usr/lib/python2.7/site-packages/docutils/writers/null.pyc -#usr/lib/python2.7/site-packages/docutils/writers/odf_odt -#usr/lib/python2.7/site-packages/docutils/writers/odf_odt/__init__.py -#usr/lib/python2.7/site-packages/docutils/writers/odf_odt/__init__.pyc -#usr/lib/python2.7/site-packages/docutils/writers/odf_odt/pygmentsformatter.py -#usr/lib/python2.7/site-packages/docutils/writers/odf_odt/pygmentsformatter.pyc -#usr/lib/python2.7/site-packages/docutils/writers/odf_odt/styles.odt -#usr/lib/python2.7/site-packages/docutils/writers/pep_html -#usr/lib/python2.7/site-packages/docutils/writers/pep_html/__init__.py -#usr/lib/python2.7/site-packages/docutils/writers/pep_html/__init__.pyc -#usr/lib/python2.7/site-packages/docutils/writers/pep_html/pep.css -#usr/lib/python2.7/site-packages/docutils/writers/pep_html/template.txt -#usr/lib/python2.7/site-packages/docutils/writers/pseudoxml.py -#usr/lib/python2.7/site-packages/docutils/writers/pseudoxml.pyc -#usr/lib/python2.7/site-packages/docutils/writers/s5_html -#usr/lib/python2.7/site-packages/docutils/writers/s5_html/__init__.py -#usr/lib/python2.7/site-packages/docutils/writers/s5_html/__init__.pyc -#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes -#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/README.txt -#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/big-black -#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/big-black/__base__ -#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/big-black/framing.css -#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/big-black/pretty.css -#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/big-white -#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/big-white/framing.css -#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/big-white/pretty.css -#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/default -#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/default/blank.gif -#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/default/framing.css -#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/default/iepngfix.htc -#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/default/opera.css -#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/default/outline.css -#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/default/pretty.css -#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/default/print.css -#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/default/s5-core.css -#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/default/slides.css -#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/default/slides.js -#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/medium-black -#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/medium-black/__base__ -#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/medium-black/pretty.css -#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/medium-white -#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/medium-white/framing.css -#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/medium-white/pretty.css -#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/small-black -#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/small-black/__base__ -#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/small-black/pretty.css -#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/small-white -#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/small-white/framing.css -#usr/lib/python2.7/site-packages/docutils/writers/s5_html/themes/small-white/pretty.css -#usr/lib/python2.7/site-packages/docutils/writers/xetex -#usr/lib/python2.7/site-packages/docutils/writers/xetex/__init__.py -#usr/lib/python2.7/site-packages/docutils/writers/xetex/__init__.pyc diff --git a/config/rootfiles/packages/python3-docutils b/config/rootfiles/common/python3-docutils similarity index 98% rename from config/rootfiles/packages/python3-docutils rename to config/rootfiles/common/python3-docutils index 3429e97d6..fa0c6f3a7 100644 --- a/config/rootfiles/packages/python3-docutils +++ b/config/rootfiles/common/python3-docutils @@ -1,5 +1,15 @@ +usr/bin/rst2html.py usr/bin/rst2html4.py usr/bin/rst2html5.py +usr/bin/rst2latex.py +usr/bin/rst2man.py +usr/bin/rst2odt.py +usr/bin/rst2odt_prepstyles.py +usr/bin/rst2pseudoxml.py +usr/bin/rst2s5.py +usr/bin/rst2xetex.py +usr/bin/rst2xml.py +usr/bin/rstpep2html.py #usr/lib/python3.8/site-packages/docutils #usr/lib/python3.8/site-packages/docutils-0.16-py3.8.egg-info #usr/lib/python3.8/site-packages/docutils-0.16-py3.8.egg-info/PKG-INFO diff --git a/lfs/python-docutils b/lfs/python-docutils deleted file mode 100644 index d4d8356d9..000000000 --- a/lfs/python-docutils +++ /dev/null @@ -1,75 +0,0 @@ -############################################################################### -# # -# 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 = 0.12 - -THISAPP = docutils-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 4622263b62c5c771c03502afa3157768 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# 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) && python setup.py install --root=/ - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/python3-docutils b/lfs/python3-docutils index a67a21dce..5ce6310bd 100644 --- a/lfs/python3-docutils +++ b/lfs/python3-docutils @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> # +# 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 # @@ -31,10 +31,6 @@ DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = python3-docutils -PAK_VER = 3 - -DEPS = ############################################################################### # Top-level Rules @@ -54,9 +50,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: - @$(PAK) - ############################################################################### # Downloading, checking, md5sum ############################################################################### @@ -77,7 +70,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && python3 setup.py build cd $(DIR_APP) && python3 setup.py install --root=/ @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/make.sh b/make.sh index 60474a18e..2586c4e63 100755 --- a/make.sh +++ b/make.sh @@ -1346,7 +1346,7 @@ buildipfire() { lfsmake2 Net-Telnet lfsmake2 python-setuptools lfsmake2 python3-inotify - lfsmake2 python-docutils + lfsmake2 python3-docutils lfsmake2 python3-daemon lfsmake2 glib lfsmake2 ntp @@ -1544,7 +1544,6 @@ buildipfire() { lfsmake2 python3-dateutil lfsmake2 python3-jmespath lfsmake2 python3-colorama - lfsmake2 python3-docutils lfsmake2 python3-yaml lfsmake2 python3-s3transfer lfsmake2 python3-rsa -- 2.31.1

3 4

Core Update 157
by Michael Tremer 18 May '21

18 May '21

Hello, Because there are so many things going on at the same time, I would like to start a brief main thread about the upcoming Core Update(s). The original plan was to have this closed a while ago because Core Update 156 has already gone out. But then I decided to wait for a couple of smaller things until we had a security vulnerability reported which I wanted to investigate more (#12616 and #12619). It is not too bad, but I would like to ship at least a fix that is good enough to mitigate it. We might need some more time to figure out the details around the other half of the solution for this problem. Now this update has become *very* large. It is the largest update we have ever had and that might break things. Therefore I do not want to merge anything more that has to go into the core system, but add-on packages are fine. In fact, the build that I just pushed should be the final one, unless we find any other problems. Does anyone have anything urgent and small left? Otherwise Core Update 158 will be open as soon as 157 has hit the master branch. In order to coordinate that a little bit more and have a good and hopefully brief merge window, what should be in it? * Fixes for #12616 * Can we finish the migration away from Python 2? * Drop the packages discussed at the last conference call (https://wiki.ipfire.org/devel/telco/2021-05-03)? * VPNs for iOS (https://patchwork.ipfire.org/project/ipfire/list/?series=1323)? What else are you guys working on that is ready for prime-time? -Michael

3 6

[PATCH 00/11] Drop unmaintained or orphaned add-ons and packages, first batch
by Peter Müller 18 May '21

18 May '21

During our monthly telephone conference, we discussed the idea of dropping add-ons and packages lacking maintenance - either by us, the community or even their upstream - multiple times. This patchset drops the first batch of them. These are quite obvious candidates without any complex dependency webs, or whose deletion might introduce breaking changes. For reference, the conferences log of May 3rd, 2021 - where we agreed on this - can be retrieved from https://wiki.ipfire.org/devel/telco/2021-05-03. > [...] > > One way ticket, one way ticket to the blues > Choo, choo, train a-trackin' down the track > Gotta travel on, ain't never comin' back > Ooh, ooh, got a one way ticket to the blues > > [...] -- Eruption: One Way Ticket Peter Müller (11): Drop motion add-on Drop orphaned dependency add-on libmicrohttpd Drop Asterisk add-on Drop orphaned dependency "libsrtp" Zut alors, delete motion initiscript as well :-/ Drop SANE add-on Drop intltool add-on Drop miniupnpd add-on Drop fbset Drop sendEmail add-on make.sh: Do no longer build fbset and sendEmail config/backup/includes/asterisk | 2 - config/backup/includes/motion | 1 - config/backup/includes/sane | 1 - config/rootfiles/common/fbset | 4 - config/rootfiles/packages/aarch64/sane | 653 ----- config/rootfiles/packages/armv5tel/sane | 653 ----- config/rootfiles/packages/asterisk | 2990 ----------------------- config/rootfiles/packages/intltool | 13 - config/rootfiles/packages/libmicrohttpd | 6 - config/rootfiles/packages/libsrtp | 41 - config/rootfiles/packages/miniupnpd | 6 - config/rootfiles/packages/motion | 44 - config/rootfiles/packages/sane | 659 ----- config/rootfiles/packages/sendEmail | 1 - lfs/asterisk | 154 -- lfs/fbset | 79 - lfs/intltool | 85 - lfs/libmicrohttpd | 96 - lfs/libsrtp | 84 - lfs/miniupnpd | 88 - lfs/motion | 102 - lfs/sane | 100 - lfs/sendEmail | 70 - make.sh | 9 - src/initscripts/packages/asterisk | 69 - src/initscripts/packages/miniupnpd | 69 - src/initscripts/packages/motion | 42 - src/initscripts/packages/sane | 44 - 28 files changed, 6165 deletions(-) delete mode 100644 config/backup/includes/asterisk delete mode 100644 config/backup/includes/motion delete mode 100644 config/backup/includes/sane delete mode 100644 config/rootfiles/common/fbset delete mode 100644 config/rootfiles/packages/aarch64/sane delete mode 100644 config/rootfiles/packages/armv5tel/sane delete mode 100644 config/rootfiles/packages/asterisk delete mode 100644 config/rootfiles/packages/intltool delete mode 100644 config/rootfiles/packages/libmicrohttpd delete mode 100644 config/rootfiles/packages/libsrtp delete mode 100644 config/rootfiles/packages/miniupnpd delete mode 100644 config/rootfiles/packages/motion delete mode 100644 config/rootfiles/packages/sane delete mode 100644 config/rootfiles/packages/sendEmail delete mode 100755 lfs/asterisk delete mode 100644 lfs/fbset delete mode 100644 lfs/intltool delete mode 100644 lfs/libmicrohttpd delete mode 100644 lfs/libsrtp delete mode 100644 lfs/miniupnpd delete mode 100644 lfs/motion delete mode 100644 lfs/sane delete mode 100644 lfs/sendEmail delete mode 100644 src/initscripts/packages/asterisk delete mode 100644 src/initscripts/packages/miniupnpd delete mode 100644 src/initscripts/packages/motion delete mode 100644 src/initscripts/packages/sane -- 2.26.2

2 4

[PATCH 1/4] binutils: Update to 2.36.1
by Adolf Belka 17 May '21

17 May '21

- Update from 2.35.1 to 2.36.1 - Update of rootfiles for each architecture - Changelog 2021-01-26 Nick Alcock <nick.alcock(a)oracle.com> * Makefile.def: Add install-libctf dependency to install-ld. * Makefile.in: Regenerated. 2021-01-09 Nick Clifton <nickc(a)redhat.com> * 2.36 release branch crated. 2021-01-07 Samuel Thibault <samuel.thibault(a)gnu.org> * libtool.m4: Match gnu* along with other GNU systems. 2021-01-07 Alan Modra <amodra(a)gmail.com> * config.sub: Accept OS of eabi* and gnueabi*. 2021-01-05 Nick Alcock <nick.alcock(a)oracle.com> * Makefile.def (libctf): No longer no_check. Checking depends on all-ld. * Makefile.in: Regenerated. 2021-01-05 Nick Clifton <nickc(a)redhat.com> * libiberty: Sync with gcc. Bring in: 2021-01-04 Martin Liska <mliska(a)suse.cz> * strverscmp.c: Convert to utf8 from iso8859. 2020-12-22 Jason Merrill <jason(a)redhat.com> PR c++/67343 * cp-demangle.h (struct d_info): Add unresolved_name_state. * cp-demangle.c (d_prefix): Add subst parm. (d_nested_name): Pass it. (d_unresolved_name): Split out from... (d_expression_1): ...here. (d_demangle_callback): Maybe retry with old sr mangling. * testsuite/demangle-expected: Add test. 2020-12-21 Jason Merrill <jason(a)redhat.com> * cp-demangle.c (d_expression_1): Recognize qualified-id on RHS of dt/pt. * testsuite/demangle-expected: Add test. 2020-12-21 Jason Merrill <jason(a)redhat.com> * cp-demangle.c (d_unqualified_name): Clear is_expression. * testsuite/demangle-expected: Add tests. 2020-11-25 Matthew Malcomson <matthew.malcomson(a)arm.com> * configure: Regenerate. * configure.ac: Avoid using sanitizer. 2020-11-13 Eduard-Mihai Burtescu <eddyb(a)lyken.rs> * rust-demangle.c (struct rust_demangler): Add skipping_printing and bound_lifetime_depth fields. (eat): Add (v0-only). (parse_integer_62): Add (v0-only). (parse_opt_integer_62): Add (v0-only). (parse_disambiguator): Add (v0-only). (struct rust_mangled_ident): Add punycode{,_len} fields. (parse_ident): Support v0 identifiers. (print_str): Respect skipping_printing. (print_uint64): Add (v0-only). (print_uint64_hex): Add (v0-only). (print_ident): Respect skipping_printing, Support v0 identifiers. (print_lifetime_from_index): Add (v0-only). (demangle_binder): Add (v0-only). (demangle_path): Add (v0-only). (demangle_generic_arg): Add (v0-only). (demangle_type): Add (v0-only). (demangle_path_maybe_open_generics): Add (v0-only). (demangle_dyn_trait): Add (v0-only). (demangle_const): Add (v0-only). (demangle_const_uint): Add (v0-only). (basic_type): Add (v0-only). (rust_demangle_callback): Support v0 symbols. * testsuite/rust-demangle-expected: Add v0 testcases. 2020-11-13 Seija Kijin <doremylover456(a)gmail.com> * strstr.c (strstr): Make implementation ANSI/POSIX compliant. 2020-11-11 Patrick Palka <ppalka(a)redhat.com> PR c++/88115 * cp-demangle.c (d_print_comp_inner) <case DEMANGLE_COMPONENT_EXTENDED_OPERATOR>: Don't print the "operator " prefix for __alignof__. <case DEMANGLE_COMPONENT_UNARY>: Always print parens around the operand of __alignof__. * testsuite/demangle-expected: Test demangling for __alignof__. 2020-11-09 Christophe Lyon <christophe.lyon(a)linaro.org> * pex-win32.c (pex_win32_exec_child): Initialize orig_err. 2020-10-06 Martin Liska <mliska(a)suse.cz> PR lto/97290 * simple-object-elf.c (simple_object_elf_copy_lto_debug_sections): Use sh_link of a .symtab_shndx section. 2021-01-05 Alan Modra <amodra(a)gmail.com> * config.guess: Import from upstream. * config.sub: Likewise. 2020-12-16 Martin Liska <mliska(a)suse.cz> Tom de Vries <tdevries(a)suse.de> * gdb/debuginfod-support.c (struct user_data): Remove has_printed field. Add meter field. (progressfn): Print progress using meter. 2020-12-02 Enze Li <lienze2010(a)hotmail.com> * .gitignore: Add gnu global outputs. 2020-12-02 Simon Marchi <simon.marchi(a)polymtl.ca> * .gitignore: Sync with gcc. 2020-10-26 Andreas Rammhold <andreas(a)rammhold.de> * src-release.sh: Use sha256sum instead of md5sum. 2020-10-14 Andrew Burgess <andrew.burgess(a)embecosm.com> * Makefile.in: Rebuild. * Makefile.def: Make distclean-gnulib depend on distclean-gdb and distclean-gdbserver. 2020-07-24 Aaron Merey <amerey(a)redhat.com> * configure: Rebuild. * configure.ac: Remove AC_DEBUGINFOD. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/common/aarch64/binutils | 6 ++++-- config/rootfiles/common/armv5tel/binutils | 6 ++++-- config/rootfiles/common/i586/binutils | 6 ++++-- config/rootfiles/common/x86_64/binutils | 6 ++++-- lfs/binutils | 4 ++-- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/config/rootfiles/common/aarch64/binutils b/config/rootfiles/common/aarch64/binutils index e1635957a..16c441552 100644 --- a/config/rootfiles/common/aarch64/binutils +++ b/config/rootfiles/common/aarch64/binutils @@ -25,6 +25,8 @@ usr/bin/strings #usr/include/libiberty.h #usr/include/plugin-api.h #usr/include/symcat.h +#usr/lib/bfd-plugins +#usr/lib/bfd-plugins/libdep.so #usr/lib/ldscripts #usr/lib/ldscripts/aarch64elf.x #usr/lib/ldscripts/aarch64elf.xbn @@ -290,7 +292,7 @@ usr/bin/strings #usr/lib/ldscripts/armelfb_linux_eabi.xu #usr/lib/ldscripts/armelfb_linux_eabi.xw #usr/lib/ldscripts/armelfb_linux_eabi.xwe -usr/lib/libbfd-2.35.1.so +usr/lib/libbfd-2.36.1.so #usr/lib/libbfd.a #usr/lib/libbfd.la #usr/lib/libbfd.so @@ -304,7 +306,7 @@ usr/lib/libctf-nobfd.so.0.0.0 #usr/lib/libctf.so usr/lib/libctf.so.0 usr/lib/libctf.so.0.0.0 -usr/lib/libopcodes-2.35.1.so +usr/lib/libopcodes-2.36.1.so #usr/lib/libopcodes.a #usr/lib/libopcodes.la #usr/lib/libopcodes.so diff --git a/config/rootfiles/common/armv5tel/binutils b/config/rootfiles/common/armv5tel/binutils index 9680f29ec..cc5845c6e 100644 --- a/config/rootfiles/common/armv5tel/binutils +++ b/config/rootfiles/common/armv5tel/binutils @@ -25,6 +25,8 @@ usr/bin/strings #usr/include/libiberty.h #usr/include/plugin-api.h #usr/include/symcat.h +#usr/lib/bfd-plugins +#usr/lib/bfd-plugins/libdep.so #usr/lib/ldscripts #usr/lib/ldscripts/armelf_linux_eabi.x #usr/lib/ldscripts/armelf_linux_eabi.xbn @@ -70,7 +72,7 @@ usr/bin/strings #usr/lib/ldscripts/armelfb_linux_eabi.xu #usr/lib/ldscripts/armelfb_linux_eabi.xw #usr/lib/ldscripts/armelfb_linux_eabi.xwe -usr/lib/libbfd-2.35.1.so +usr/lib/libbfd-2.36.1.so #usr/lib/libbfd.a #usr/lib/libbfd.la #usr/lib/libbfd.so @@ -84,7 +86,7 @@ usr/lib/libctf-nobfd.so.0.0.0 #usr/lib/libctf.so usr/lib/libctf.so.0 usr/lib/libctf.so.0.0.0 -usr/lib/libopcodes-2.35.1.so +usr/lib/libopcodes-2.36.1.so #usr/lib/libopcodes.a #usr/lib/libopcodes.la #usr/lib/libopcodes.so diff --git a/config/rootfiles/common/i586/binutils b/config/rootfiles/common/i586/binutils index edf115d3a..781c3e254 100644 --- a/config/rootfiles/common/i586/binutils +++ b/config/rootfiles/common/i586/binutils @@ -25,6 +25,8 @@ usr/bin/strings #usr/include/libiberty.h #usr/include/plugin-api.h #usr/include/symcat.h +#usr/lib/bfd-plugins +#usr/lib/bfd-plugins/libdep.so #usr/lib/ldscripts #usr/lib/ldscripts/elf32_x86_64.x #usr/lib/ldscripts/elf32_x86_64.xbn @@ -158,7 +160,7 @@ usr/bin/strings #usr/lib/ldscripts/elf_x86_64.xu #usr/lib/ldscripts/elf_x86_64.xw #usr/lib/ldscripts/elf_x86_64.xwe -usr/lib/libbfd-2.35.1.so +usr/lib/libbfd-2.36.1.so #usr/lib/libbfd.a #usr/lib/libbfd.la #usr/lib/libbfd.so @@ -172,7 +174,7 @@ usr/lib/libctf-nobfd.so.0.0.0 #usr/lib/libctf.so usr/lib/libctf.so.0 usr/lib/libctf.so.0.0.0 -usr/lib/libopcodes-2.35.1.so +usr/lib/libopcodes-2.36.1.so #usr/lib/libopcodes.a #usr/lib/libopcodes.la #usr/lib/libopcodes.so diff --git a/config/rootfiles/common/x86_64/binutils b/config/rootfiles/common/x86_64/binutils index edf115d3a..781c3e254 100644 --- a/config/rootfiles/common/x86_64/binutils +++ b/config/rootfiles/common/x86_64/binutils @@ -25,6 +25,8 @@ usr/bin/strings #usr/include/libiberty.h #usr/include/plugin-api.h #usr/include/symcat.h +#usr/lib/bfd-plugins +#usr/lib/bfd-plugins/libdep.so #usr/lib/ldscripts #usr/lib/ldscripts/elf32_x86_64.x #usr/lib/ldscripts/elf32_x86_64.xbn @@ -158,7 +160,7 @@ usr/bin/strings #usr/lib/ldscripts/elf_x86_64.xu #usr/lib/ldscripts/elf_x86_64.xw #usr/lib/ldscripts/elf_x86_64.xwe -usr/lib/libbfd-2.35.1.so +usr/lib/libbfd-2.36.1.so #usr/lib/libbfd.a #usr/lib/libbfd.la #usr/lib/libbfd.so @@ -172,7 +174,7 @@ usr/lib/libctf-nobfd.so.0.0.0 #usr/lib/libctf.so usr/lib/libctf.so.0 usr/lib/libctf.so.0.0.0 -usr/lib/libopcodes-2.35.1.so +usr/lib/libopcodes-2.36.1.so #usr/lib/libopcodes.a #usr/lib/libopcodes.la #usr/lib/libopcodes.so diff --git a/lfs/binutils b/lfs/binutils index 66730cc34..768a8d7de 100644 --- a/lfs/binutils +++ b/lfs/binutils @@ -24,7 +24,7 @@ include Config -VER = 2.35.1 +VER = 2.36.1 THISAPP = binutils-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -96,7 +96,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 7126f370ffbd46c08fcc5ce7aee2805d +$(DL_FILE)_MD5 = 628d490d976d8957279bbbff06cf29d4 install : $(TARGET) -- 2.31.1

3 7

← Newer
1
2
3
4
5
6
7
8
9
10
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development May 2021