Hi Alexandru,
Alexandru Mihail <alexandru.mihail2897@gmail.com> writes:
> MR filed:
> https://salsa.debian.org/debian/mini-httpd/-/merge_requests/2
Thanks. We can rebase and squash at the end, but for now please don't
force push.
>>Oh man, yeah, hello early days of the internet! All you need now is
>>some MIDI files and GIFs.
> Haha, your paragraph makes me want to reinstall DOOM/Starcraft for the
> nth time now :)
:)
>>3. Please note which version of NCSA httpd matches mini-httpd.
> After much diff'ing and vim'ing and staring at #ifdefs and trying to
> separate Jef's unversioned changes to htpasswd.c from actual NCSA
> updates:
> It's 99.999% 1.4.2. I noted that in debian/copyright.
Remember my Wed, 21 Jun 2023 email (as well as the one with the
diagram)? 1.4.2 still has the "no commercial endeavour" clause.
Here is what I found with
https://github.com/TooDumbForAName/ncsa-httpd/
$ git checkout 1.5.1
$ git diff 1.4.2 -- support/htpasswd.c
diff --git a/support/htpasswd.c b/support/htpasswd.c
index a9263ec..fb3415a 100644
--- a/support/htpasswd.c
+++ b/support/htpasswd.c
@@ -4,12 +4,18 @@
* Rob McCool
*/
+#include "config.h"
+#include "portability.h"
+
#include <sys/types.h>
#include <stdio.h>
#include <string.h>
#include <sys/signal.h>
#include <stdlib.h>
#include <time.h>
+#ifdef NEED_CRYPT_H
+#include <crypt.h>
+#endif /* NEED_CRYPT_H */
#define LF 10
#define CR 13
@@ -79,10 +85,13 @@ to64(s, v, n)
}
}
+#ifdef HEAD_CRYPT
char *crypt(char *pw, char *salt); /* why aren't these prototyped in include */
+#endif /* HEAD_CRYPT */
+
#ifdef HEAD_GETPASS
char *getpass(char *prompt);
-#endif
+#endif /* HEAD_GETPASS */
void add_password(char *user, FILE *f) {
char *pw, *cpw, salt[3];
=====
I compared a couple of versions and found the same diff.
Hint: Read the commit message for 1.5.1. Having read that, what is your
explanation for this diff, and what is your explanation for the changes
between any version of httpd in this range and mini-httpd? There's
another hint in the tarball name that you're comparing with, but that
Jef Poskanzer may not have used.
> I hope everything is in order with my MR.
Yes, your MR looks good. I started a review and noted what looks like
one typo.
> Have a great day and may the Debian swirl girate eternally !
Haha, you too!
Nicholas
Attachment:
signature.asc
Description: PGP signature