Revision: 6606
http://ipcop.svn.sourceforge.net/ipcop/?rev=6606&view=rev
Author: gespinasse
Date: 2012-05-09 06:26:36 +0000 (Wed, 09 May 2012)
Log Message:
-----------
Compile with -Wall. Patch setserial to fix the warnings.
Add a patch ( not applied now) needed with more recent kernel headers
Modified Paths:
--------------
ipcop/trunk/lfs/setserial
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
ipcop/trunk/updates/2.1.0/information.xml
Added Paths:
-----------
ipcop/trunk/src/patches/setserial-2.17-prototypes.patch
ipcop/trunk/src/patches/setserial-2.17_missing-braces.patch
ipcop/trunk/src/patches/setserial-2.17_nohayesesp.patch
Modified: ipcop/trunk/lfs/setserial
===================================================================
--- ipcop/trunk/lfs/setserial 2012-05-08 21:04:04 UTC (rev 6605)
+++ ipcop/trunk/lfs/setserial 2012-05-09 06:26:36 UTC (rev 6606)
@@ -43,6 +43,8 @@
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+CFLAGS += -Wall
+
###############################################################################
# Top-level Rules
###############################################################################
@@ -81,6 +83,10 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -p0 -i $(DIR_PATCHES)/$(THISAPP)-prototypes.patch
+ cd $(DIR_APP) && patch -p1 -i
$(DIR_PATCHES)/$(THISAPP)_missing-braces.patch
+ # not now, needed with 3.0 headers userspace
+ #cd $(DIR_APP) && patch -p1 -i
$(DIR_PATCHES)/$(THISAPP)_nohayesesp.patch
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make
Added: ipcop/trunk/src/patches/setserial-2.17-prototypes.patch
===================================================================
--- ipcop/trunk/src/patches/setserial-2.17-prototypes.patch
(rev 0)
+++ ipcop/trunk/src/patches/setserial-2.17-prototypes.patch 2012-05-09
06:26:36 UTC (rev 6606)
@@ -0,0 +1,24 @@
+openSUSE borrowed
+https://build.opensuse.org/package/files?package=setserial&project=openSUSE%3AFactory
+
+--- setserial.c
++++ setserial.c
+@@ -15,6 +15,9 @@
+ #include <termios.h>
+ #include <string.h>
+ #include <errno.h>
++#include <stdlib.h>
++#include <unistd.h>
++#include <sys/ioctl.h>
+
+ #ifdef HAVE_ASM_IOCTLS_H
+ #include <asm/ioctls.h>
+@@ -718,7 +721,7 @@
+ exit(1);
+ }
+
+-main(int argc, char **argv)
++int main(int argc, char **argv)
+ {
+ int get_flag = 0, wild_intr_flag = 0;
+ int c;
Added: ipcop/trunk/src/patches/setserial-2.17_missing-braces.patch
===================================================================
--- ipcop/trunk/src/patches/setserial-2.17_missing-braces.patch
(rev 0)
+++ ipcop/trunk/src/patches/setserial-2.17_missing-braces.patch 2012-05-09
06:26:36 UTC (rev 6606)
@@ -0,0 +1,121 @@
+--- setserial-2.17/setserial.c.orig 2000-01-27 16:40:52.000000000 +0100
++++ setserial-2.17/setserial.c 2012-05-07 17:35:01.000000000 +0200
+@@ -41,22 +41,22 @@
+ int id;
+ char *name;
+ } serial_type_tbl[] = {
+- PORT_UNKNOWN, "unknown",
+- PORT_8250, "8250",
+- PORT_16450, "16450",
+- PORT_16550, "16550",
+- PORT_16550A, "16550A",
+- PORT_CIRRUS, "Cirrus",
+- PORT_16650, "16650",
+- PORT_16650V2, "16650V2",
+- PORT_16750, "16750",
+- PORT_16C950, "16950/954",
+- PORT_16C950, "16950",
+- PORT_16C950, "16954",
+- PORT_16654, "16654",
+- PORT_16850, "16850",
+- PORT_UNKNOWN, "none",
+- -1, NULL
++ { PORT_UNKNOWN, "unknown" },
++ { PORT_8250, "8250" },
++ { PORT_16450, "16450" },
++ { PORT_16550, "16550" },
++ { PORT_16550A, "16550A" },
++ { PORT_CIRRUS, "Cirrus" },
++ { PORT_16650, "16650" },
++ { PORT_16650V2, "16650V2" },
++ { PORT_16750, "16750" },
++ { PORT_16C950, "16950/954" },
++ { PORT_16C950, "16950" },
++ { PORT_16C950, "16954" },
++ { PORT_16654, "16654" },
++ { PORT_16850, "16850" },
++ { PORT_UNKNOWN, "none" },
++ { -1, NULL }
+ };
+
+ #define CMD_FLAG 1
+@@ -89,44 +89,44 @@
+ int level;
+ int flags;
+ } flag_type_tbl[] = {
+- CMD_FLAG, "spd_normal", 0, ASYNC_SPD_MASK, 2, 0,
+- CMD_FLAG, "spd_hi", ASYNC_SPD_HI, ASYNC_SPD_MASK, 0, 0,
+- CMD_FLAG, "spd_vhi", ASYNC_SPD_VHI, ASYNC_SPD_MASK, 0, 0,
+- CMD_FLAG, "spd_shi", ASYNC_SPD_SHI, ASYNC_SPD_MASK, 0, 0,
+- CMD_FLAG, "spd_warp", ASYNC_SPD_WARP, ASYNC_SPD_MASK, 0, 0,
+- CMD_FLAG, "spd_cust", ASYNC_SPD_CUST, ASYNC_SPD_MASK, 0, 0,
++ { CMD_FLAG, "spd_normal", 0, ASYNC_SPD_MASK, 2, 0 },
++ { CMD_FLAG, "spd_hi", ASYNC_SPD_HI, ASYNC_SPD_MASK, 0, 0 },
++ { CMD_FLAG, "spd_vhi", ASYNC_SPD_VHI, ASYNC_SPD_MASK, 0, 0 },
++ { CMD_FLAG, "spd_shi", ASYNC_SPD_SHI, ASYNC_SPD_MASK, 0, 0 },
++ { CMD_FLAG, "spd_warp", ASYNC_SPD_WARP, ASYNC_SPD_MASK, 0, 0 },
++ { CMD_FLAG, "spd_cust", ASYNC_SPD_CUST, ASYNC_SPD_MASK, 0, 0 },
+
+- CMD_FLAG, "SAK", ASYNC_SAK, ASYNC_SAK, 0,
FLAG_CAN_INVERT,
+- CMD_FLAG, "Fourport", ASYNC_FOURPORT, ASYNC_FOURPORT, 0,
FLAG_CAN_INVERT,
+- CMD_FLAG, "hup_notify", ASYNC_HUP_NOTIFY, ASYNC_HUP_NOTIFY, 0,
FLAG_CAN_INVERT,
+- CMD_FLAG, "skip_test", ASYNC_SKIP_TEST,ASYNC_SKIP_TEST,2,
FLAG_CAN_INVERT,
+- CMD_FLAG, "auto_irq", ASYNC_AUTO_IRQ, ASYNC_AUTO_IRQ, 2,
FLAG_CAN_INVERT,
+- CMD_FLAG, "split_termios", ASYNC_SPLIT_TERMIOS,
ASYNC_SPLIT_TERMIOS, 2, FLAG_CAN_INVERT,
+- CMD_FLAG, "session_lockout", ASYNC_SESSION_LOCKOUT,
ASYNC_SESSION_LOCKOUT, 2, FLAG_CAN_INVERT,
+- CMD_FLAG, "pgrp_lockout", ASYNC_PGRP_LOCKOUT, ASYNC_PGRP_LOCKOUT,
2, FLAG_CAN_INVERT,
+- CMD_FLAG, "callout_nohup", ASYNC_CALLOUT_NOHUP,
ASYNC_CALLOUT_NOHUP, 2, FLAG_CAN_INVERT,
+- CMD_FLAG, "low_latency", ASYNC_LOW_LATENCY, ASYNC_LOW_LATENCY, 0,
FLAG_CAN_INVERT,
+- CMD_PORT, "port", 0, 0, 0,
FLAG_NEED_ARG,
+- CMD_IRQ, "irq", 0, 0, 0,
FLAG_NEED_ARG,
+- CMD_DIVISOR, "divisor", 0, 0, 0,
FLAG_NEED_ARG,
+- CMD_TYPE, "uart", 0, 0, 0,
FLAG_NEED_ARG,
+- CMD_BASE, "base", 0, 0, 0,
FLAG_NEED_ARG,
+- CMD_BASE, "baud_base", 0, 0, 0,
FLAG_NEED_ARG,
+- CMD_DELAY, "close_delay", 0, 0, 0,
FLAG_NEED_ARG,
+- CMD_WAIT, "closing_wait", 0, 0, 0,
FLAG_NEED_ARG,
+- CMD_CONFIG, "autoconfig", 0, 0, 0, 0,
+- CMD_CONFIG, "autoconfigure",0, 0, 0, 0,
+- CMD_GETMULTI, "get_multiport",0, 0, 0, 0,
+- CMD_SETMULTI, "set_multiport",0, 0, 0, 0,
++ { CMD_FLAG, "SAK", ASYNC_SAK, ASYNC_SAK, 0,
FLAG_CAN_INVERT },
++ { CMD_FLAG, "Fourport", ASYNC_FOURPORT, ASYNC_FOURPORT, 0,
FLAG_CAN_INVERT },
++ { CMD_FLAG, "hup_notify", ASYNC_HUP_NOTIFY, ASYNC_HUP_NOTIFY, 0,
FLAG_CAN_INVERT },
++ { CMD_FLAG, "skip_test", ASYNC_SKIP_TEST,ASYNC_SKIP_TEST,2,
FLAG_CAN_INVERT },
++ { CMD_FLAG, "auto_irq", ASYNC_AUTO_IRQ, ASYNC_AUTO_IRQ, 2,
FLAG_CAN_INVERT },
++ { CMD_FLAG, "split_termios", ASYNC_SPLIT_TERMIOS,
ASYNC_SPLIT_TERMIOS, 2, FLAG_CAN_INVERT },
++ { CMD_FLAG, "session_lockout", ASYNC_SESSION_LOCKOUT,
ASYNC_SESSION_LOCKOUT, 2, FLAG_CAN_INVERT },
++ { CMD_FLAG, "pgrp_lockout", ASYNC_PGRP_LOCKOUT, ASYNC_PGRP_LOCKOUT,
2, FLAG_CAN_INVERT },
++ { CMD_FLAG, "callout_nohup", ASYNC_CALLOUT_NOHUP,
ASYNC_CALLOUT_NOHUP, 2, FLAG_CAN_INVERT },
++ { CMD_FLAG, "low_latency", ASYNC_LOW_LATENCY, ASYNC_LOW_LATENCY, 0,
FLAG_CAN_INVERT },
++ { CMD_PORT, "port", 0, 0, 0,
FLAG_NEED_ARG },
++ { CMD_IRQ, "irq", 0, 0, 0,
FLAG_NEED_ARG },
++ { CMD_DIVISOR, "divisor", 0, 0, 0,
FLAG_NEED_ARG },
++ { CMD_TYPE, "uart", 0, 0, 0,
FLAG_NEED_ARG },
++ { CMD_BASE, "base", 0, 0, 0,
FLAG_NEED_ARG },
++ { CMD_BASE, "baud_base", 0, 0, 0,
FLAG_NEED_ARG },
++ { CMD_DELAY, "close_delay", 0, 0, 0,
FLAG_NEED_ARG },
++ { CMD_WAIT, "closing_wait", 0, 0, 0,
FLAG_NEED_ARG },
++ { CMD_CONFIG, "autoconfig", 0, 0, 0, 0 },
++ { CMD_CONFIG, "autoconfigure",0, 0, 0, 0 },
++ { CMD_GETMULTI, "get_multiport",0, 0, 0, 0 },
++ { CMD_SETMULTI, "set_multiport",0, 0, 0, 0 },
+ #ifdef TIOCGHAYESESP
+- CMD_RX_TRIG, "rx_trigger", 0, 0, 0,
FLAG_NEED_ARG,
+- CMD_TX_TRIG, "tx_trigger", 0, 0, 0,
FLAG_NEED_ARG,
+- CMD_FLOW_OFF, "flow_off", 0, 0, 0,
FLAG_NEED_ARG,
+- CMD_FLOW_ON, "flow_on", 0, 0, 0,
FLAG_NEED_ARG,
+- CMD_RX_TMOUT, "rx_timeout", 0, 0, 0,
FLAG_NEED_ARG,
+- CMD_DMA_CHAN, "dma_channel", 0, 0, 0,
FLAG_NEED_ARG,
++ { CMD_RX_TRIG, "rx_trigger", 0, 0, 0,
FLAG_NEED_ARG },
++ { CMD_TX_TRIG, "tx_trigger", 0, 0, 0,
FLAG_NEED_ARG },
++ { CMD_FLOW_OFF, "flow_off", 0, 0, 0,
FLAG_NEED_ARG },
++ { CMD_FLOW_ON, "flow_on", 0, 0, 0,
FLAG_NEED_ARG },
++ { CMD_RX_TMOUT, "rx_timeout", 0, 0, 0,
FLAG_NEED_ARG },
++ { CMD_DMA_CHAN, "dma_channel", 0, 0, 0,
FLAG_NEED_ARG },
+ #endif
+- 0, 0, 0, 0, 0, 0,
++ { 0, 0, 0, 0, 0, 0 },
+ };
+
+ char *serial_type(int id)
Added: ipcop/trunk/src/patches/setserial-2.17_nohayesesp.patch
===================================================================
--- ipcop/trunk/src/patches/setserial-2.17_nohayesesp.patch
(rev 0)
+++ ipcop/trunk/src/patches/setserial-2.17_nohayesesp.patch 2012-05-09
06:26:36 UTC (rev 6606)
@@ -0,0 +1,33 @@
+Fedora borrowed
+Support build with recent kernel headers like 3.0 where TIOCGHAYESESP no more
exist
+
+diff -up setserial-2.17/setserial.c.hayesesp setserial-2.17/setserial.c
+--- setserial-2.17/setserial.c.hayesesp 2010-02-15 12:20:59.104048442
+0000
++++ setserial-2.17/setserial.c 2010-02-15 12:21:42.368924088 +0000
+@@ -356,7 +356,7 @@ void set_multiport(char *device, int fd,
+ }
+ #endif
+
+-#ifdef TIOCGHAYESESP
++#if defined(TIOCGHAYESESP) && defined(HAVE_LINUX_HAYESESP_H)
+ void print_hayesesp(int fd)
+ {
+ struct hayes_esp_config esp;
+@@ -453,7 +453,7 @@ void get_serial(char *device)
+ print_flags(&serinfo, "\tFlags: ", "");
+ printf("\n\n");
+
+-#ifdef TIOCGHAYESESP
++#if defined(TIOCGHAYESESP) && defined(HAVE_LINUX_HAYESESP_H)
+ print_hayesesp(fd);
+ #endif
+ } else if (verbosity==0) {
+@@ -593,7 +593,7 @@ void set_serial(char *device, char ** ar
+ }
+ set_multiport(device, fd, &arg);
+ break;
+-#ifdef TIOCGHAYESESP
++#if defined(TIOCGHAYESESP) && defined(HAVE_LINUX_HAYESESP_H)
+ case CMD_RX_TRIG:
+ case CMD_TX_TRIG:
+ case CMD_FLOW_OFF:
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-05-08 21:04:04 UTC
(rev 6605)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-05-09 06:26:36 UTC
(rev 6606)
@@ -550,6 +550,9 @@
/usr/lib/rsyslog/lmtcpclt.so
/usr/sbin/rsyslogd
##
+## setserial-2.17 patched
+/bin/setserial
+##
## shadow-4.1.5
/bin/login
/bin/passwd
Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml 2012-05-08 21:04:04 UTC (rev
6605)
+++ ipcop/trunk/updates/2.1.0/information.xml 2012-05-09 06:26:36 UTC (rev
6606)
@@ -3,7 +3,7 @@
<version>2.1.0</version>
<releasedate>2012-04-dd</releasedate>
<size>0</size>
- <description>httpd, libxml2 and gettext patched<br />
+ <description>httpd, libxml2 and gettext setserial patched<br />
conntrack-tools recompiled with -O3<br />
Add URL filter, xz-5.0.3<br />
Language updates.<br />
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
