Mercurial Mercurial > upstream > oracle > sfw-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
usr/src/cmd/mutt/Patches/mutt-sasl.patch
author Cyril Plisko <cyril.plisko@grigale.com>
Thu, 18 Mar 2010 16:36:00 +0200
changeset 10 612517e396e0
permissions -rw-r--r--
Import sfw build 136 Bugs Fixed ---------- 6514945 webmin still refers to xmemfs usr/sfw/lib/webmin/mount/solaris-lib.pl 6633684 [nvb78] Webmin is not integrated with apache2.2 6641988 [nvb79] Webmin interface for mysql badly configured 6780832 Add SASL support to mutt 6796795 copy text from mutt in gnome-terminal to other application is adding spaces 6799158 Update SER to link the MySQL 5.1 instead of the MySQL 4.0 6804425 Mutt doesn't have header cache support 6809910 Webmin 1.170 (Solaris 10): newaliases is not called when clicking Delete on sendmail/edit_alias.cgi 6828622 libnet Makefile invokes gcc directly, it should use $(CC) instead. 6903750 mutt fails to read MH-style mail dirs 6909860 /usr/man/man4/ipmiconsole.conf.4 refer to nonexistent man/man5 man pages in osol_129 and osol_132 6914573 webmin bundled with Solaris vulnerable to three separate XSS vulnerab ilities 6920693 trousers should use newer software 6922082 CVE-2010-0393 - CUPS lppasswd utility vulnerability 6924985 CVE-2010-0302: incomplete fix for CUPS CR#6900557(CVE-2009-3553) 6927042 memleaks in libtspi 6930830 upgrade OpenSSL to 0.9.8m (and fix CVE-2009-3555) 6932600 completion failure with zfs destroy, some problems with _dladm 6933290 After pkg image-update and reboot, tomcat service falls into maintenance 6933533 PSARC/2009/232 implementation breaks nmap 6933649 webmin contains Sun's branding, which should be removed 6934512 Envelope is not redrawn in compose mode after return from the message edit
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
10
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     1
 
--- configure.orig
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     2
 
+++ configure
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     3
 
@@ -16643,13 +16643,13 @@
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     4
 
           saved_LIBS="$LIBS"
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     5
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     6
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     7
 
-{ $as_echo "$as_me:$LINENO: checking for sasl_client_init in -lsasl2" >&5
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     8
 
-$as_echo_n "checking for sasl_client_init in -lsasl2... " >&6; }
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
     9
 
+{ $as_echo "$as_me:$LINENO: checking for sasl_client_init in -lsasl" >&5
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    10
 
+$as_echo_n "checking for sasl_client_init in -lsasl... " >&6; }
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    11
 
 if test "${ac_cv_lib_sasl2_sasl_client_init+set}" = set; then
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    12
 
   $as_echo_n "(cached) " >&6
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    13
 
 else
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    14
 
   ac_check_lib_save_LIBS=$LIBS
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    15
 
-LIBS="-lsasl2  $LIBS"
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    16
 
+LIBS="-lsasl  $LIBS"
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    17
 
 cat >conftest.$ac_ext <<_ACEOF
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    18
 
 /* confdefs.h.  */
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    19
 
 _ACEOF
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    20
 
@@ -16713,17 +16713,17 @@
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    21
 
 #define HAVE_LIBSASL2 1
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    22
 
 _ACEOF
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    23
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    24
 
-  LIBS="-lsasl2 $LIBS"
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    25
 
+  LIBS="-lsasl $LIBS"
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    26
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    27
 
 else
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    28
 
-  { { $as_echo "$as_me:$LINENO: error: could not find libsasl2" >&5
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    29
 
-$as_echo "$as_me: error: could not find libsasl2" >&2;}
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    30
 
+  { { $as_echo "$as_me:$LINENO: error: could not find libsasl" >&5
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    31
 
+$as_echo "$as_me: error: could not find libsasl" >&2;}
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    32
 
    { (exit 1); exit 1; }; }
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    33
 
 fi
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    34
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    35
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    36
 
           MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_sasl.o"
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    37
 
-          MUTTLIBS="$MUTTLIBS -lsasl2"
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    38
 
+          MUTTLIBS="$MUTTLIBS -lsasl"
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    39
 
           LIBS="$saved_LIBS"
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    40
612517e396e0 Import sfw build 136
Cyril Plisko <cyril.plisko@grigale.com>
parents:
diff changeset 
    41
 
 cat >>confdefs.h <<\_ACEOF
upstream/oracle/sfw-gate