[PATCH] net/sctp/Config.in make oldconfig compatibility (bash)

[PATCH] net/sctp/Config.in make oldconfig compatibility (bash)

[Matthias Andree]

Hello,

I've needed the patch enclosed below the signature to remove some "make
oldconfig" complaints in the current Linux-2.4 BK version.

Please Cc: feedback to my sender address unless you are including
linux-kernel; I'm not subscribed to lksctp-developers.

Matthias Andree



You can import this changeset into BK by piping this whole message to:
'| bk receive [path to repository]' or apply the patch as usual.

===================================================================


ChangeSet@1.1317, 2004-02-16 13:04:03+01:00, matthias.andree@gmx.de
  Fix "make oldconfig" (bash 2) by inserting leading space before closing bracket.
  Add leading space for some choice options for consistent formatting.


 Config.in |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)


diff -Nru a/net/sctp/Config.in b/net/sctp/Config.in
--- a/net/sctp/Config.in	Tue Feb 17 13:12:46 2004
+++ b/net/sctp/Config.in	Tue Feb 17 13:12:46 2004
@@ -15,26 +15,26 @@
    bool '    SCTP: Debug messages' CONFIG_SCTP_DBG_MSG
    bool '    SCTP: Debug object counts' CONFIG_SCTP_DBG_OBJCNT
 fi
-if [ "$CONFIG_CRYPTO_HMAC" = "n"]; then
+if [ "$CONFIG_CRYPTO_HMAC" = "n" ]; then
   choice 'SCTP: Cookie HMAC Algorithm' \
         "HMAC-NONE		CONFIG_SCTP_HMAC_NONE" HMAC-NONE
 else
-  if [ "$CONFIG_CRYPTO_MD5" = "n" -a "$CONFIG_CRYPTO_SHA1" = "n"]; then
+  if [ "$CONFIG_CRYPTO_MD5" = "n" -a "$CONFIG_CRYPTO_SHA1" = "n" ]; then
     choice 'SCTP: Cookie HMAC Algorithm' \
         "HMAC-NONE		CONFIG_SCTP_HMAC_NONE" HMAC-NONE
   else
-    if [ "$CONFIG_CRYPTO_MD5" != "n" -a "$CONFIG_CRYPTO_SHA1" != "n"]; then
-      choice 'SCTP: Cookie HMAC Algorithm' \
+    if [ "$CONFIG_CRYPTO_MD5" != "n" -a "$CONFIG_CRYPTO_SHA1" != "n" ]; then
+      choice '    SCTP: Cookie HMAC Algorithm' \
         "HMAC-NONE		CONFIG_SCTP_HMAC_NONE \
-         HMAC-SHA1              CONFIG_SCTP_HMAC_SHA1 \
+         HMAC-SHA1		CONFIG_SCTP_HMAC_SHA1 \
          HMAC-MD5		CONFIG_SCTP_HMAC_MD5"	HMAC-SHA1
     else
       if [ "$CONFIG_CRYPTO_MD5" != "n" ]; then
-        choice 'SCTP: Cookie HMAC Algorithm' \
+        choice '    SCTP: Cookie HMAC Algorithm' \
         "HMAC-NONE		CONFIG_SCTP_HMAC_NONE \
          HMAC-MD5		CONFIG_SCTP_HMAC_MD5"	HMAC-MD5
       else
-        choice 'SCTP: Cookie HMAC Algorithm' \
+        choice '    SCTP: Cookie HMAC Algorithm' \
         "HMAC-NONE		CONFIG_SCTP_HMAC_NONE \
          HMAC-SHA1		CONFIG_SCTP_HMAC_SHA1"	HMAC-SHA1
       fi

===================================================================


This BitKeeper patch contains the following changesets:
1.1317

# User:	matthias.andree
# Host:	gmx.de
# Root:	/suse/kernel/BK/linux-2.4

# Patch vers:	1.3
# Patch type:	REGULAR

