Modify

Opened 9 years ago

Closed 9 years ago

Last modified 4 years ago

#5102 closed enhancement (fixed)

Update ppp to 2.4.4

Reported by: Daniel Dickinson <cshore@…> Owned by: developers
Priority: normal Milestone: Barrier Breaker 14.07
Component: packages Version:
Keywords: Cc:

Description

The attached patch updates ppp to 2.4.4. Note that rp-pppoe needs it's Makefile modified by changing 2.4.3 to 2.4.4 in one spot (diff in another ticket) as a result of this change.

Attachments (3)

ppp-2.4.4.patch (30.2 KB) - added by Daniel Dickinson <cshore@…> 9 years ago.
ppp-2.4.4 update
ppp-2.4.4-correct.patch (109.7 KB) - added by Daniel Dickinson <cshore@…> 9 years ago.
corrected patch with new patches included
ppp-2.4.4.2.patch (197.3 KB) - added by Daniel Dickinson <cshore@…> 9 years ago.
The fully corrected svn diff for updating to ppp-2.4.4

Download all attachments as: .zip

Change History (10)

Changed 9 years ago by Daniel Dickinson <cshore@…>

ppp-2.4.4 update

comment:1 Changed 9 years ago by Daniel Dickinson <cshore@…>

Wait. I have to svn add a few things....I'll redo the diff in a sec

Changed 9 years ago by Daniel Dickinson <cshore@…>

corrected patch with new patches included

comment:2 Changed 9 years ago by Daniel Dickinson <cshore@…>

Okay, I've done svn add on the patches directory and svn diff...
Oh wait...I've got to delete the old patches first...trying again
(Sorry I've not used svn much)

Changed 9 years ago by Daniel Dickinson <cshore@…>

The fully corrected svn diff for updating to ppp-2.4.4

comment:3 Changed 9 years ago by Daniel Dickinson <cshore@…>

Okay ppp-2.4.4.2.patch should be correct. I removed the old patches with svn diff, add the new patches with svn add, modified the Makefile (copied from where I stored my fully updated ppp directory), and did svn diff, so the diff should now bring a stock svn to all the changes I have done to update ppp.

Sorry for the noise.

comment:4 Changed 9 years ago by Daniel Dickinson <cshore@…>

Hmmm...this doesn't seem to actually delete the files that were removed. How does one do that. I did svn rm package/ppp/patches/* then copies the old ppp back, applied the patch, and did svn add to pull in the patches that new, but when I do svn diff the patch that is generated, when applied to current trunk, creates a bunch of empty files for the deleted files instead of deleting them. Is there any way to delete them using a diff/patch, or does that require actual svn? (I don't know svn all that well).

BTW, once that issue is solved I think this patch is probably more suitable that the new dupe because it pulls in new version of, and updates the debian patches, as well as refreshing the openwrt-specific patches that still apply.

comment:5 Changed 9 years ago by Daniel Dickinson <cshore@…>

Okay it turns out the patch is fine, I just didn't know about the --remove-empty-files (or -E) option of patch.

comment:6 Changed 9 years ago by jow

  • Resolution set to fixed
  • Status changed from new to closed

Committed in r15955 - thanks!

comment:7 Changed 4 years ago by jow

  • Milestone changed from Attitude Adjustment 12.09 to Barrier Breaker 14.07

Milestone Attitude Adjustment 12.09 deleted

Add Comment

Modify Ticket

Action
as closed .
The resolution will be deleted. Next status will be 'reopened'.
Author


E-mail address and user name can be saved in the Preferences.

 
Note: See TracTickets for help on using tickets.