On 2011-06-15, at 11:07 AM, Stuart Henderson wrote:
> On 2011/06/15 10:53, Vijay Sankar wrote:
>> Hi,
>>
>> I am getting a size mismatch after applying the patch.
>
> oh, let's just mirror it then...thanks for testing
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/www/drupal6/securelogin/Makefile,v
> retrieving revision 1.4
> diff -u -p -r1.4 Makefile
> --- Makefile 15 Nov 2010 09:05:41 -0000 1.4
> +++ Makefile 15 Jun 2011 16:07:20 -0000
> @@ -2,8 +2,10 @@
>
> COMMENT = redirect login screen to https
>
> -DISTNAME = securelogin-6.x-1.x-dev
> +DISTNAME = securelogin-6.x-1.x-dev
> PKGNAME = drupal6-securelogin-1
> -REVISION = 1
> +REVISION = 2
> +
> +MASTER_SITES = http://spacehopper.org/mirrors/
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/www/drupal6/securelogin/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- distinfo 15 Jul 2009 10:44:00 -0000 1.1.1.1
> +++ distinfo 15 Jun 2011 16:07:20 -0000
> @@ -1,5 +1,5 @@
> -MD5 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = bCxHwR6BMMUL1Ccm/0OwNA==
> -RMD160 (drupal6/securelogin-6.x-1.x-dev.tar.gz) =
> qH5tjXDen1Zu5KPCY5Kh0HDprhc=
> -SHA1 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = xm7riyXG0z9RLQW6KAW+n6m4yAM=
> -SHA256 (drupal6/securelogin-6.x-1.x-dev.tar.gz) =
> zwvaUuiOwT9wy7/uRJOsZB1rFqdManHLQ2qWH8tRBfc=
> -SIZE (drupal6/securelogin-6.x-1.x-dev.tar.gz) = 8361
> +MD5 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = 6nit7xJsnUXgxtij3HGgow==
> +RMD160 (drupal6/securelogin-6.x-1.x-dev.tar.gz) =
> bBCJNikPyje8WwSgDSflZsb0hvo=
> +SHA1 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = 4ZJxpmuDDHp8UB2i3VYARgyNWtU=
> +SHA256 (drupal6/securelogin-6.x-1.x-dev.tar.gz) =
> QKql4bbWQo6zS6ae0o3tJxp9AR7o/LqUd04rhUqwEdc=
> +SIZE (drupal6/securelogin-6.x-1.x-dev.tar.gz) = 8655
>
Thanks very much. I was able to build and install it on a test system.
Everything works as expected.
Small error patching Makefile -- not sure why
amd64# patch -C -p0 < makefile.patch
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: Makefile
|===================================================================
|RCS file: /cvs/ports/www/drupal6/securelogin/Makefile,v
|retrieving revision 1.4
|diff -u -p -r1.4 Makefile
|--- Makefile 15 Nov 2010 09:05:41 -0000 1.4
|+++ Makefile 15 Jun 2011 16:07:20 -0000
--------------------------
Patching file Makefile using Plan A...
patch: **** malformed patch at line 10: COMMENT = redirect login screen
to https
distinfo patched without any problems
amd64# patch -p0 < distinfo.patch
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: distinfo
|===================================================================
|RCS file: /cvs/ports/www/drupal6/securelogin/distinfo,v
|retrieving revision 1.1.1.1
|diff -u -p -r1.1.1.1 distinfo
|--- distinfo 15 Jul 2009 10:44:00 -0000 1.1.1.1
|+++ distinfo 15 Jun 2011 16:07:20 -0000
--------------------------
Patching file distinfo using Plan A...
Hunk #1 succeeded at 1.
done
amd64# make clean all
===> Cleaning for drupal6-securelogin-1p2
===> Checking files for drupal6-securelogin-1p2
>> Fetch http://www.drupal.org/files/projects/securelogin-6.x-1.x-dev.tar.gz
securelogin-6.x-1.x-de... 100%
|****************************************************| 8655 00:00
>> (SHA256) drupal6/securelogin-6.x-1.x-dev.tar.gz: OK
===> Extracting for drupal6-securelogin-1p2
===> Patching for drupal6-securelogin-1p2
===> Configuring for drupal6-securelogin-1p2
amd64# make package
===> Faking installation for drupal6-securelogin-1p2
mkdir -p
/home/ports/pobj/drupal6-securelogin-1/fake-amd64/var/www/htdocs/drupal6/sites/all/modules/;
cp -R /home/ports/pobj/drupal6-securelogin-1/securelogin
/home/ports/pobj/drupal6-securelogin-1/fake-amd64/var/www/htdocs/drupal6/sites/all/modules/;
chown -R root.daemon
/home/ports/pobj/drupal6-securelogin-1/fake-amd64/var/www/htdocs/drupal6/sites/all/modules/
===> Building package for drupal6-securelogin-1p2
Create /home/ports/packages/no-arch/drupal6-securelogin-1p2.tgz
Link to /home/ports/packages/amd64/all/drupal6-securelogin-1p2.tgz
Link to /home/ports/packages/amd64/ftp/drupal6-securelogin-1p2.tgz
Link to /home/ports/packages/amd64/cdrom/drupal6-securelogin-1p2.tgz
I will report back if there are any issues, once this is on the production
server.
Thanks again,
Vijay
Vijay Sankar
[email protected]