== ChangeSet ==
torvalds@athlon.transmeta.com|ChangeSet|20020205173056|16047|c1d11a41ed024864
marcelo@logos.cnet|ChangeSet|20040215224359|07068
D 1.1317 04/02/16 13:04:03+01:00 matthias.andree@gmx.de +1 -0
B torvalds@athlon.transmeta.com|ChangeSet|20020205173056|16047|c1d11a41ed024864
C
c Fix "make oldconfig" (bash 2) by inserting leading space before closing bracket.
c Add leading space for some choice options for consistent formatting.
K 7892
P ChangeSet
------------------------------------------------

0a0
> damien.morange@hp.com|net/sctp/Config.in|20030919112027|12961|ee6ef1685a9ff3d6 matthias.andree@gmx.de|net/sctp/Config.in|20040216120146|33591

== net/sctp/Config.in ==
damien.morange@hp.com|net/sctp/Config.in|20030919112027|12961|ee6ef1685a9ff3d6
sri@us.ibm.com|net/sctp/Config.in|20040213003652|33541
D 1.3 04/02/16 13:01:46+01:00 matthias.andree@gmx.de +7 -7
B torvalds@athlon.transmeta.com|ChangeSet|20020205173056|16047|c1d11a41ed024864
C
c Fix "make oldconfig" (bash 2) by inserting leading space before closing bracket.
c Add leading space for some choice options for consistent formatting.
K 33591
O -rw-rw-r--
P net/sctp/Config.in
------------------------------------------------

D18 1
I18 1
if [ "$CONFIG_CRYPTO_HMAC" = "n" ]; then
D22 1
I22 1
  if [ "$CONFIG_CRYPTO_MD5" = "n" -a "$CONFIG_CRYPTO_SHA1" = "n" ]; then
D26 2
I27 2
    if [ "$CONFIG_CRYPTO_MD5" != "n" -a "$CONFIG_CRYPTO_SHA1" != "n" ]; then
      choice '    SCTP: Cookie HMAC Algorithm' \
D29 1
I29 1
         HMAC-SHA1		CONFIG_SCTP_HMAC_SHA1 \
D33 1
I33 1
        choice '    SCTP: Cookie HMAC Algorithm' \
D37 1
I37 1
        choice '    SCTP: Cookie HMAC Algorithm' \

# Patch checksum=3b6cedb7

Re: [PATCH] net/sctp/Config.in make oldconfig compatibility (bash)

[Sridhar Samudrala]

On Tue, 17 Feb 2004, Matthias Andree wrote:

> Hello,
>
> I've needed the patch enclosed below the signature to remove some "make
> oldconfig" complaints in the current Linux-2.4 BK version.
>
> Please Cc: feedback to my sender address unless you are including
> linux-kernel; I'm not subscribed to lksctp-developers.
>

I thought SCTP changes were backed out just because of these 'make oldconfig'
errors from the 2.4 tree.

Anyway, i have submitted the attached patch that should fix this to davem.
'make oldconfig' and 'make menuconfig' worked fine after applying this patch.

However i am having problem with 'make xconfig'. When CONFIG_SCTP_HMAC_MD5
or CONFIG_SCTP_HMAC_SHA1 is enabled, everything under Crptographic options
is greyed out.

I would appreciate if some config expert can take a look at this and figure
out what is happening.

Thanks
Sridhar

-------------------------------------------------------------------------------
diff -Nru a/crypto/Config.in b/crypto/Config.in
--- a/crypto/Config.in	Mon Feb 16 15:39:29 2004
+++ b/crypto/Config.in	Mon Feb 16 15:39:29 2004
@@ -11,7 +11,9 @@
      "$CONFIG_INET6_AH" = "y" -o \
      "$CONFIG_INET6_AH" = "m" -o \
      "$CONFIG_INET6_ESP" = "y" -o \
