- 070923

Changed files:
    chntpw-debian.patch -> 1.4
    chntpw.spec -> 1.11

diff --git a/chntpw-debian.patch b/chntpw-debian.patch
index e70b957eadf3e7e42cbb5b70a85db594d44601cb..b148146bafff0bfdc0a715df7b9ec4d0607d299c 100644 (file)
--- a/chntpw-debian.patch
+++ b/chntpw-debian.patch
@@ -1,22 +1,13 @@
---- chntpw-0.99.1-030126.orig/Makefile
-+++ chntpw-0.99.1-030126/Makefile
-@@ -15,16 +15,13 @@
- CFLAGS= -DUSEOPENSSL -g -I. -I$(OSSLINC) -Wall
+--- chntpw-070923/Makefile.orig        2007-09-23 17:58:06.000000000 +0000
++++ chntpw-070923/Makefile     2007-10-13 14:00:56.953996630 +0000
+@@ -16,7 +16,7 @@
+ 
  
  # This is to link with whatever we have, SSL crypto lib we put in static
 -LIBS=-L$(OSSLLIB) $(OSSLLIB)/libcrypto.a
-+LIBS=-L$(OSSLLIB) -lcrypto
- 
- # ** This is for linking with older and more lean libc than installed as default
- #    in RH7+ or newer Mandrakes. And probably others. GLIBC has BLOATED!
- # Use the reloc (and force it) in rpm to install into /usr/local :)
- 
- #LIBS=-L$(OSSLLIB) -L/usr/local/libold -L/usr/local/usr/lib \
--$(OSSLLIB)/libcrypto.so /usr/local/usr/lib/crt1.o /usr/local/usr/lib/crti.o \
--/usr/local/libold/ld-2.0.5.so \
--/usr/local/usr/lib/libc.so /usr/local/libold/libc-2.0.5.so /usr/local/usr/lib/crtn.o 
++LIBS= -lcrypto
  
- all: chntpw
+ all: chntpw chntpw.static cpnt
  
 --- chntpw-0.99.1-030126.orig/chntpw.8
 +++ chntpw-0.99.1-030126/chntpw.8
@@ -117,43 +108,3 @@
 +This manual page was written by 
 +Javier Fernandez-Sanguino Peña <jfs@computer.org>,
 +for the Debian GNU/Linux system (but may be used by others).
---- chntpw/chntpw.c    2004-08-18 17:42:01.000000000 -0300
-+++ chntpw.new/chntpw.c        2005-04-09 18:58:34.000000000 -0300
-@@ -511,7 +511,7 @@
-       printf("** LANMAN password IS however set. Will now install new password as NT pass instead.\n");
-       printf("** NOTE: Continue at own risk!\n");
-       ntpw_offs = lmpw_offs;
--      (unsigned int)*(vp+0xa8) = ntpw_offs - 0xcc;
-+      *((unsigned int*)vp+0xa8) = ntpw_offs - 0xcc;
-       ntpw_len = 16;
-       lmpw_len = 0;
-       }
-@@ -621,14 +621,14 @@
-          ntpw_len = 16;
-          lmpw_len = 16;
-          ntpw_offs -= 4;
--         (unsigned int)*(vp+0xa8) = ntpw_offs - 0xcc;
-+         *((unsigned int*)vp+0xa8) = ntpw_offs - 0xcc;
-          *(vp + 0xa0) = 16;
-          *(vp + 0xac) = 16;
-        }
-        
-        for (i = 0; i < 16; i++) {
--         (unsigned char)*(vp+ntpw_offs+i) = despw[i];
--         if (lmpw_len >= 16) (unsigned char)*(vp+lmpw_offs+i) = newlandes[i];
-+         *(vp+ntpw_offs+i) = (char)despw[i];
-+         if (lmpw_len >= 16) *(vp+lmpw_offs+i) = (char)newlandes[i];
-        }
-        } else {
-        printf("Unable to set since it is blank.\n");
---- chntpw/ntreg.c     2004-08-18 17:42:02.000000000 -0300
-+++ chntpw.new/ntreg.c 2005-04-09 19:07:50.000000000 -0300
-@@ -2514,7 +2514,7 @@
-   ALLOC(kr,1,sizeof(int)+sizeof(int));
-   
-   kr->len = sizeof(int);
--  (int)kr->data = dword;
-+  kr->data = dword;
- 
-   r = put_buf2val(hdesc, kr, vofs, path, REG_DWORD);
- 

diff --git a/chntpw.spec b/chntpw.spec
index 542329ba8d56495d1484b51d8ce0b174718bcb50..6de92a20c552d864fd13820322ef984e152bbd0d 100644 (file)
--- a/chntpw.spec
+++ b/chntpw.spec
@@ -1,12 +1,12 @@
 Summary:       NT SAM password recovery utility
 Summary(pl.UTF-8):     Narzędzie do odtwarzania haseł NT SAM
 Name:          chntpw
-Version:       040818
+Version:       070923
 Release:       1
-License:       chntpw
+License:       GPL
 Group:         Applications/System
 Source0:       http://home.eunet.no/~pnordahl/ntpasswd/%{name}-source-%{version}.zip
-# Source0-md5: bced2cd4b8b0db899e92fd19150412e2
+# Source0-md5: 3a013336ada58d9383a6e4b609b3149a
 Patch0:                %{name}-debian.patch
 URL:           http://home.eunet.no/~pnordahl/ntpasswd/
 BuildRequires: openssl-devel >= 0.9.7d
@@ -36,7 +36,7 @@ możemy dodać to narzędzie do własnych obrazów lub użyć obrazów ze
 strony domowej.
 
 %prep
-%setup -q -c
+%setup -q
 %patch0 -p1
 
 %build