changed debian/source/format to native
This commit is contained in:
openKylinBot
parent
3eb09aa702
commit
3cef695a2c
|
|
@ -1,25 +0,0 @@
|
|||
From: Guus Sliepen <guus@debian.org>
|
||||
Date: Sat, 14 May 2022 03:18:38 +0800
|
||||
Subject: add type to IMPORT keyword in ifrename's udev rules file
|
||||
|
||||
Bug-Debian: http://bugs.debian.org/650606
|
||||
---
|
||||
19-udev-ifrename.rules | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/19-udev-ifrename.rules b/19-udev-ifrename.rules
|
||||
index 3aec9a6..871efa9 100644
|
||||
--- a/19-udev-ifrename.rules
|
||||
+++ b/19-udev-ifrename.rules
|
||||
@@ -5,9 +5,9 @@
|
||||
# when udev runs (i.e. on boot partition).
|
||||
|
||||
# Enable this rule to test with udevtest.
|
||||
-#ENV{UDEV_LOG}=="6", SUBSYSTEM=="net", ACTION=="add", IMPORT="/sbin/ifrename -D -V -u -i %k", NAME:="$env{INTERFACE}"
|
||||
+#ENV{UDEV_LOG}=="6", SUBSYSTEM=="net", ACTION=="add", IMPORT{program}="/sbin/ifrename -D -V -u -i %k", NAME:="$env{INTERFACE}"
|
||||
|
||||
# Main ifrename rule.
|
||||
# If interface is found in /etc/iftab, subsequent rename rules are bypassed.
|
||||
# If interface is not found in /etc/iftab, subsequent rename rules applies.
|
||||
-SUBSYSTEM=="net", ACTION=="add", IMPORT="/sbin/ifrename -u -i %k", NAME:="$env{INTERFACE}"
|
||||
+SUBSYSTEM=="net", ACTION=="add", IMPORT{program}="/sbin/ifrename -u -i %k", NAME:="$env{INTERFACE}"
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
From: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
|
||||
Date: Sat, 14 May 2022 03:18:38 +0800
|
||||
Subject: compiler-link-order
|
||||
|
||||
===================================================================
|
||||
---
|
||||
Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index d7bf658..dd69903 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -150,7 +150,7 @@ wireless.h:
|
||||
|
||||
# Compilation of the dynamic library
|
||||
$(DYNAMIC): $(OBJS:.o=.so)
|
||||
- $(CC) -shared -o $@ -Wl,-soname,$@ $(STRIPFLAGS) $(LIBS) $(LDFLAGS) -lc $^
|
||||
+ $(CC) -shared -o $@ -Wl,-soname,$@ $(STRIPFLAGS) $^ $(LIBS) $(LDFLAGS) -lc
|
||||
|
||||
# Compilation of the static library
|
||||
$(STATIC): $(OBJS:.o=.so)
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
From: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
|
||||
Date: Sat, 14 May 2022 03:18:38 +0800
|
||||
Subject: fix-makefile-for-debian
|
||||
|
||||
---
|
||||
Makefile | 12 ++++++------
|
||||
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 0078324..59f5154 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -19,7 +19,7 @@ RANLIB = ranlib
|
||||
## a local version (non-root).
|
||||
## Standard distros should comment that option to save space and to
|
||||
## build libiw.so used by third parties...
|
||||
-BUILD_STATIC = y
|
||||
+# BUILD_STATIC = y
|
||||
|
||||
## Uncomment this to build without using libm (less efficient).
|
||||
## This is mostly useful for embedded platforms without maths.
|
||||
@@ -75,8 +75,8 @@ DYNAMIC_LINK= libiw.so
|
||||
# Install directories
|
||||
INSTALL_DIR= $(PREFIX)/sbin
|
||||
INSTALL_LIB= $(PREFIX)/lib
|
||||
-INSTALL_INC= $(PREFIX)/include
|
||||
-INSTALL_MAN= $(PREFIX)/man
|
||||
+INSTALL_INC= $(PREFIX)/usr/include
|
||||
+INSTALL_MAN= $(PREFIX)/usr/share/man
|
||||
|
||||
# Various commands
|
||||
RM = rm -f
|
||||
@@ -104,9 +104,9 @@ ifdef BUILD_WE_ESSENTIAL
|
||||
endif
|
||||
|
||||
# Other flags
|
||||
-CFLAGS=-Os -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow \
|
||||
+#CFLAGS=-Os -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow \
|
||||
-Wpointer-arith -Wcast-qual -Winline -I.
|
||||
-#CFLAGS=-O2 -W -Wall -Wstrict-prototypes -I.
|
||||
+CFLAGS=-O2 -W -Wall -Wstrict-prototypes -I.
|
||||
DEPFLAGS=-MMD
|
||||
XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) $(WELIB_FLAG) $(WEDEF_FLAG)
|
||||
PICFLAG=-fPIC
|
||||
@@ -115,7 +115,7 @@ PICFLAG=-fPIC
|
||||
all:: $(IWLIB) $(PROGS)
|
||||
|
||||
%: %.o
|
||||
- $(CC) $(LDFLAGS) $(STRIPFLAGS) $(XCFLAGS) -o $@ $^ $(LIBS)
|
||||
+ $(CC) $(LDFLAGS) $(STRIPFLAGS) $(XCFLAGS) -o $@ $^
|
||||
%.o: %.c wireless.h
|
||||
$(CC) $(XCFLAGS) -c $<
|
||||
%.so: %.c wireless.h
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
From: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
|
||||
Date: Sat, 14 May 2022 03:18:38 +0800
|
||||
Subject: fix-typos
|
||||
|
||||
---
|
||||
iwlist.8 | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/iwlist.8 b/iwlist.8
|
||||
index aa84279..1675bb6 100644
|
||||
--- a/iwlist.8
|
||||
+++ b/iwlist.8
|
||||
@@ -115,7 +115,7 @@ the card. See your driver documentation for details.
|
||||
List the wireless events supported by the device.
|
||||
.TP
|
||||
.B auth
|
||||
-List the WPA authentication parametes curently set.
|
||||
+List the WPA authentication parameters currently set.
|
||||
.TP
|
||||
.BR wpa [keys]
|
||||
List all the WPA encryption keys set in the device.
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
From: Guus Sliepen <guus@debian.org>
|
||||
Date: Sat, 14 May 2022 03:18:38 +0800
|
||||
Subject: honour CFLAGS provided by the environment
|
||||
|
||||
This allows debian/rules to override the CFLAGS variable.
|
||||
---
|
||||
Makefile | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 59f5154..7fcd966 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -106,7 +106,8 @@ endif
|
||||
# Other flags
|
||||
#CFLAGS=-Os -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow \
|
||||
-Wpointer-arith -Wcast-qual -Winline -I.
|
||||
-CFLAGS=-O2 -W -Wall -Wstrict-prototypes -I.
|
||||
+CFLAGS?=-O2 -W -Wall -Wstrict-prototypes -I.
|
||||
+CFLAGS+=-I.
|
||||
DEPFLAGS=-MMD
|
||||
XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) $(WELIB_FLAG) $(WEDEF_FLAG)
|
||||
PICFLAG=-fPIC
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
From: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
|
||||
Date: Sat, 14 May 2022 03:18:38 +0800
|
||||
Subject: improve-make-install
|
||||
|
||||
---
|
||||
Makefile | 15 +++++++++------
|
||||
1 file changed, 9 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 7fcd966..d7bf658 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -73,8 +73,10 @@ endif
|
||||
DYNAMIC_LINK= libiw.so
|
||||
|
||||
# Install directories
|
||||
+ARCH=$(shell gcc -print-multiarch)
|
||||
INSTALL_DIR= $(PREFIX)/sbin
|
||||
-INSTALL_LIB= $(PREFIX)/lib
|
||||
+INSTALL_LIB= $(PREFIX)/lib/$(ARCH)
|
||||
+INSTALL_USR_LIB= $(PREFIX)/usr/lib/$(ARCH)
|
||||
INSTALL_INC= $(PREFIX)/usr/include
|
||||
INSTALL_MAN= $(PREFIX)/usr/share/man
|
||||
|
||||
@@ -120,7 +122,7 @@ all:: $(IWLIB) $(PROGS)
|
||||
%.o: %.c wireless.h
|
||||
$(CC) $(XCFLAGS) -c $<
|
||||
%.so: %.c wireless.h
|
||||
- $(CC) $(XCFLAGS) $(PICFLAG) -c -o $@ $<
|
||||
+ $(CC) $(XCFLAGS) $(LDFLAGS) $(PICFLAG) -c -o $@ $<
|
||||
|
||||
iwconfig: iwconfig.o $(IWLIB)
|
||||
|
||||
@@ -148,7 +150,7 @@ wireless.h:
|
||||
|
||||
# Compilation of the dynamic library
|
||||
$(DYNAMIC): $(OBJS:.o=.so)
|
||||
- $(CC) -shared -o $@ -Wl,-soname,$@ $(STRIPFLAGS) $(LIBS) -lc $^
|
||||
+ $(CC) -shared -o $@ -Wl,-soname,$@ $(STRIPFLAGS) $(LIBS) $(LDFLAGS) -lc $^
|
||||
|
||||
# Compilation of the static library
|
||||
$(STATIC): $(OBJS:.o=.so)
|
||||
@@ -164,14 +166,15 @@ install:: $(IWLIB_INSTALL) install-bin install-hdr install-man
|
||||
install-dynamic:: $(DYNAMIC)
|
||||
install -m 755 -d $(INSTALL_LIB)
|
||||
install -m 755 $(DYNAMIC) $(INSTALL_LIB)
|
||||
- ln -sfn $(DYNAMIC) $(INSTALL_LIB)/$(DYNAMIC_LINK)
|
||||
+ install -m 755 -d $(INSTALL_USR_LIB)
|
||||
+ ln -sfn /lib/$(ARCH)/$(DYNAMIC) $(INSTALL_USR_LIB)/$(DYNAMIC_LINK)
|
||||
@echo "*** Don't forget to add $(INSTALL_LIB) to /etc/ld.so.conf, and run ldconfig as root. ***"
|
||||
@$(LDCONFIG) || echo "*** Could not run ldconfig ! ***"
|
||||
|
||||
# Install the static library
|
||||
install-static:: $(STATIC)
|
||||
- install -m 755 -d $(INSTALL_LIB)
|
||||
- install -m 644 $(STATIC) $(INSTALL_LIB)
|
||||
+ install -m 755 -d $(INSTALL_USR_LIB)
|
||||
+ install -m 644 $(STATIC) $(INSTALL_USR_LIB)
|
||||
|
||||
# All the binaries. Careful, no dependancy on install-dynamic
|
||||
install-bin:: all
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
fix-makefile-for-debian.diff
|
||||
zero-struct-iwr.diff
|
||||
wireless-tools-docs.patch
|
||||
honour-cflags
|
||||
add-import-type-to-udev-rules
|
||||
fix-typos
|
||||
improve-make-install
|
||||
compiler-link-order.patch
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
From: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
|
||||
Date: Sat, 14 May 2022 03:18:38 +0800
|
||||
Subject: wireless-tools-docs
|
||||
|
||||
---
|
||||
iftab.5 | 6 +-----
|
||||
1 file changed, 1 insertion(+), 5 deletions(-)
|
||||
|
||||
diff --git a/iftab.5 b/iftab.5
|
||||
index b0cc970..bf94859 100644
|
||||
--- a/iftab.5
|
||||
+++ b/iftab.5
|
||||
@@ -50,11 +50,7 @@ If you want to use alternate descriptors for an interface name
|
||||
(logical or), specify two different mappings with the same interface
|
||||
name (one on each line).
|
||||
.B Ifrename
|
||||
-always use the first matching mapping starting from the
|
||||
-.I end
|
||||
-of
|
||||
-.BR iftab ,
|
||||
-therefore more restrictive mapping should be specified last.
|
||||
+always uses the last matching mapping in iftab.
|
||||
.\"
|
||||
.\" INTERFACE NAME part
|
||||
.\"
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
From: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
|
||||
Date: Sat, 14 May 2022 03:18:38 +0800
|
||||
Subject: zero-struct-iwr
|
||||
|
||||
---
|
||||
iwlib.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/iwlib.c b/iwlib.c
|
||||
index 5a9550a..a5947d0 100644
|
||||
--- a/iwlib.c
|
||||
+++ b/iwlib.c
|
||||
@@ -676,6 +676,7 @@ iw_get_basic_config(int skfd,
|
||||
{
|
||||
struct iwreq wrq;
|
||||
|
||||
+ memset((char *) &wrq, 0, sizeof(struct iwreq));
|
||||
memset((char *) info, 0, sizeof(struct wireless_config));
|
||||
|
||||
/* Get wireless name */
|
||||
|
|
@ -1 +1 @@
|
|||
3.0 (quilt)
|
||||
3.0 (native)
|
||||
|
|
|
|||
Loading…
Reference in New Issue