-     "$CONFIG_INET6_ESP" = "m" ]; then
+     "$CONFIG_INET6_ESP" = "m" -o \
+     "$CONFIG_SCTP_HMAC_MD5" = "y" -o \
+     "$CONFIG_SCTP_HMAC_SHA1" = "y" ]; then
   define_bool CONFIG_CRYPTO y
 else
   bool 'Cryptographic API' CONFIG_CRYPTO
@@ -25,7 +27,9 @@
        "$CONFIG_INET6_AH" = "y" -o \
        "$CONFIG_INET6_AH" = "m" -o \
        "$CONFIG_INET6_ESP" = "y" -o \
-       "$CONFIG_INET6_ESP" = "m" ]; then
+       "$CONFIG_INET6_ESP" = "m" -o \
+       "$CONFIG_SCTP_HMAC_MD5" = "y" -o \
+       "$CONFIG_SCTP_HMAC_SHA1" = "y" ]; then
     define_bool CONFIG_CRYPTO_HMAC y
   else
     bool           '  HMAC support' CONFIG_CRYPTO_HMAC
@@ -39,7 +43,8 @@
        "$CONFIG_INET6_AH" = "y" -o \
        "$CONFIG_INET6_AH" = "m" -o \
        "$CONFIG_INET6_ESP" = "y" -o \
-       "$CONFIG_INET6_ESP" = "m" ]; then
+       "$CONFIG_INET6_ESP" = "m" -o \
+       "$CONFIG_SCTP_HMAC_MD5" = "y" ]; then
     define_bool CONFIG_CRYPTO_MD5 y
   else
     tristate       '  MD5 digest algorithm' CONFIG_CRYPTO_MD5
@@ -51,7 +56,8 @@
        "$CONFIG_INET6_AH" = "y" -o \
        "$CONFIG_INET6_AH" = "m" -o \
        "$CONFIG_INET6_ESP" = "y" -o \
-       "$CONFIG_INET6_ESP" = "m" ]; then
+       "$CONFIG_INET6_ESP" = "m" -o \
+       "$CONFIG_SCTP_HMAC_SHA1" = "y" ]; then
     define_bool CONFIG_CRYPTO_SHA1 y
   else
     tristate       '  SHA1 digest algorithm' CONFIG_CRYPTO_SHA1
diff -Nru a/net/sctp/Config.in b/net/sctp/Config.in
--- a/net/sctp/Config.in	Mon Feb 16 15:39:29 2004
+++ b/net/sctp/Config.in	Mon Feb 16 15:39:29 2004
@@ -14,31 +14,9 @@
 if [ "$CONFIG_IP_SCTP" != "n" ]; then
    bool '    SCTP: Debug messages' CONFIG_SCTP_DBG_MSG
    bool '    SCTP: Debug object counts' CONFIG_SCTP_DBG_OBJCNT
-fi
-if [ "$CONFIG_CRYPTO_HMAC" = "n"]; then
-  choice 'SCTP: Cookie HMAC Algorithm' \
-        "HMAC-NONE		CONFIG_SCTP_HMAC_NONE" HMAC-NONE
-else
-  if [ "$CONFIG_CRYPTO_MD5" = "n" -a "$CONFIG_CRYPTO_SHA1" = "n"]; then
-    choice 'SCTP: Cookie HMAC Algorithm' \
-        "HMAC-NONE		CONFIG_SCTP_HMAC_NONE" HMAC-NONE
-  else
-    if [ "$CONFIG_CRYPTO_MD5" != "n" -a "$CONFIG_CRYPTO_SHA1" != "n"]; then
-      choice 'SCTP: Cookie HMAC Algorithm' \
-        "HMAC-NONE		CONFIG_SCTP_HMAC_NONE \
-         HMAC-SHA1              CONFIG_SCTP_HMAC_SHA1 \
-         HMAC-MD5		CONFIG_SCTP_HMAC_MD5"	HMAC-SHA1
-    else
-      if [ "$CONFIG_CRYPTO_MD5" != "n" ]; then
-        choice 'SCTP: Cookie HMAC Algorithm' \
-        "HMAC-NONE		CONFIG_SCTP_HMAC_NONE \
-         HMAC-MD5		CONFIG_SCTP_HMAC_MD5"	HMAC-MD5
-      else
-        choice 'SCTP: Cookie HMAC Algorithm' \
-        "HMAC-NONE		CONFIG_SCTP_HMAC_NONE \
-         HMAC-SHA1		CONFIG_SCTP_HMAC_SHA1"	HMAC-SHA1
-      fi
-    fi
-  fi
+choice 'SCTP: Cookie HMAC Algorithm' \
+   "HMAC-NONE	CONFIG_SCTP_HMAC_NONE \
+    HMAC-SHA1   CONFIG_SCTP_HMAC_SHA1 \
+    HMAC-MD5	CONFIG_SCTP_HMAC_MD5"	HMAC-SHA1
 fi
 endmenu

