| 1 |
darkside 08/12/05 01:51:31 |
| 2 |
|
| 3 |
Added: nmh-1.3-install.patch nmh-1.3-inc-login.patch |
| 4 |
nmh-1.3-m_getfld.patch |
| 5 |
Log: |
| 6 |
(non-maintainer commit) version bump for bug #224807 |
| 7 |
(Portage version: 2.2_rc16/cvs/Linux 2.6.28-rc6-wl-dirty x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 mail-client/nmh/files/nmh-1.3-install.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/nmh/files/nmh-1.3-install.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/nmh/files/nmh-1.3-install.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: nmh-1.3-install.patch |
| 16 |
=================================================================== |
| 17 |
--- nmh-1.3/uip/Makefile.in.~1~ 2005-12-24 09:17:38.000000000 -0800 |
| 18 |
+++ nmh-1.3/uip/Makefile.in 2008-11-28 10:50:48.613075060 -0800 |
| 19 |
@@ -267,7 +267,6 @@ install-lcmds: |
| 20 |
rm -f $(DESTDIR)$(bindir)/folders |
| 21 |
rm -f $(DESTDIR)$(bindir)/prev |
| 22 |
rm -f $(DESTDIR)$(bindir)/next |
| 23 |
- rm -f $(DESTDIR)$(libdir)/install-mh |
| 24 |
$(LN) $(DESTDIR)$(bindir)/flist $(DESTDIR)$(bindir)/flists |
| 25 |
$(LN) $(DESTDIR)$(bindir)/folder $(DESTDIR)$(bindir)/folders |
| 26 |
$(LN) $(DESTDIR)$(bindir)/show $(DESTDIR)$(bindir)/prev |
| 27 |
|
| 28 |
|
| 29 |
|
| 30 |
1.1 mail-client/nmh/files/nmh-1.3-inc-login.patch |
| 31 |
|
| 32 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/nmh/files/nmh-1.3-inc-login.patch?rev=1.1&view=markup |
| 33 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/nmh/files/nmh-1.3-inc-login.patch?rev=1.1&content-type=text/plain |
| 34 |
|
| 35 |
Index: nmh-1.3-inc-login.patch |
| 36 |
=================================================================== |
| 37 |
--- nmh-1.3/uip/inc.c.~1~ 2007-11-04 03:54:34.000000000 -0800 |
| 38 |
+++ nmh-1.3/uip/inc.c 2008-11-28 10:24:03.044265843 -0800 |
| 39 |
@@ -496,8 +496,7 @@ main (int argc, char **argv) |
| 40 |
* a POP server? |
| 41 |
*/ |
| 42 |
if (inc_type == INC_POP) { |
| 43 |
- if (user == NULL) |
| 44 |
- user = getusername (); |
| 45 |
+ |
| 46 |
if ( strcmp( POPSERVICE, "kpop" ) == 0 ) { |
| 47 |
kpop = 1; |
| 48 |
} |
| 49 |
@@ -506,6 +505,12 @@ main (int argc, char **argv) |
| 50 |
else |
| 51 |
ruserpass (host, &user, &pass); |
| 52 |
|
| 53 |
+ /* |
| 54 |
+ * Do this _after_ ruserpass, otherwise the login field will be unusable |
| 55 |
+ */ |
| 56 |
+ if (user == NULL) |
| 57 |
+ user = getusername (); |
| 58 |
+ |
| 59 |
/* |
| 60 |
* initialize POP connection |
| 61 |
*/ |
| 62 |
|
| 63 |
|
| 64 |
|
| 65 |
1.1 mail-client/nmh/files/nmh-1.3-m_getfld.patch |
| 66 |
|
| 67 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/nmh/files/nmh-1.3-m_getfld.patch?rev=1.1&view=markup |
| 68 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-client/nmh/files/nmh-1.3-m_getfld.patch?rev=1.1&content-type=text/plain |
| 69 |
|
| 70 |
Index: nmh-1.3-m_getfld.patch |
| 71 |
=================================================================== |
| 72 |
--- nmh-1.3/sbr/m_getfld.c.~1~ 2008-04-05 11:41:37.000000000 -0700 |
| 73 |
+++ nmh-1.3/sbr/m_getfld.c 2008-11-28 10:25:34.768265994 -0800 |
| 74 |
@@ -731,18 +731,18 @@ matchc(int patln, char *pat, int strln, |
| 75 |
register char *ep = pat + patln; |
| 76 |
register char pc = *pat++; |
| 77 |
|
| 78 |
- for(;;) { |
| 79 |
- while (pc != *str++) |
| 80 |
- if (str > es) |
| 81 |
- return 0; |
| 82 |
+ for(;str <= es; str++) { |
| 83 |
+ if (pc != *str) |
| 84 |
+ continue; |
| 85 |
if (str > es+1) |
| 86 |
return 0; |
| 87 |
- sp = str; pp = pat; |
| 88 |
+ sp = str+1; pp = pat; |
| 89 |
while (pp < ep && *sp++ == *pp) |
| 90 |
pp++; |
| 91 |
if (pp >= ep) |
| 92 |
- return ((unsigned char *)--str); |
| 93 |
+ return ((unsigned char *)str); |
| 94 |
} |
| 95 |
+ return 0; |
| 96 |
} |
Archives