[PATCH] sync samba pidl with wireshark pidl

Aurélien Aptel aaptel at suse.com
Wed May 18 15:47:12 UTC 2016


Also for future reference, I've attached a script that looks for
un-applied Samba patches in Wireshark (i.e. commits that should be
ported from Samba to Wireshark).

You have to set the path to both repos in the corresponding variables.

The script takes a Samba commit id from master as argument.
It will look at all the commits between that commit and the top of
master that touches the pidl/ sub-dir and will check if they can be
applied in Wireshark pidl/ subdir.

- If they can apply, it means they were not ported yet.
- If they don't apply, it tries to revert them. If the revert works it
  means the commit is most likely already in there.
- If neither the regular patch nor the revert can be applied it is
  marked as "maybe" and it has to be checked manually.

No files are actually touched by the script (patch is called with --dry-run)
so you can run it safely.

Sample run:

aaptel at aaptelpc ~/prog/samba-git % find-sync-patch a2d49fa                
Reversed (or previously applied) patch detected!  Skipping patch.
1 out of 1 hunk ignored
# smb a2d49fa is already in ws
# smb 9e07f3a was not applied in ws
# smb dffa2db was not applied in ws
# smb 90bf114 was not applied in ws
# smb 9af628a was not applied in ws
1 out of 2 hunks FAILED
Unreversed patch detected!  Skipping patch.
2 out of 2 hunks ignored
# smb 59d530c cannot be applied or removed in ws
# smb f6c7907 was not applied in ws
# smb ed11ce8 was not applied in ws

#-----------------------------------------------------
# commits in SMB missing in WS since SMB:a2d49fa (included in the search)
# from earliest to latest applied commit
#-----------------------------------------------------
9e07f3a pidl: Fix our python reference handling
dffa2db pidl: Use the $mem_ctx helper variable
90bf114 pidl: Use a tmp_ctx helper variable
9af628a ndr: avoid unnecessary searches of token list
# maybe 59d530c ndr: Use ndr_steal to avoid long lists
f6c7907 pidl: Correct string handling to use talloc and be in common
ed11ce8 Python pidl: avoid segfault with "del obj->attr"

I will try to make a similar script for the other direction (WS->SMB).

-- 
Aurélien Aptel / SUSE Labs Samba Team
GPG: 1839 CB5F 9F5B FB9B AA97  8C99 03C8 A49B 521B D5D3
SUSE Linux GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany
GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG
Nürnberg)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: find-sync-patch
Type: application/octet-stream
Size: 1272 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20160518/7418eb84/find-sync-patch.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20160518/7418eb84/attachment.sig>


More information about the samba-technical mailing list