rpms/ulogd/devel ulogd-1.24-initializers.patch, NONE, 1.1 ulogd.spec, 1.17, 1.18
Aurelien Bompard (abompard)
fedora-extras-commits at redhat.com
Tue Aug 14 21:21:41 UTC 2007
Author: abompard
Update of /cvs/pkgs/rpms/ulogd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv461
Modified Files:
ulogd.spec
Added Files:
ulogd-1.24-initializers.patch
Log Message:
* Tue Aug 14 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.24-5
- Fix the deprecated way of getting the DSO initializers run, causing
builds to fails with rpm-build > 4.4.2.1-3 (new find-debuginfo.sh script)
ulogd-1.24-initializers.patch:
--- NEW FILE ulogd-1.24-initializers.patch ---
--- ./pcap/ulogd_PCAP.c.initializers 2005-11-25 20:58:25.000000000 +0100
+++ ./pcap/ulogd_PCAP.c 2007-08-14 23:18:45.000000000 +0200
@@ -276,7 +276,7 @@ static ulog_output_t pcap_op = {
.signal = &pcap_signal_handler,
};
-void _init(void)
+static void __attribute__((constructor)) init_pcap(void)
{
if (get_ids()) {
ulogd_log(ULOGD_ERROR, "can't resolve all keyhash id's\n");
--- ./sqlite3/ulogd_SQLITE3.c.initializers 2005-11-25 20:58:25.000000000 +0100
+++ ./sqlite3/ulogd_SQLITE3.c 2007-08-14 23:18:22.000000000 +0200
@@ -405,7 +405,7 @@ static ulog_output_t _sqlite3_plugin = {
.fini = &_sqlite3_fini,
};
-void _init(void)
+static void __attribute__((constructor)) init_sqlite3(void)
{
register_output(&_sqlite3_plugin);
}
--- ./pgsql/ulogd_PGSQL.c.initializers 2006-01-23 00:07:10.000000000 +0100
+++ ./pgsql/ulogd_PGSQL.c 2007-08-14 23:17:54.000000000 +0200
@@ -458,7 +458,7 @@ static ulog_output_t pgsql_plugin = {
.fini = &pgsql_fini,
};
-void _init(void)
+static void __attribute__((constructor)) init_pgsql(void)
{
register_output(&pgsql_plugin);
}
--- ./extensions/ulogd_LOGEMU.c.initializers 2005-11-25 20:58:26.000000000 +0100
+++ ./extensions/ulogd_LOGEMU.c 2007-08-14 23:16:04.000000000 +0200
@@ -130,7 +130,7 @@ static ulog_output_t logemu_op = {
.signal = &signal_handler_logemu,
};
-void _init(void)
+static void __attribute__((constructor)) logemu__init(void)
{
register_output(&logemu_op);
}
--- ./extensions/ulogd_PWSNIFF.c.initializers 2005-11-25 20:58:26.000000000 +0100
+++ ./extensions/ulogd_PWSNIFF.c 2007-08-14 23:16:04.000000000 +0200
@@ -151,7 +151,7 @@ static ulog_interpreter_t base_ip[] = {
{ NULL, "", 0, NULL, 0, NULL },
};
-static void _base_reg_ip(void)
+static void __attribute__((constructor)) _base_reg_ip(void)
{
ulog_interpreter_t *ip = base_ip;
ulog_interpreter_t *p;
@@ -159,9 +159,3 @@ static void _base_reg_ip(void)
for (p = ip; p->interp; p++)
register_interpreter(p);
}
-
-
-void _init(void)
-{
- _base_reg_ip();
-}
--- ./extensions/ulogd_SYSLOG.c.initializers 2006-01-25 12:14:09.000000000 +0100
+++ ./extensions/ulogd_SYSLOG.c 2007-08-14 23:16:04.000000000 +0200
@@ -140,7 +140,7 @@ static ulog_output_t syslog_op = {
};
-void _init(void)
+static void __attribute__((constructor)) init_syslog(void)
{
if (printpkt_init())
ulogd_log(ULOGD_ERROR, "can't resolve all keyhash id's\n");
--- ./extensions/ulogd_OPRINT.c.initializers 2005-11-25 20:58:26.000000000 +0100
+++ ./extensions/ulogd_OPRINT.c 2007-08-14 23:16:04.000000000 +0200
@@ -138,7 +138,8 @@ static ulog_output_t oprint_op = {
.fini = &oprint_fini,
};
-void _init(void)
+__attribute__ ((constructor))
+static void init_oprint(void)
{
register_output(&oprint_op);
}
--- ./extensions/ulogd_BASE.c.initializers 2007-08-14 23:16:04.000000000 +0200
+++ ./extensions/ulogd_BASE.c 2007-08-14 23:16:04.000000000 +0200
@@ -540,6 +540,7 @@ static ulog_interpreter_t base_ip[] = {
{ NULL, "", 0, NULL, 0, NULL },
};
+__attribute__ ((constructor))
void _base_reg_ip(void)
{
ulog_interpreter_t *ip = base_ip;
@@ -549,8 +550,3 @@ void _base_reg_ip(void)
register_interpreter(p);
}
}
-
-void _init(void)
-{
- _base_reg_ip();
-}
--- ./extensions/ulogd_LOCAL.c.initializers 2005-11-25 20:58:26.000000000 +0100
+++ ./extensions/ulogd_LOCAL.c 2007-08-14 23:16:04.000000000 +0200
@@ -84,7 +84,7 @@ static void _local_reg_ip(void)
register_interpreter(p);
}
-void _init(void)
+static void __attribute__((constructor)) local_init(void)
{
/* get hostname */
char *tmp;
--- ./mysql/ulogd_MYSQL.c.initializers 2005-11-25 20:58:27.000000000 +0100
+++ ./mysql/ulogd_MYSQL.c 2007-08-14 23:17:31.000000000 +0200
@@ -448,7 +448,7 @@ static ulog_output_t mysql_plugin = {
.fini = &_mysql_fini,
};
-void _init(void)
+static void __attribute__((constructor)) init_mysql(void)
{
register_output(&mysql_plugin);
}
Index: ulogd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ulogd/devel/ulogd.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ulogd.spec 14 Aug 2007 08:51:32 -0000 1.17
+++ ulogd.spec 14 Aug 2007 21:21:09 -0000 1.18
@@ -1,6 +1,6 @@
Name: ulogd
Version: 1.24
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: The userspace logging daemon for netfilter
License: GPL
Group: System Environment/Daemons
@@ -12,6 +12,9 @@
Patch2: ulogd-1.02-init.patch
# Bug 247345
Patch3: ulogd-1.24-fortify-source.patch
+# The code uses a deprecated way of getting its DSO initializers run,
+# build fails with rpm-build > 4.4.2.1-3 (new find-debuginfo.sh script)
+Patch4: ulogd-1.24-initializers.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post): initscripts, chkconfig
Requires(postun): initscripts, chkconfig
@@ -48,6 +51,11 @@
%patch1 -p1 -b .logdir
%patch2 -p1 -b .lsbinit
%patch3 -p0 -b .fortify-source
+# Enable BuildID :
+# https://www.redhat.com/archives/fedora-devel-announce/2007-August/msg00007.html
+perl -pi -e 's/\(LD\) -shared/(CC) \$(CFLAGS) \$(LDFLAGS) -shared/g' */Makefile.in
+%patch4 -p1 -b .initializers
+
%build
%configure --with-mysql --with-pgsql
@@ -116,6 +124,10 @@
%{_libdir}/ulogd/ulogd_PGSQL.so
%changelog
+* Tue Aug 14 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.24-5
+- Fix the deprecated way of getting the DSO initializers run, causing
+ builds to fails with rpm-build > 4.4.2.1-3 (new find-debuginfo.sh script)
+
* Sat Jul 14 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.24-4
- add patch to fix bug 247345
- update URL
More information about the fedora-extras-commits
mailing list