Re: [PATCH] net/sctp/Config.in make oldconfig compatibility (bash)

[David S. Miller]

On Tue, 17 Feb 2004 10:48:55 -0800 (PST)
Sridhar Samudrala <sri@us.ibm.com> wrote:

> I thought SCTP changes were backed out just because of these 'make oldconfig'
> errors from the 2.4 tree.

I believe Marcelo is just going to clone a tree right before he took in the
SCTP stuff, in order to do the 2.4.25 release.  Then for 2.4.26-pre1 he'll
take the SCTP changes back in and we can add the fix.

> Anyway, i have submitted the attached patch that should fix this to davem.
> 'make oldconfig' and 'make menuconfig' worked fine after applying this patch.

I believe this space fix here is necessary as well as your crypto changes
Sridhar.

Re: [Lksctp-developers] Re: [PATCH] net/sctp/Config.in make oldconfig compatibility (bash)

[Sridhar Samudrala]

On Tue, 17 Feb 2004, David S. Miller wrote:

> On Tue, 17 Feb 2004 10:48:55 -0800 (PST)
> Sridhar Samudrala <sri@us.ibm.com> wrote:
>
> > I thought SCTP changes were backed out just because of these 'make oldconfig'
> > errors from the 2.4 tree.
>
> I believe Marcelo is just going to clone a tree right before he took in the
> SCTP stuff, in order to do the 2.4.25 release.  Then for 2.4.26-pre1 he'll
> take the SCTP changes back in and we can add the fix.
>
> > Anyway, i have submitted the attached patch that should fix this to davem.
> > 'make oldconfig' and 'make menuconfig' worked fine after applying this patch.
>
> I believe this space fix here is necessary as well as your crypto changes
> Sridhar.

If you are referring to the space before the ] brackets in the if statements,
-  if [ "$CONFIG_CRYPTO_MD5" = "n" -a "$CONFIG_CRYPTO_SHA1" = "n"]; then
+  if [ "$CONFIG_CRYPTO_MD5" = "n" -a "$CONFIG_CRYPTO_SHA1" = "n" ]; then

those lines are no longer there in the SCTP Config.in with the crypto changes
patch.

The other space introduced in Matthias patch is in the following lines.
-        choice 'SCTP: Cookie HMAC Algorithm' \
+        choice '    SCTP: Cookie HMAC Algorithm' \

I am not sure if this is needed.

Thanks
Sridhar

Re: [Lksctp-developers] Re: [PATCH] net/sctp/Config.in make oldconfig compatibility (bash)

[Matthias Andree]

On Tue, 17 Feb 2004, Sridhar Samudrala wrote:

> The other space introduced in Matthias patch is in the following lines.
> -        choice 'SCTP: Cookie HMAC Algorithm' \
> +        choice '    SCTP: Cookie HMAC Algorithm' \
> 
> I am not sure if this is needed.

This is not technically needed, but visual fluff, added in order to make
these SCTP algorithm choices align with the previous SCTP options - it's
all about indentation.

-- 
Matthias Andree

Encrypt your mail: my GnuPG key ID is 0x052E7D95