[pkg-wpa-devel] r1446 - in /crda/trunk/debian: crda.postinst patches/disable_gcrypt.patch rules
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Sun Nov 22 08:02:50 UTC 2009
Author: kelmo-guest
Date: Sun Nov 22 08:02:48 2009
New Revision: 1446
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1446
Log:
Make debian/patches/disable_gcrypt.patch upstream-able (in theory) and modify debian/rules as needed. Simply postinst.
Modified:
crda/trunk/debian/crda.postinst
crda/trunk/debian/patches/disable_gcrypt.patch
crda/trunk/debian/rules
Modified: crda/trunk/debian/crda.postinst
URL: http://svn.debian.org/wsvn/pkg-wpa/crda/trunk/debian/crda.postinst?rev=1446&op=diff
==============================================================================
--- crda/trunk/debian/crda.postinst (original)
+++ crda/trunk/debian/crda.postinst Sun Nov 22 08:02:48 2009
@@ -18,7 +18,7 @@
# If prerm fails during replacement due to conflict:
# <postinst> abort-remove in-favour <new-package> <version>
-create_regdomain_matrix()
+create_regdomain_table()
{
# Check the input file exists
[ -s "$1" ] || return 0
@@ -32,29 +32,32 @@
# Markers used to flag autogenerated section of /etc/default/crda.
# All configuration data outside of these markers are never touched.
- START='### START AUTOGENERATED REGDOMAIN MATRIX'
- END='### END AUTOGENERATED REGDOMAIN MATRIX'
+ START='### START AUTOGENERATED'
+ END='### END AUTOGENERATED'
# Remove old autogenerated section.
sed "/^$START/,/^$END/d" /etc/default/crda > \
/etc/default/crda.postinst.tmp
+
+ cat >>/etc/default/crda.postinst.tmp <<EOF
+$START
+#
+# Lines between the AUTOGENERATED markers are managed by crda maintainer
+# scripts. Do not edit between the markers, all changes will be lost.
+#
+# This country description <-> ISO 3166 country code matrix is kept in sync
+# via dpkg trigger with /usr/share/zoneinfo/zone.tab
+#
+EOF
# Append new autogenerated section. Parse tzdata's zone.tab and
# output something which can be sourced by a shell script. This is
# done here to avoid overhead at crda udev agent runtime and to
# allow data to be available in early boot.
- awk -v start="$START" -v end="$END" -v input="$1" -v tzconf="$TZCONF" '
+ awk -v end="$END" -v tz="$TZCONF" '
BEGIN {
- printf("%s\n", start)
- printf("#\n")
- printf("# Lines between the AUTOGENERATED markers are managed by crda maintainer\n")
- printf("# scripts. Do not edit between the markers, all changes will be lost.\n")
- printf("#\n")
- printf("# This country description <-> ISO 3166 country code matrix is kept in sync\n")
- printf("# (via dpkg trigger) with %s\n", input)
- printf("#\n")
printf("if [ -z \"$REGDOMAIN\" ]; then\n")
- printf("\tTIMEZONE=$(sed \"s# #_#g\" %s 2>/dev/null)\n", tzconf)
+ printf("\tTIMEZONE=$(sed \"s# #_#g\" %s 2>/dev/null)\n", tz)
printf("\tcase \"$TIMEZONE\" in\n")
}
$1 ~ /^[A-Z][A-Z]$/ {
@@ -75,7 +78,7 @@
case "$1" in
configure|triggered)
- create_regdomain_matrix /usr/share/zoneinfo/zone.tab
+ create_regdomain_table /usr/share/zoneinfo/zone.tab
;;
abort-upgrade|abort-deconfigure|abort-remove)
;;
Modified: crda/trunk/debian/patches/disable_gcrypt.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/crda/trunk/debian/patches/disable_gcrypt.patch?rev=1446&op=diff
==============================================================================
--- crda/trunk/debian/patches/disable_gcrypt.patch (original)
+++ crda/trunk/debian/patches/disable_gcrypt.patch Sun Nov 22 08:02:48 2009
@@ -10,7 +10,7 @@
reglib.o: keys-ssl.c
else
-+ifeq ($(USE_GCRYPT),1)
++ifneq ($(USE_GCRYPT),0)
CFLAGS += -DUSE_GCRYPT
LDLIBS += -lgcrypt
Modified: crda/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/crda/trunk/debian/rules?rev=1446&op=diff
==============================================================================
--- crda/trunk/debian/rules (original)
+++ crda/trunk/debian/rules Sun Nov 22 08:02:48 2009
@@ -1,9 +1,15 @@
#!/usr/bin/make -f
+
+CRDA_FLAGS := USE_GCRYPT=0 USE_OPENSSL=0
+
%:
- dh --with quilt $@
+ +dh --with quilt $@
override_dh_auto_build:
- $(MAKE) all_noverify
+ $(MAKE) all_noverify $(CRDA_FLAGS)
+
+override_dh_auto_install:
+ $(MAKE) install $(CRDA_FLAGS) DESTDIR=debian/crda
override_dh_fixperms:
dh_fixperms
More information about the Pkg-wpa-devel
mailing list